diff --git a/apps/web/src/components/Editor.tsx b/apps/web/src/components/Editor.tsx
index 603e89a3..0f576446 100644
--- a/apps/web/src/components/Editor.tsx
+++ b/apps/web/src/components/Editor.tsx
@@ -85,7 +85,7 @@ export interface RenderSuggestionsProps {
 export interface WorkspaceMember {
   publicId: string;
   user: {
-    id: string;
+    id: string | null;
     name: string | null;
     image: string | null;
   } | null;
diff --git a/apps/web/src/hooks/useLocalisation.ts b/apps/web/src/hooks/useLocalisation.ts
index d2d1c461..b80d028c 100644
--- a/apps/web/src/hooks/useLocalisation.ts
+++ b/apps/web/src/hooks/useLocalisation.ts
@@ -1,6 +1,6 @@
 import type { Locale as DateFnsLocale } from "date-fns";
 import { useLingui } from "@lingui/react";
-import { de, enGB, es, fr, it, nl, pl, ru, ptBR} from "date-fns/locale";
+import { de, enGB, es, fr, it, nl, pl, ptBR, ru } from "date-fns/locale";
 
 import type { Locale } from "~/locales";
 import { useLinguiContext } from "~/providers/lingui";
@@ -19,7 +19,7 @@ export function useLocalisation() {
     nl,
     ru,
     pl,
-    "pt-BR": ptBR,
+    ptbr: ptBR,
   };
 
   const currentDateLocale = dateLocaleMap[locale] ?? enGB;
diff --git a/apps/web/src/utils/i18n.ts b/apps/web/src/utils/i18n.ts
index 755290f1..ddd6eb5e 100644
--- a/apps/web/src/utils/i18n.ts
+++ b/apps/web/src/utils/i18n.ts
@@ -22,8 +22,8 @@ const loadMessages = async (locale: Locale) => {
       return (await import("~/locales/ru/messages")).messages;
     case "pl":
       return (await import("~/locales/pl/messages")).messages;
-    case "pt-BR":
-      return (await import("~/locales/pt-BR/messages")).messages;
+    case "ptbr":
+      return (await import("~/locales/ptbr/messages")).messages;
     default:
       return enMessages;
   }
diff --git a/apps/web/src/views/board/index.tsx b/apps/web/src/views/board/index.tsx
index 8d25696a..5c815af0 100644
--- a/apps/web/src/views/board/index.tsx
+++ b/apps/web/src/views/board/index.tsx
@@ -2,9 +2,9 @@ import type { DropResult } from "react-beautiful-dnd";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useRouter } from "next/router";
-import { env } from "next-runtime-env";
 import { t } from "@lingui/core/macro";
 import { keepPreviousData } from "@tanstack/react-query";
+import { env } from "next-runtime-env";
 import { useEffect, useState } from "react";
 import { DragDropContext, Draggable } from "react-beautiful-dnd";
 import { useForm } from "react-hook-form";
diff --git a/apps/web/src/views/card/components/ActivityList.tsx b/apps/web/src/views/card/components/ActivityList.tsx
index 3cfc397a..6a70c10e 100644
--- a/apps/web/src/views/card/components/ActivityList.tsx
+++ b/apps/web/src/views/card/components/ActivityList.tsx
@@ -525,7 +525,6 @@ const ActivityList = ({
               comment={activity.comment?.comment}
               isEdited={!!activity.comment?.updatedAt}
               isAuthor={activity.comment?.createdBy === sessionData?.user.id}
-              isAdmin={isAdmin ?? false}
               isViewOnly={!!isViewOnly}
             />
           );
diff --git a/apps/web/src/views/settings/WorkspaceSettings.tsx b/apps/web/src/views/settings/WorkspaceSettings.tsx
index 54d5d4a3..65b16855 100644
--- a/apps/web/src/views/settings/WorkspaceSettings.tsx
+++ b/apps/web/src/views/settings/WorkspaceSettings.tsx
@@ -17,11 +17,11 @@ import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { DeleteWorkspaceConfirmation } from "./components/DeleteWorkspaceConfirmation";
+import UpdateWeekStartDayForm from "./components/UpdateWeekStartDayForm";
 import UpdateWorkspaceDescriptionForm from "./components/UpdateWorkspaceDescriptionForm";
 import UpdateWorkspaceEmailVisibilityForm from "./components/UpdateWorkspaceEmailVisibilityForm";
 import UpdateWorkspaceNameForm from "./components/UpdateWorkspaceNameForm";
 import UpdateWorkspaceUrlForm from "./components/UpdateWorkspaceUrlForm";
-import UpdateWeekStartDayForm from "./components/UpdateWeekStartDayForm";
 import { UpgradeToProConfirmation } from "./components/UpgradeToProConfirmation";
 
 export default function WorkspaceSettings() {
diff --git a/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx b/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx
index 48a67f9d..ee1bb4a1 100644
--- a/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx
+++ b/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx
@@ -13,20 +13,29 @@ interface DeleteWebhookConfirmationProps {
 export function DeleteWebhookConfirmation({
   workspacePublicId,
 }: DeleteWebhookConfirmationProps) {
-  const { closeModal, entityId: webhookPublicId, entityLabel: webhookName } = useModal();
+  const {
+    closeModal,
+    entityId: webhookPublicId,
+    entityLabel: webhookName,
+  } = useModal();
   const { showPopup } = usePopup();
   const utils = api.useUtils();
 
   const deleteWebhookMutation = api.webhook.delete.useMutation({
     onSuccess: () => {
       void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook deleted successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook deleted`,
+        message: t`Webhook deleted successfully`,
+        icon: "success",
+      });
       closeModal();
     },
     onError: (error) => {
       showPopup({
+        header: t`Unable to delete webhook`,
         message: error.message || t`Failed to delete webhook`,
-        type: "error",
+        icon: "error",
       });
     },
   });
@@ -35,7 +44,7 @@ export function DeleteWebhookConfirmation({
     if (!webhookPublicId) return;
     deleteWebhookMutation.mutate({
       workspacePublicId,
-      webhookPublicId: webhookPublicId as string,
+      webhookPublicId: webhookPublicId,
     });
   };
 
diff --git a/apps/web/src/views/settings/components/NewWebhookModal.tsx b/apps/web/src/views/settings/components/NewWebhookModal.tsx
index 6bdbe94d..3260f2f2 100644
--- a/apps/web/src/views/settings/components/NewWebhookModal.tsx
+++ b/apps/web/src/views/settings/components/NewWebhookModal.tsx
@@ -44,7 +44,12 @@ export function NewWebhookModal({
   workspacePublicId,
   isEdit = false,
 }: NewWebhookModalProps) {
-  const { closeModal, entityId: webhookPublicId, getModalState, clearModalState } = useModal();
+  const {
+    closeModal,
+    entityId: webhookPublicId,
+    getModalState,
+    clearModalState,
+  } = useModal();
   const { showPopup } = usePopup();
   const [isTestingWebhook, setIsTestingWebhook] = useState(false);
 
@@ -101,13 +106,18 @@ export function NewWebhookModal({
   const createWebhookMutation = api.webhook.create.useMutation({
     onSuccess: () => {
       void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook created successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook created`,
+        message: t`Webhook created successfully`,
+        icon: "success",
+      });
       closeModal();
     },
     onError: (error) => {
       showPopup({
+        header: t`Unable to create webhook`,
         message: error.message || t`Failed to create webhook`,
-        type: "error",
+        icon: "error",
       });
     },
   });
@@ -115,13 +125,18 @@ export function NewWebhookModal({
   const updateWebhookMutation = api.webhook.update.useMutation({
     onSuccess: () => {
       void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook updated successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook updated`,
+        message: t`Webhook updated successfully`,
+        icon: "success",
+      });
       closeModal();
     },
     onError: (error) => {
       showPopup({
+        header: t`Unable to update webhook`,
         message: error.message || t`Failed to update webhook`,
-        type: "error",
+        icon: "error",
       });
     },
   });
@@ -129,19 +144,25 @@ export function NewWebhookModal({
   const testWebhookMutation = api.webhook.test.useMutation({
     onSuccess: (result) => {
       if (result.success) {
-        showPopup({ message: t`Test webhook sent successfully!`, type: "success" });
+        showPopup({
+          header: t`Test sent`,
+          message: t`Test webhook sent successfully!`,
+          icon: "success",
+        });
       } else {
         showPopup({
+          header: t`Test failed`,
           message: result.error || t`Webhook test failed`,
-          type: "error",
+          icon: "error",
         });
       }
       setIsTestingWebhook(false);
     },
     onError: (error) => {
       showPopup({
+        header: t`Unable to test webhook`,
         message: error.message || t`Failed to test webhook`,
-        type: "error",
+        icon: "error",
       });
       setIsTestingWebhook(false);
     },
@@ -151,7 +172,7 @@ export function NewWebhookModal({
     if (isEdit && webhookPublicId) {
       updateWebhookMutation.mutate({
         workspacePublicId,
-        webhookPublicId: webhookPublicId as string,
+        webhookPublicId: webhookPublicId,
         name: data.name,
         url: data.url,
         secret: data.secret || undefined,
@@ -174,11 +195,12 @@ export function NewWebhookModal({
     setIsTestingWebhook(true);
     testWebhookMutation.mutate({
       workspacePublicId,
-      webhookPublicId: webhookPublicId as string,
+      webhookPublicId: webhookPublicId,
     });
   };
 
-  const isPending = createWebhookMutation.isPending || updateWebhookMutation.isPending;
+  const isPending =
+    createWebhookMutation.isPending || updateWebhookMutation.isPending;
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
@@ -231,7 +253,11 @@ export function NewWebhookModal({
             <Input
               id="secret"
               type="password"
-              placeholder={isEdit ? t`Enter new secret to update` : t`HMAC secret for signature verification`}
+              placeholder={
+                isEdit
+                  ? t`Enter new secret to update`
+                  : t`HMAC secret for signature verification`
+              }
               {...register("secret")}
               errorMessage={errors.secret?.message}
             />
@@ -252,7 +278,7 @@ export function NewWebhookModal({
                   {webhookEvents.map((event) => (
                     <label
                       key={event}
-                      className="flex items-center space-x-2 cursor-pointer"
+                      className="flex cursor-pointer items-center space-x-2"
                     >
                       <input
                         type="checkbox"
@@ -262,11 +288,11 @@ export function NewWebhookModal({
                             field.onChange([...field.value, event]);
                           } else {
                             field.onChange(
-                              field.value.filter((v) => v !== event)
+                              field.value.filter((v) => v !== event),
                             );
                           }
                         }}
-                        className="h-4 w-4 rounded border-light-400 text-primary-600 focus:ring-primary-500 dark:border-dark-400"
+                        className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-light-400 dark:border-dark-400"
                       />
                       <span className="text-sm text-light-900 dark:text-dark-900">
                         {event}
@@ -277,17 +303,19 @@ export function NewWebhookModal({
               )}
             />
             {errors.events && (
-              <p className="mt-1 text-xs text-red-500">{errors.events.message}</p>
+              <p className="mt-1 text-xs text-red-500">
+                {errors.events.message}
+              </p>
             )}
           </div>
 
           {isEdit && (
             <div>
-              <label className="flex items-center space-x-2 cursor-pointer">
+              <label className="flex cursor-pointer items-center space-x-2">
                 <input
                   type="checkbox"
                   {...register("active")}
-                  className="h-4 w-4 rounded border-light-400 text-primary-600 focus:ring-primary-500 dark:border-dark-400"
+                  className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-light-400 dark:border-dark-400"
                 />
                 <span className="text-sm text-light-900 dark:text-dark-900">
                   {t`Active`}
diff --git a/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx b/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx
index af0b13d7..3b27f0b1 100644
--- a/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx
@@ -36,7 +36,7 @@ export default function UpdateWeekStartDayForm({
     setValue(newValue);
     updateWorkspace.mutate({
       workspacePublicId,
-      weekStartDay: newValue,
+      weekStartDay: newValue as 0 | 1 | 6,
     });
   };
 
diff --git a/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx b/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
index 9535d353..532a2baf 100644
--- a/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
@@ -20,7 +20,7 @@ const UpdateWorkspaceUrlForm = ({
 }: {
   workspacePublicId: string;
   workspaceUrl: string;
-  workspacePlan: "free" | "pro" | "enterprise";
+  workspacePlan: "free" | "team" | "pro" | "enterprise";
   disabled?: boolean;
 }) => {
   const utils = api.useUtils();
diff --git a/apps/web/src/views/settings/components/WebhookList.tsx b/apps/web/src/views/settings/components/WebhookList.tsx
index 5915d716..f26e0531 100644
--- a/apps/web/src/views/settings/components/WebhookList.tsx
+++ b/apps/web/src/views/settings/components/WebhookList.tsx
@@ -171,18 +171,20 @@ export default function WebhookList({ workspacePublicId }: WebhookListProps) {
   const testWebhookMutation = api.webhook.test.useMutation({
     onSuccess: (result) => {
       if (result.success) {
-        showPopup({ message: t`Test webhook sent successfully!`, type: "success" });
+        showPopup({ header: t`Test sent`, message: t`Test webhook sent successfully!`, icon: "success" });
       } else {
         showPopup({
+          header: t`Test failed`,
           message: result.error || t`Webhook test failed`,
-          type: "error",
+          icon: "error",
         });
       }
     },
     onError: (error) => {
       showPopup({
+        header: t`Unable to test webhook`,
         message: error.message || t`Failed to test webhook`,
-        type: "error",
+        icon: "error",
       });
     },
   });
diff --git a/packages/api/src/schemas/card.ts b/packages/api/src/schemas/card.ts
index 8ffac68e..2a13b28c 100644
--- a/packages/api/src/schemas/card.ts
+++ b/packages/api/src/schemas/card.ts
@@ -36,6 +36,7 @@ const cardMemberSchema = z.object({
   email: z.string(),
   user: z
     .object({
+      id: z.string().nullable(),
       name: z.string().nullable(),
     })
     .nullable(),
@@ -180,6 +181,7 @@ export const activityItemSchema = z.object({
       publicId: z.string(),
       user: z
         .object({
+          id: z.string().nullable(),
           name: z.string().nullable(),
           email: z.string(),
           image: z.string().nullable(),
@@ -189,6 +191,7 @@ export const activityItemSchema = z.object({
     .nullable(),
   user: z
     .object({
+      id: z.string().nullable(),
       name: z.string().nullable(),
       email: z.string(),
       image: z.string().nullable(),
diff --git a/packages/api/src/schemas/common.ts b/packages/api/src/schemas/common.ts
index 86c308a0..05def187 100644
--- a/packages/api/src/schemas/common.ts
+++ b/packages/api/src/schemas/common.ts
@@ -25,6 +25,7 @@ export const checklistResponseSchema = z.object({
 
 // Shared user sub-object (used inside member/workspace responses)
 export const userSchema = z.object({
+  id: z.string().nullable(),
   name: z.string().nullable(),
   email: z.string(),
   image: z.string().nullable(),
diff --git a/packages/api/src/schemas/workspace.ts b/packages/api/src/schemas/workspace.ts
index e57c02e0..3cec9de5 100644
--- a/packages/api/src/schemas/workspace.ts
+++ b/packages/api/src/schemas/workspace.ts
@@ -10,7 +10,7 @@ export const workspaceListItemSchema = z.object({
     name: z.string(),
     description: z.string().nullable(),
     slug: z.string(),
-    plan: z.enum(["free", "pro", "enterprise"]),
+    plan: z.enum(["free", "team", "pro", "enterprise"]),
     weekStartDay: z.number().nullable(),
     deletedAt: z.date().nullable(),
   }),
@@ -25,6 +25,7 @@ const workspaceMemberDetailSchema = z.object({
   createdAt: z.date(),
   user: z
     .object({
+      id: z.string().nullable(),
       name: z.string().nullable(),
       email: z.string().optional(),
       image: z.string().nullable(),
@@ -72,7 +73,7 @@ export const workspaceCreateResponseSchema = z.object({
   name: z.string(),
   slug: z.string(),
   description: z.string().nullable(),
-  plan: z.enum(["free", "pro", "enterprise"]),
+  plan: z.enum(["free", "team", "pro", "enterprise"]),
 });
 
 // ─── workspace.update ────────────────────────────────────────
@@ -81,7 +82,7 @@ export const workspaceUpdateResponseSchema = z.object({
   name: z.string(),
   slug: z.string(),
   description: z.string().nullable(),
-  plan: z.enum(["free", "pro", "enterprise"]),
+  plan: z.enum(["free", "team", "pro", "enterprise"]),
   showEmailsToMembers: z.boolean().nullable(),
   weekStartDay: z.number().nullable(),
 });
diff --git a/packages/auth/src/plugins.ts b/packages/auth/src/plugins.ts
index 78da6c4c..2b0ab120 100644
--- a/packages/auth/src/plugins.ts
+++ b/packages/auth/src/plugins.ts
@@ -170,7 +170,7 @@ export function createPlugins(db: dbClient) {
         if (authorization?.startsWith("Bearer ")) {
           return authorization.slice(7);
         }
-        return ctx.headers?.get("x-api-key") ?? undefined;
+        return ctx.headers?.get("x-api-key") ?? null;
       },
       rateLimit: {
         enabled: true,
diff --git a/packages/db/src/repository/board.repo.ts b/packages/db/src/repository/board.repo.ts
index 12d8fd2d..11c16562 100644
--- a/packages/db/src/repository/board.repo.ts
+++ b/packages/db/src/repository/board.repo.ts
@@ -220,6 +220,7 @@ export const getByPublicId = async (
             with: {
               user: {
                 columns: {
+                  id: true,
                   name: true,
                   email: true,
                   image: true,
@@ -278,6 +279,7 @@ export const getByPublicId = async (
                     with: {
                       user: {
                         columns: {
+                          id: true,
                           name: true,
                           email: true,
                           image: true,