From b0215ce4932feee94facf4cbe2cce0507e4e6dc0 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 8 Oct 2025 21:12:42 +0530
Subject: [PATCH 01/18] fix: cal ai email

---
 .../retell-ai/__tests__/route.test.ts         | 372 ++++++++++++++++++
 apps/web/app/api/webhooks/retell-ai/route.ts  |  15 +-
 apps/web/public/static/locales/en/common.json |   4 +
 packages/emails/email-manager.ts              |  18 +-
 .../CreditBalanceLimitReachedEmail.tsx        |  17 +-
 .../CreditBalanceLowWarningEmail.tsx          |  17 +-
 .../credit-balance-limit-reached-email.ts     |   6 +
 .../credit-balance-low-warning-email.ts       |   6 +
 .../features/ee/billing/credit-service.ts     |  34 +-
 .../tasker/tasks/executeAIPhoneCall.ts        |  78 +++-
 .../repository/PrismaAgentRepository.ts       |   6 +
 .../repository/PrismaPhoneNumberRepository.ts |   2 +-
 packages/lib/server/repository/team.ts        |  27 ++
 13 files changed, 570 insertions(+), 32 deletions(-)

diff --git a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
index 68d32740a26846..6ba9e55da58d5d 100644
--- a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
+++ b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
@@ -5,6 +5,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { PrismaAgentRepository } from "@calcom/lib/server/repository/PrismaAgentRepository";
 import { PrismaPhoneNumberRepository } from "@calcom/lib/server/repository/PrismaPhoneNumberRepository";
 import type { CalAiPhoneNumber, User, Team, Agent } from "@calcom/prisma/client";
+import { CreditUsageType } from "@calcom/prisma/enums";
 
 import { POST } from "../route";
 
@@ -73,6 +74,8 @@ vi.mock("retell-sdk", () => ({
 
 const mockHasAvailableCredits = vi.fn();
 const mockChargeCredits = vi.fn();
+const mockSendCreditBalanceLimitReachedEmails = vi.fn();
+const mockSendCreditBalanceLowWarningEmails = vi.fn();
 
 vi.mock("@calcom/features/ee/billing/credit-service", () => ({
   CreditService: vi.fn().mockImplementation(() => ({
@@ -81,6 +84,12 @@ vi.mock("@calcom/features/ee/billing/credit-service", () => ({
   })),
 }));
 
+vi.mock("@calcom/emails/email-manager", () => ({
+  sendCreditBalanceLimitReachedEmails: (...args: unknown[]) =>
+    mockSendCreditBalanceLimitReachedEmails(...args),
+  sendCreditBalanceLowWarningEmails: (...args: unknown[]) => mockSendCreditBalanceLowWarningEmails(...args),
+}));
+
 vi.mock("@calcom/lib/server/repository/PrismaPhoneNumberRepository", () => ({
   PrismaPhoneNumberRepository: {
     findByPhoneNumber: vi.fn(),
@@ -866,4 +875,367 @@ describe("Retell AI Webhook Handler", () => {
       expect(mockChargeCredits).not.toHaveBeenCalled();
     });
   });
+
+  describe("Cal AI Credit Type", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+      vi.mocked(Retell.verify).mockReturnValue(true);
+    });
+
+    it("should pass CAL_AI_PHONE_CALL creditFor when charging credits for web call", async () => {
+      const mockAgent: Pick<
+        Agent,
+        "id" | "name" | "providerAgentId" | "enabled" | "userId" | "teamId" | "createdAt" | "updatedAt"
+      > = {
+        id: "agent-123",
+        name: "Test Agent",
+        providerAgentId: "agent_cal_ai_test",
+        enabled: true,
+        userId: 1,
+        teamId: null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      };
+
+      vi.mocked(PrismaAgentRepository.findByProviderAgentId).mockResolvedValue(mockAgent);
+      mockChargeCredits.mockResolvedValue(undefined);
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "web-call-credit-type",
+          call_type: "web_call",
+          agent_id: "agent_cal_ai_test",
+          call_status: "ended",
+          start_timestamp: 1757673314024,
+          call_cost: {
+            total_duration_seconds: 120,
+            combined_cost: 2.0,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userId: 1,
+          credits: 58,
+          callDuration: 120,
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+          externalRef: "retell:web-call-credit-type",
+        })
+      );
+    });
+
+    it("should pass CAL_AI_PHONE_CALL creditFor when charging credits for phone call", async () => {
+      const mockPhoneNumber: MockPhoneNumberWithUser = {
+        id: 1,
+        phoneNumber: "+1234567890",
+        userId: 1,
+        teamId: null,
+        provider: "test-provider",
+        providerPhoneNumberId: "test-provider-id",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        stripeCustomerId: null,
+        stripeSubscriptionId: null,
+        subscriptionStatus: null,
+        inboundAgentId: null,
+        outboundAgentId: null,
+        user: { id: 1, email: "test@example.com", name: "Test User" },
+        team: null,
+      };
+
+      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockChargeCredits.mockResolvedValue(undefined);
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "phone-call-credit-type",
+          from_number: "+1234567890",
+          to_number: "+0987654321",
+          direction: "outbound",
+          call_status: "completed",
+          start_timestamp: 1234567890,
+          call_cost: {
+            combined_cost: 100,
+            total_duration_seconds: 180,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userId: 1,
+          credits: 87,
+          callDuration: 180,
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+          externalRef: "retell:phone-call-credit-type",
+        })
+      );
+    });
+
+    it("should pass CAL_AI_PHONE_CALL creditFor for team-based calls", async () => {
+      const mockPhoneNumber: MockPhoneNumberWithTeam = {
+        id: 2,
+        phoneNumber: "+1234567890",
+        userId: null,
+        teamId: 5,
+        provider: "test-provider",
+        providerPhoneNumberId: "test-provider-id-2",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        stripeCustomerId: null,
+        stripeSubscriptionId: null,
+        subscriptionStatus: null,
+        inboundAgentId: null,
+        outboundAgentId: null,
+        team: { id: 5, name: "Test Team" },
+        user: null,
+      };
+
+      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockChargeCredits.mockResolvedValue(undefined);
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "team-call-credit-type",
+          from_number: "+1234567890",
+          to_number: "+0987654321",
+          direction: "outbound",
+          call_status: "completed",
+          start_timestamp: 1234567890,
+          call_cost: {
+            combined_cost: 50,
+            total_duration_seconds: 60,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teamId: 5,
+          credits: 29,
+          callDuration: 60,
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+          externalRef: "retell:team-call-credit-type",
+        })
+      );
+    });
+  });
+
+  describe("Cal AI Credit Email Integration", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+      vi.mocked(Retell.verify).mockReturnValue(true);
+      mockSendCreditBalanceLimitReachedEmails.mockResolvedValue(undefined);
+      mockSendCreditBalanceLowWarningEmails.mockResolvedValue(undefined);
+    });
+
+    it("should trigger email with CAL_AI_PHONE_CALL creditFor when credits run out", async () => {
+      const mockPhoneNumber: MockPhoneNumberWithUser = {
+        id: 1,
+        phoneNumber: "+1234567890",
+        userId: 1,
+        teamId: null,
+        provider: "test-provider",
+        providerPhoneNumberId: "test-provider-id",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        stripeCustomerId: null,
+        stripeSubscriptionId: null,
+        subscriptionStatus: null,
+        inboundAgentId: null,
+        outboundAgentId: null,
+        user: { id: 1, email: "test@example.com", name: "Test User" },
+        team: null,
+      };
+
+      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+
+      mockChargeCredits.mockImplementation(async (params) => {
+        if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
+          await mockSendCreditBalanceLimitReachedEmails({
+            user: {
+              id: params.userId,
+              name: "Test User",
+              email: "test@example.com",
+              t: (key: string) => key,
+            },
+            creditFor: params.creditFor,
+          });
+        }
+        return { userId: params.userId };
+      });
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "call-trigger-email",
+          from_number: "+1234567890",
+          to_number: "+0987654321",
+          direction: "outbound",
+          call_status: "completed",
+          start_timestamp: 1234567890,
+          call_cost: {
+            combined_cost: 100,
+            total_duration_seconds: 120,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+        })
+      );
+
+      expect(mockSendCreditBalanceLimitReachedEmails).toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+        })
+      );
+    });
+
+    it("should trigger warning email with CAL_AI_PHONE_CALL creditFor when credits are low", async () => {
+      const mockAgent: Pick<
+        Agent,
+        "id" | "name" | "providerAgentId" | "enabled" | "userId" | "teamId" | "createdAt" | "updatedAt"
+      > = {
+        id: "agent-123",
+        name: "Test Agent",
+        providerAgentId: "agent_warning_test",
+        enabled: true,
+        userId: 1,
+        teamId: null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      };
+
+      vi.mocked(PrismaAgentRepository.findByProviderAgentId).mockResolvedValue(mockAgent);
+
+      mockChargeCredits.mockImplementation(async (params) => {
+        if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
+          await mockSendCreditBalanceLowWarningEmails({
+            user: {
+              id: params.userId,
+              name: "Test User",
+              email: "test@example.com",
+              t: (key: string) => key,
+            },
+            balance: 100,
+            creditFor: params.creditFor,
+          });
+        }
+        return { userId: params.userId };
+      });
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "call-trigger-warning",
+          call_type: "web_call",
+          agent_id: "agent_warning_test",
+          call_status: "ended",
+          start_timestamp: 1757673314024,
+          call_cost: {
+            total_duration_seconds: 60,
+            combined_cost: 1.0,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+        })
+      );
+
+      expect(mockSendCreditBalanceLowWarningEmails).toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+          balance: 100,
+        })
+      );
+    });
+
+    it("should not pass SMS creditFor for Cal AI calls", async () => {
+      const mockPhoneNumber: MockPhoneNumberWithTeam = {
+        id: 2,
+        phoneNumber: "+1234567890",
+        userId: null,
+        teamId: 5,
+        provider: "test-provider",
+        providerPhoneNumberId: "test-provider-id-2",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        stripeCustomerId: null,
+        stripeSubscriptionId: null,
+        subscriptionStatus: null,
+        inboundAgentId: null,
+        outboundAgentId: null,
+        team: { id: 5, name: "Test Team" },
+        user: null,
+      };
+
+      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockChargeCredits.mockResolvedValue({ teamId: 5 });
+
+      const body: RetellWebhookBody = {
+        event: "call_analyzed",
+        call: {
+          call_id: "call-not-sms",
+          from_number: "+1234567890",
+          to_number: "+0987654321",
+          direction: "outbound",
+          call_status: "completed",
+          start_timestamp: 1234567890,
+          call_cost: {
+            combined_cost: 50,
+            total_duration_seconds: 30,
+          },
+        },
+      };
+
+      const request = createMockRequest(body, "valid-signature");
+      const response = await callPOST(request);
+
+      expect(response.status).toBe(200);
+
+      expect(mockChargeCredits).toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+        })
+      );
+
+      expect(mockChargeCredits).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          creditFor: CreditUsageType.SMS,
+        })
+      );
+    });
+  });
 });
diff --git a/apps/web/app/api/webhooks/retell-ai/route.ts b/apps/web/app/api/webhooks/retell-ai/route.ts
index 3cb4572a724d98..35b371f43e648a 100644
--- a/apps/web/app/api/webhooks/retell-ai/route.ts
+++ b/apps/web/app/api/webhooks/retell-ai/route.ts
@@ -62,6 +62,8 @@ const RetellWebhookSchema = z.object({
     .passthrough(),
 });
 
+type RetellCallData = z.infer<typeof RetellWebhookSchema>["call"];
+
 async function chargeCreditsForCall({
   userId,
   teamId,
@@ -119,7 +121,7 @@ async function chargeCreditsForCall({
   }
 }
 
-async function handleCallAnalyzed(callData: any) {
+async function handleCallAnalyzed(callData: RetellCallData) {
   const { from_number, call_id, call_cost, call_type, agent_id } = callData;
 
   if (
@@ -133,7 +135,7 @@ async function handleCallAnalyzed(callData: any) {
     );
     return {
       success: true,
-      message: `Invalid or missing call_cost.total_duration_seconds for call ${call_id}`
+      message: `Invalid or missing call_cost.total_duration_seconds for call ${call_id}`,
     };
   }
 
@@ -146,7 +148,7 @@ async function handleCallAnalyzed(callData: any) {
       log.error(`Web call ${call_id} missing agent_id, cannot charge credits`);
       return {
         success: false,
-        message: `Web call ${call_id} missing agent_id, cannot charge credits`
+        message: `Web call ${call_id} missing agent_id, cannot charge credits`,
       };
     }
 
@@ -158,13 +160,12 @@ async function handleCallAnalyzed(callData: any) {
       log.error(`No agent found for providerAgentId ${agent_id}, call ${call_id}`);
       return {
         success: false,
-        message: `No agent found for providerAgentId ${agent_id}, call ${call_id}`
+        message: `No agent found for providerAgentId ${agent_id}, call ${call_id}`,
       };
     }
 
-
     userId = agent.userId ?? undefined;
-    teamId = agent.teamId ?? undefined;
+    teamId = agent.team?.parentId ?? agent.teamId ?? undefined;
 
     log.info(`Processing web call ${call_id} for agent ${agent_id}, user ${userId}, team ${teamId}`);
   } else {
@@ -179,7 +180,7 @@ async function handleCallAnalyzed(callData: any) {
     }
 
     userId = phoneNumber.userId ?? undefined;
-    teamId = phoneNumber.teamId ?? undefined;
+    teamId = phoneNumber.team?.parentId ?? phoneNumber.teamId ?? undefined;
 
     log.info(`Processing phone call ${call_id} from ${from_number}, user ${userId}, team ${teamId}`);
   }
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index e10c43eff99b58..ea48177a9971d3 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -3435,6 +3435,10 @@
   "low_credits_warning_message_user": "Your Cal.com account is running low on credits. To avoid any disruption in service, please purchase additional credits. If your balance runs out, SMS messages will stop sending and will be sent as emails instead.",
   "credit_limit_reached_message": "Your Cal.com team {{teamName}} has run out of credits. As a result, SMS messages are now being sent via email instead. To resume sending SMS, please purchase additional credits.",
   "credit_limit_reached_message_user": "Your Cal.com account has run out of credits. As a result, SMS messages are now being sent via email instead. To resume sending SMS, please purchase additional credits.",
+  "cal_ai_low_credits_warning_message": "Your Cal.com team {{teamName}} is running low on credits. To avoid any disruption in Cal AI phone service, please purchase additional credits. If your balance runs out, Cal AI phone calls will be disabled.",
+  "cal_ai_low_credits_warning_message_user": "Your Cal.com account is running low on credits. To avoid any disruption in Cal AI phone service, please purchase additional credits. If your balance runs out, Cal AI phone calls will be disabled.",
+  "cal_ai_credit_limit_reached_message": "Your Cal.com team {{teamName}} has run out of credits. As a result, Cal AI phone calls are now disabled. To resume using Cal AI phone calls, please purchase additional credits.",
+  "cal_ai_credit_limit_reached_message_user": "Your Cal.com account has run out of credits. As a result, Cal AI phone calls are now disabled. To resume using Cal AI phone calls, please purchase additional credits.",
   "current_credit_balance": "Current balance: {{balance}} credits",
   "current_balance": "Current balance:",
   "notification_about_your_booking": "Notification about your booking",
diff --git a/packages/emails/email-manager.ts b/packages/emails/email-manager.ts
index 74463692c4efac..7e6df457ce0204 100644
--- a/packages/emails/email-manager.ts
+++ b/packages/emails/email-manager.ts
@@ -10,6 +10,7 @@ import { formatCalEvent } from "@calcom/lib/formatCalendarEvent";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
+import type { CreditUsageType } from "@calcom/prisma/enums";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
@@ -810,28 +811,32 @@ export const sendCreditBalanceLowWarningEmails = async (input: {
     t: TFunction;
   };
   balance: number;
+  creditFor?: CreditUsageType;
 }) => {
-  const { team, balance, user } = input;
+  const { team, balance, user, creditFor } = input;
   if ((!team || !team.adminAndOwners.length) && !user) return;
 
   if (team) {
     const emailsToSend: Promise<unknown>[] = [];
 
     for (const admin of team.adminAndOwners) {
-      emailsToSend.push(sendEmail(() => new CreditBalanceLowWarningEmail({ user: admin, balance, team })));
+      emailsToSend.push(
+        sendEmail(() => new CreditBalanceLowWarningEmail({ user: admin, balance, team, creditFor }))
+      );
     }
 
     await Promise.all(emailsToSend);
   }
 
   if (user) {
-    await sendEmail(() => new CreditBalanceLowWarningEmail({ user, balance }));
+    await sendEmail(() => new CreditBalanceLowWarningEmail({ user, balance, creditFor }));
   }
 };
 
 export const sendCreditBalanceLimitReachedEmails = async ({
   team,
   user,
+  creditFor,
 }: {
   team?: {
     name: string;
@@ -849,6 +854,7 @@ export const sendCreditBalanceLimitReachedEmails = async ({
     email: string;
     t: TFunction;
   };
+  creditFor?: CreditUsageType;
 }) => {
   if ((!team || !team.adminAndOwners.length) && !user) return;
 
@@ -856,13 +862,15 @@ export const sendCreditBalanceLimitReachedEmails = async ({
     const emailsToSend: Promise<unknown>[] = [];
 
     for (const admin of team.adminAndOwners) {
-      emailsToSend.push(sendEmail(() => new CreditBalanceLimitReachedEmail({ user: admin, team })));
+      emailsToSend.push(
+        sendEmail(() => new CreditBalanceLimitReachedEmail({ user: admin, team, creditFor }))
+      );
     }
     await Promise.all(emailsToSend);
   }
 
   if (user) {
-    await sendEmail(() => new CreditBalanceLimitReachedEmail({ user }));
+    await sendEmail(() => new CreditBalanceLimitReachedEmail({ user, creditFor }));
   }
 };
 
diff --git a/packages/emails/src/templates/CreditBalanceLimitReachedEmail.tsx b/packages/emails/src/templates/CreditBalanceLimitReachedEmail.tsx
index 23353747987c89..dbd43d74b6fe05 100644
--- a/packages/emails/src/templates/CreditBalanceLimitReachedEmail.tsx
+++ b/packages/emails/src/templates/CreditBalanceLimitReachedEmail.tsx
@@ -1,6 +1,7 @@
 import type { TFunction } from "i18next";
 
 import { WEBAPP_URL } from "@calcom/lib/constants";
+import { CreditUsageType } from "@calcom/prisma/enums";
 
 import { CallToAction, V2BaseEmailHtml } from "../components";
 import type { BaseScheduledEmail } from "./BaseScheduledEmail";
@@ -17,9 +18,11 @@ export const CreditBalanceLimitReachedEmail = (
       email: string;
       t: TFunction;
     };
+    creditFor?: CreditUsageType;
   } & Partial<React.ComponentProps<typeof BaseScheduledEmail>>
 ) => {
-  const { team, user } = props;
+  const { team, user, creditFor } = props;
+  const isCalAi = creditFor === CreditUsageType.CAL_AI_PHONE_CALL;
 
   if (team) {
     return (
@@ -28,7 +31,11 @@ export const CreditBalanceLimitReachedEmail = (
           <> {user.t("hi_user_name", { name: user.name })},</>
         </p>
         <p style={{ fontWeight: 400, lineHeight: "24px", marginBottom: "20px" }}>
-          <>{user.t("credit_limit_reached_message", { teamName: team.name })}</>
+          <>
+            {isCalAi
+              ? user.t("cal_ai_credit_limit_reached_message", { teamName: team.name })
+              : user.t("credit_limit_reached_message", { teamName: team.name })}
+          </>
         </p>
         <div style={{ textAlign: "center", marginTop: "24px" }}>
           <CallToAction
@@ -47,7 +54,11 @@ export const CreditBalanceLimitReachedEmail = (
         <> {user.t("hi_user_name", { name: user.name })},</>
       </p>
       <p style={{ fontWeight: 400, lineHeight: "24px", marginBottom: "20px" }}>
-        <>{user.t("credit_limit_reached_message_user")}</>
+        <>
+          {isCalAi
+            ? user.t("cal_ai_credit_limit_reached_message_user")
+            : user.t("credit_limit_reached_message_user")}
+        </>
       </p>
       <div style={{ textAlign: "center", marginTop: "24px" }}>
         <CallToAction
diff --git a/packages/emails/src/templates/CreditBalanceLowWarningEmail.tsx b/packages/emails/src/templates/CreditBalanceLowWarningEmail.tsx
index 35f75108b9738d..1624ceba5e4795 100644
--- a/packages/emails/src/templates/CreditBalanceLowWarningEmail.tsx
+++ b/packages/emails/src/templates/CreditBalanceLowWarningEmail.tsx
@@ -1,6 +1,7 @@
 import type { TFunction } from "i18next";
 
 import { WEBAPP_URL } from "@calcom/lib/constants";
+import { CreditUsageType } from "@calcom/prisma/enums";
 
 import { CallToAction, V2BaseEmailHtml } from "../components";
 import type { BaseScheduledEmail } from "./BaseScheduledEmail";
@@ -18,9 +19,11 @@ export const CreditBalanceLowWarningEmail = (
       email: string;
       t: TFunction;
     };
+    creditFor?: CreditUsageType;
   } & Partial<React.ComponentProps<typeof BaseScheduledEmail>>
 ) => {
-  const { team, balance, user } = props;
+  const { team, balance, user, creditFor } = props;
+  const isCalAi = creditFor === CreditUsageType.CAL_AI_PHONE_CALL;
 
   if (team) {
     return (
@@ -29,7 +32,11 @@ export const CreditBalanceLowWarningEmail = (
           <> {user.t("hi_user_name", { name: user.name })},</>
         </p>
         <p style={{ fontWeight: 400, lineHeight: "24px", marginBottom: "20px" }}>
-          <>{user.t("low_credits_warning_message", { teamName: team.name })}</>
+          <>
+            {isCalAi
+              ? user.t("cal_ai_low_credits_warning_message", { teamName: team.name })
+              : user.t("low_credits_warning_message", { teamName: team.name })}
+          </>
         </p>
         <p
           style={{
@@ -56,7 +63,11 @@ export const CreditBalanceLowWarningEmail = (
         <> {user.t("hi_user_name", { name: user.name })},</>
       </p>
       <p style={{ fontWeight: 400, lineHeight: "24px", marginBottom: "20px" }}>
-        <>{user.t("low_credits_warning_message_user")}</>
+        <>
+          {isCalAi
+            ? user.t("cal_ai_low_credits_warning_message_user")
+            : user.t("low_credits_warning_message_user")}
+        </>
       </p>
       <div style={{ textAlign: "center", marginTop: "24px" }}>
         <CallToAction
diff --git a/packages/emails/templates/credit-balance-limit-reached-email.ts b/packages/emails/templates/credit-balance-limit-reached-email.ts
index c437aedbcba51c..2f8356b734e8bd 100644
--- a/packages/emails/templates/credit-balance-limit-reached-email.ts
+++ b/packages/emails/templates/credit-balance-limit-reached-email.ts
@@ -1,6 +1,7 @@
 import type { TFunction } from "i18next";
 
 import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
+import type { CreditUsageType } from "@calcom/prisma/enums";
 
 import { renderEmail } from "..";
 import BaseEmail from "./_base-email";
@@ -16,17 +17,21 @@ export default class CreditBalanceLimitReachedEmail extends BaseEmail {
     id: number;
     name: string;
   };
+  creditFor?: CreditUsageType;
 
   constructor({
     user,
     team,
+    creditFor,
   }: {
     user: { id: number; name: string | null; email: string; t: TFunction };
     team?: { id: number; name: string | null };
+    creditFor?: CreditUsageType;
   }) {
     super();
     this.user = { ...user, name: user.name || "" };
     this.team = team ? { ...team, name: team.name || "" } : undefined;
+    this.creditFor = creditFor;
   }
 
   protected async getNodeMailerPayload(): Promise<Record<string, unknown>> {
@@ -39,6 +44,7 @@ export default class CreditBalanceLimitReachedEmail extends BaseEmail {
       html: await renderEmail("CreditBalanceLimitReachedEmail", {
         team: this.team,
         user: this.user,
+        creditFor: this.creditFor,
       }),
       text: this.getTextBody(),
     };
diff --git a/packages/emails/templates/credit-balance-low-warning-email.ts b/packages/emails/templates/credit-balance-low-warning-email.ts
index bc9c9f34357e47..02b66b1a535ab6 100644
--- a/packages/emails/templates/credit-balance-low-warning-email.ts
+++ b/packages/emails/templates/credit-balance-low-warning-email.ts
@@ -1,6 +1,7 @@
 import type { TFunction } from "i18next";
 
 import { EMAIL_FROM_NAME } from "@calcom/lib/constants";
+import type { CreditUsageType } from "@calcom/prisma/enums";
 
 import { renderEmail } from "..";
 import BaseEmail from "./_base-email";
@@ -17,20 +18,24 @@ export default class CreditBalanceLowWarningEmail extends BaseEmail {
     name: string;
   };
   balance: number;
+  creditFor?: CreditUsageType;
 
   constructor({
     user,
     balance,
     team,
+    creditFor,
   }: {
     user: { id: number; name: string | null; email: string; t: TFunction };
     balance: number;
     team?: { id: number; name: string | null };
+    creditFor?: CreditUsageType;
   }) {
     super();
     this.user = { ...user, name: user.name || "" };
     this.team = team ? { ...team, name: team.name || "" } : undefined;
     this.balance = balance;
+    this.creditFor = creditFor;
   }
 
   protected async getNodeMailerPayload(): Promise<Record<string, unknown>> {
@@ -44,6 +49,7 @@ export default class CreditBalanceLowWarningEmail extends BaseEmail {
         balance: this.balance,
         team: this.team,
         user: this.user,
+        creditFor: this.creditFor,
       }),
       text: this.getTextBody(),
     };
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 3f80f16d816fac..56245987fcc833 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -15,8 +15,7 @@ import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import { MembershipRepository } from "@calcom/lib/server/repository/membership";
 import { TeamRepository } from "@calcom/lib/server/repository/team";
 import prisma, { type PrismaTransaction } from "@calcom/prisma";
-import type { CreditUsageType } from "@calcom/prisma/enums";
-import { CreditType } from "@calcom/prisma/enums";
+import { CreditUsageType, CreditType } from "@calcom/prisma/enums";
 
 const log = logger.getSubLogger({ prefix: ["[CreditService]"] });
 
@@ -37,6 +36,7 @@ type LowCreditBalanceResultBase = {
     email: string;
     t: TFunction;
   };
+  creditFor?: CreditUsageType;
 };
 
 type LowCreditBalanceLimitReachedResult = LowCreditBalanceResultBase & {
@@ -136,6 +136,7 @@ export class CreditService {
             teamId: teamIdToCharge,
             userId: userIdToCharge,
             remainingCredits: remainingCredits ?? 0,
+            creditFor,
             tx,
           });
         }
@@ -413,11 +414,13 @@ export class CreditService {
     teamId,
     userId,
     remainingCredits,
+    creditFor,
     tx,
   }: {
     teamId?: number | null;
     userId?: number | null;
     remainingCredits: number;
+    creditFor?: CreditUsageType;
     tx: PrismaTransaction;
   }): Promise<LowCreditBalanceResult> {
     let warningLimit = 0;
@@ -486,6 +489,7 @@ export class CreditService {
           user,
           teamId,
           userId,
+          creditFor,
         };
       }
 
@@ -512,6 +516,7 @@ export class CreditService {
         balance: remainingCredits,
         team: teamWithAdmins,
         user,
+        creditFor,
       };
     }
 
@@ -533,26 +538,37 @@ export class CreditService {
   private async _handleLowCreditBalanceResult(result: LowCreditBalanceResult) {
     if (!result) return;
 
+    console.log("handleLowCreditBalanceResult", result);
+
     try {
       if (result.type === "LIMIT_REACHED") {
-        await Promise.all([
+        const promises: Promise<unknown>[] = [
           sendCreditBalanceLimitReachedEmails({
             team: result.team,
             user: result.user,
+            creditFor: result.creditFor,
           }).catch((error) => {
             log.error("Failed to send credit limit reached email", error, { result });
           }),
-          cancelScheduledMessagesAndScheduleEmails({ teamId: result.teamId, userId: result.userId }).catch(
-            (error) => {
-              log.error("Failed to cancel scheduled messages", error, { result });
-            }
-          ),
-        ]);
+        ];
+
+        if (result.creditFor === CreditUsageType.SMS) {
+          promises.push(
+            cancelScheduledMessagesAndScheduleEmails({ teamId: result.teamId, userId: result.userId }).catch(
+              (error) => {
+                log.error("Failed to cancel scheduled messages", error, { result });
+              }
+            )
+          );
+        }
+
+        await Promise.all(promises);
       } else if (result.type === "WARNING") {
         await sendCreditBalanceLowWarningEmails({
           balance: result.balance,
           team: result.team,
           user: result.user,
+          creditFor: result.creditFor,
         }).catch((error) => {
           log.error("Failed to send credit warning email", error, { result });
         });
diff --git a/packages/features/tasker/tasks/executeAIPhoneCall.ts b/packages/features/tasker/tasks/executeAIPhoneCall.ts
index 308442ab175700..4702afe7643a3c 100644
--- a/packages/features/tasker/tasks/executeAIPhoneCall.ts
+++ b/packages/features/tasker/tasks/executeAIPhoneCall.ts
@@ -1,10 +1,17 @@
+import type { TFunction } from "i18next";
+
 import dayjs from "@calcom/dayjs";
+import { sendCreditBalanceLimitReachedEmails } from "@calcom/emails/email-manager";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import logger from "@calcom/lib/logger";
+import { getTranslation } from "@calcom/lib/server/i18n";
+import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma from "@calcom/prisma";
+import { CreditUsageType } from "@calcom/prisma/enums";
 
 interface ExecuteAIPhoneCallPayload {
   workflowReminderId: number;
@@ -107,15 +114,78 @@ export async function executeAIPhoneCall(payload: string) {
       });
 
       if (!hasCredits) {
-        log.warn(`Insufficient credits for AI phone call`, {
+        log.warn(`Insufficient credits for AI phone call for workflow reminder ${data.workflowReminderId}`, {
           userId: data.userId,
           teamId: data.teamId,
           workflowReminderId: data.workflowReminderId,
           bookingUid: workflowReminder.booking?.uid,
         });
-        throw new Error(
-          `Insufficient credits to make AI phone call. Please purchase more credits. user: ${data?.userId}, team: ${data?.teamId}`
-        );
+
+        try {
+          let teamWithAdmins:
+            | {
+                id: number;
+                name: string;
+                adminAndOwners: { id: number; name: string | null; email: string; t: TFunction }[];
+              }
+            | undefined;
+          let user:
+            | {
+                id: number;
+                name: string | null;
+                email: string;
+                t: TFunction;
+              }
+            | undefined;
+
+          if (data.teamId) {
+            const teamRepository = new TeamRepository(prisma);
+            const team = await teamRepository.findTeamWithAdminMembers({ teamId: data.teamId });
+
+            if (team) {
+              teamWithAdmins = {
+                id: team.id,
+                name: team.name ?? "",
+                adminAndOwners: await Promise.all(
+                  team.members.map(async (member) => ({
+                    id: member.user.id,
+                    name: member.user.name,
+                    email: member.user.email,
+                    t: await getTranslation(member.user.locale ?? "en", "common"),
+                  }))
+                ),
+              };
+            }
+          } else if (data.userId) {
+            const userRepository = new UserRepository(prisma);
+            const userRecord = await userRepository.findById({ id: data.userId });
+
+            if (userRecord) {
+              user = {
+                id: userRecord.id,
+                name: userRecord.name,
+                email: userRecord.email,
+                t: await getTranslation(userRecord.locale ?? "en", "common"),
+              };
+            }
+          }
+
+          if (teamWithAdmins || user) {
+            await sendCreditBalanceLimitReachedEmails({
+              team: teamWithAdmins,
+              user,
+              creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+            });
+            log.info("Credit limit reached email sent for AI phone call", {
+              userId: data.userId,
+              teamId: data.teamId,
+            });
+          }
+        } catch (emailError) {
+          log.error("Failed to send credit limit email for AI phone call", emailError);
+        }
+
+        return;
       }
     }
 
diff --git a/packages/lib/server/repository/PrismaAgentRepository.ts b/packages/lib/server/repository/PrismaAgentRepository.ts
index 21bec58da8540c..6da2d814eb9733 100644
--- a/packages/lib/server/repository/PrismaAgentRepository.ts
+++ b/packages/lib/server/repository/PrismaAgentRepository.ts
@@ -177,6 +177,12 @@ export class PrismaAgentRepository {
         teamId: true,
         createdAt: true,
         updatedAt: true,
+        team: {
+          select: {
+            id: true,
+            parentId: true,
+          },
+        },
       },
       where: {
         providerAgentId,
diff --git a/packages/lib/server/repository/PrismaPhoneNumberRepository.ts b/packages/lib/server/repository/PrismaPhoneNumberRepository.ts
index 0d7e1af1c09423..00a4e73659811b 100644
--- a/packages/lib/server/repository/PrismaPhoneNumberRepository.ts
+++ b/packages/lib/server/repository/PrismaPhoneNumberRepository.ts
@@ -528,7 +528,7 @@ export class PrismaPhoneNumberRepository {
         userId: true,
         teamId: true,
         user: { select: { id: true, email: true, name: true } },
-        team: { select: { id: true, name: true } },
+        team: { select: { id: true, name: true, parentId: true } },
       },
     });
   }
diff --git a/packages/lib/server/repository/team.ts b/packages/lib/server/repository/team.ts
index a522773559bb7e..0b794f47f1a72d 100644
--- a/packages/lib/server/repository/team.ts
+++ b/packages/lib/server/repository/team.ts
@@ -437,4 +437,31 @@ export class TeamRepository {
 
     return !conflictingTeam;
   }
+
+  async findTeamWithAdminMembers({ teamId }: { teamId: number }) {
+    return await this.prismaClient.team.findUnique({
+      where: { id: teamId },
+      select: {
+        id: true,
+        name: true,
+        members: {
+          where: {
+            role: {
+              in: [MembershipRole.ADMIN, MembershipRole.OWNER],
+            },
+          },
+          select: {
+            user: {
+              select: {
+                id: true,
+                name: true,
+                email: true,
+                locale: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
 }

From 95659ca6eee97a3e252663c8afaf572e43670373 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 13:33:16 +0530
Subject: [PATCH 02/18] fix: remove

---
 packages/features/ee/billing/credit-service.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 56245987fcc833..c9086ec8020719 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -538,8 +538,6 @@ export class CreditService {
   private async _handleLowCreditBalanceResult(result: LowCreditBalanceResult) {
     if (!result) return;
 
-    console.log("handleLowCreditBalanceResult", result);
-
     try {
       if (result.type === "LIMIT_REACHED") {
         const promises: Promise<unknown>[] = [

From c2d38899bb5005b26fcbeff4a40098322edcc9ce Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 14:07:05 +0530
Subject: [PATCH 03/18] fix: org

---
 .../ee/billing/credit-service.test.ts         | 31 ++++++++++++-
 .../features/ee/billing/credit-service.ts     | 45 ++++++++++++++++---
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index 1e61fae92eb07a..af3b08f82279db 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -12,7 +12,12 @@ import { CreditService } from "./credit-service";
 import { StripeBillingService } from "./stripe-billling-service";
 import { InternalTeamBilling } from "./teams/internal-team-billing";
 
-const MOCK_TX = {};
+const MOCK_TX = {
+  team: {
+    findMany: vi.fn().mockResolvedValue([]),
+    findUnique: vi.fn().mockResolvedValue(null),
+  },
+};
 
 vi.mock("@calcom/prisma", async (importOriginal) => {
   const actual = await importOriginal();
@@ -110,6 +115,12 @@ describe("CreditService", () => {
   describe("Team credits", () => {
     describe("hasAvailableCredits", () => {
       it("should return true if team has not yet reached limit", async () => {
+        vi.mocked(MOCK_TX.team.findUnique).mockResolvedValue({
+          id: 1,
+          isOrganization: false,
+          parentId: null,
+        });
+
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
           additionalCredits: 0,
@@ -134,6 +145,12 @@ describe("CreditService", () => {
       it("should return false if team limit reached this month", async () => {
         vi.setSystemTime(new Date("2024-06-20T11:59:59Z"));
 
+        vi.mocked(MOCK_TX.team.findUnique).mockResolvedValue({
+          id: 1,
+          isOrganization: false,
+          parentId: null,
+        });
+
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
           additionalCredits: 0,
@@ -158,6 +175,10 @@ describe("CreditService", () => {
           },
         ]);
 
+        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+          { id: 1, isOrganization: false, parentId: null },
+        ]);
+
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
           additionalCredits: 0,
@@ -184,6 +205,10 @@ describe("CreditService", () => {
           },
         ]);
 
+        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+          { id: 1, isOrganization: false, parentId: null },
+        ]);
+
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
           additionalCredits: 0,
@@ -767,6 +792,10 @@ describe("CreditService", () => {
         { teamId: 2 },
       ]);
 
+      vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+        { id: 2, isOrganization: false, parentId: null },
+      ]);
+
       vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
         id: "2",
         additionalCredits: 100,
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index c9086ec8020719..30670eea4a0851 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -167,7 +167,16 @@ export class CreditService {
       if (!IS_SMS_CREDITS_ENABLED) return true;
 
       if (teamId) {
-        const creditBalance = await CreditsRepository.findCreditBalance({ teamId }, tx);
+        // Check if this team has a parent organization
+        const team = await tx.team.findUnique({
+          where: { id: teamId },
+          select: { id: true, isOrganization: true, parentId: true },
+        });
+
+        // If team has a parent (organization), check parent's credits instead
+        const teamIdToCheck = team?.parentId ?? teamId;
+
+        const creditBalance = await CreditsRepository.findCreditBalance({ teamId: teamIdToCheck }, tx);
 
         const limitReached =
           creditBalance?.limitReachedAt &&
@@ -176,13 +185,13 @@ export class CreditService {
         if (!limitReached) return true;
 
         // check if team is still out of credits
-        const teamCredits = await this._getAllCreditsForTeam({ teamId, tx });
+        const teamCredits = await this._getAllCreditsForTeam({ teamId: teamIdToCheck, tx });
         const availableCredits = teamCredits.totalRemainingMonthlyCredits + teamCredits.additionalCredits;
 
         if (availableCredits > 0) {
           await CreditsRepository.updateCreditBalance(
             {
-              teamId,
+              teamId: teamIdToCheck,
               data: {
                 limitReachedAt: null,
                 warningSentAt: null,
@@ -218,6 +227,7 @@ export class CreditService {
 
   /*
     If user has memberships, it always returns a team, even if all have limit reached. In that case, limitReached: true is returned
+    Prioritizes organization credits over team credits
   */
   protected async _getTeamWithAvailableCredits({ userId, tx }: { userId: number; tx: PrismaTransaction }) {
     const memberships = await MembershipRepository.findAllAcceptedPublishedTeamMemberships(userId, tx);
@@ -226,11 +236,34 @@ export class CreditService {
       return null;
     }
 
-    //check if user is member of team that has available credits
+    const teams = await tx.team.findMany({
+      where: { id: { in: memberships.map((m) => m.teamId) } },
+      select: { id: true, isOrganization: true, parentId: true, parent: { select: { id: true } } },
+    });
+
+    const teamMap = new Map(teams.map((t) => [t.id, t]));
+
+    const orgMemberships: typeof memberships = [];
+    const teamMemberships: typeof memberships = [];
+
     for (const membership of memberships) {
-      const creditBalance = await CreditsRepository.findCreditBalance({ teamId: membership.teamId }, tx);
+      const team = teamMap.get(membership.teamId);
+      if (team?.isOrganization && !team.parentId) {
+        orgMemberships.push(membership);
+      } else {
+        teamMemberships.push(membership);
+      }
+    }
+
+    // Check organizations first, then teams
+    const orderedMemberships = [...orgMemberships, ...teamMemberships];
 
+
+    //check if user is member of team that has available credits
+    for (const membership of orderedMemberships) {
+      const creditBalance = await CreditsRepository.findCreditBalance({ teamId: membership.teamId }, tx);
       const allCredits = await this._getAllCreditsForTeam({ teamId: membership.teamId, tx });
+
       const limitReached =
         creditBalance?.limitReachedAt &&
         dayjs(creditBalance.limitReachedAt).isAfter(dayjs().startOf("month"));
@@ -260,7 +293,7 @@ export class CreditService {
     }
 
     return {
-      teamId: memberships[0].teamId,
+      teamId: orderedMemberships[0].teamId,
       availableCredits: 0,
       creditType: CreditType.ADDITIONAL,
       limitReached: true,

From c95a63c3bfac66fbe05f9eddadc708f912a2fea5 Mon Sep 17 00:00:00 2001
From: CarinaWolli <wollencarina@gmail.com>
Date: Thu, 9 Oct 2025 11:29:07 +0200
Subject: [PATCH 04/18] replace Cal AI with Cal.ai

---
 apps/web/app/(use-page-wrapper)/workflow/new/page.tsx     | 2 +-
 .../app/api/webhooks/retell-ai/__tests__/route.test.ts    | 6 +++---
 apps/web/public/static/locales/en/common.json             | 8 ++++----
 .../providers/retellAI/services/AgentService.ts           | 2 +-
 packages/features/calAIPhone/workflowTemplates.ts         | 4 ++--
 .../ee/workflows/lib/reminders/aiPhoneCallManager.ts      | 4 ++--
 packages/features/tasker/tasks/executeAIPhoneCall.ts      | 2 +-
 packages/lib/server/repository/PrismaApiKeyRepository.ts  | 2 +-
 .../routers/viewer/aiVoiceAgent/testCall.handler.ts       | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/web/app/(use-page-wrapper)/workflow/new/page.tsx b/apps/web/app/(use-page-wrapper)/workflow/new/page.tsx
index b6f616440920b8..6555cf19d8b015 100644
--- a/apps/web/app/(use-page-wrapper)/workflow/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflow/new/page.tsx
@@ -130,7 +130,7 @@ const Page = async ({ searchParams }: PageProps) => {
       throw error;
     }
 
-    console.error("Failed to create Cal AI workflow:", error);
+    console.error("Failed to create Cal.ai workflow:", error);
     redirect("/workflows?error=failed-to-create-workflow");
   }
 };
diff --git a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
index 6ba9e55da58d5d..44b357740b3f7b 100644
--- a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
+++ b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
@@ -876,7 +876,7 @@ describe("Retell AI Webhook Handler", () => {
     });
   });
 
-  describe("Cal AI Credit Type", () => {
+  describe("Cal.ai Credit Type", () => {
     beforeEach(() => {
       vi.clearAllMocks();
       vi.mocked(Retell.verify).mockReturnValue(true);
@@ -1037,7 +1037,7 @@ describe("Retell AI Webhook Handler", () => {
     });
   });
 
-  describe("Cal AI Credit Email Integration", () => {
+  describe("Cal.ai Credit Email Integration", () => {
     beforeEach(() => {
       vi.clearAllMocks();
       vi.mocked(Retell.verify).mockReturnValue(true);
@@ -1182,7 +1182,7 @@ describe("Retell AI Webhook Handler", () => {
       );
     });
 
-    it("should not pass SMS creditFor for Cal AI calls", async () => {
+    it("should not pass SMS creditFor for Cal.ai calls", async () => {
       const mockPhoneNumber: MockPhoneNumberWithTeam = {
         id: 2,
         phoneNumber: "+1234567890",
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index ea48177a9971d3..bea31c66e9de50 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -3435,10 +3435,10 @@
   "low_credits_warning_message_user": "Your Cal.com account is running low on credits. To avoid any disruption in service, please purchase additional credits. If your balance runs out, SMS messages will stop sending and will be sent as emails instead.",
   "credit_limit_reached_message": "Your Cal.com team {{teamName}} has run out of credits. As a result, SMS messages are now being sent via email instead. To resume sending SMS, please purchase additional credits.",
   "credit_limit_reached_message_user": "Your Cal.com account has run out of credits. As a result, SMS messages are now being sent via email instead. To resume sending SMS, please purchase additional credits.",
-  "cal_ai_low_credits_warning_message": "Your Cal.com team {{teamName}} is running low on credits. To avoid any disruption in Cal AI phone service, please purchase additional credits. If your balance runs out, Cal AI phone calls will be disabled.",
-  "cal_ai_low_credits_warning_message_user": "Your Cal.com account is running low on credits. To avoid any disruption in Cal AI phone service, please purchase additional credits. If your balance runs out, Cal AI phone calls will be disabled.",
-  "cal_ai_credit_limit_reached_message": "Your Cal.com team {{teamName}} has run out of credits. As a result, Cal AI phone calls are now disabled. To resume using Cal AI phone calls, please purchase additional credits.",
-  "cal_ai_credit_limit_reached_message_user": "Your Cal.com account has run out of credits. As a result, Cal AI phone calls are now disabled. To resume using Cal AI phone calls, please purchase additional credits.",
+  "cal_ai_low_credits_warning_message": "Your Cal.com team {{teamName}} is running low on credits. To avoid any disruption in Cal.ai phone service, please purchase additional credits. If your balance runs out, Cal.ai phone calls will be disabled.",
+  "cal_ai_low_credits_warning_message_user": "Your Cal.com account is running low on credits. To avoid any disruption in Cal.ai phone service, please purchase additional credits. If your balance runs out, Cal.ai phone calls will be disabled.",
+  "cal_ai_credit_limit_reached_message": "Your Cal.com team {{teamName}} has run out of credits. As a result, Cal.ai phone calls are now disabled. To resume using Cal.ai phone calls, please purchase additional credits.",
+  "cal_ai_credit_limit_reached_message_user": "Your Cal.com account has run out of credits. As a result, Cal.ai phone calls are now disabled. To resume using Cal.ai phone calls, please purchase additional credits.",
   "current_credit_balance": "Current balance: {{balance}} credits",
   "current_balance": "Current balance:",
   "notification_about_your_booking": "Notification about your booking",
diff --git a/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts b/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
index 6c867c9c56a061..8602a0adbff1d9 100644
--- a/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
+++ b/packages/features/calAIPhone/providers/retellAI/services/AgentService.ts
@@ -32,7 +32,7 @@ export class AgentService {
       userId,
       teamId,
       expiresAt: null,
-      note: `Cal AI Phone API Key for agent ${userId} ${teamId ? `for team ${teamId}` : ""}`,
+      note: `Cal.ai Phone API Key for agent ${userId} ${teamId ? `for team ${teamId}` : ""}`,
     });
   }
 
diff --git a/packages/features/calAIPhone/workflowTemplates.ts b/packages/features/calAIPhone/workflowTemplates.ts
index b8bed40a7f91af..79fff877a13c9a 100644
--- a/packages/features/calAIPhone/workflowTemplates.ts
+++ b/packages/features/calAIPhone/workflowTemplates.ts
@@ -18,7 +18,7 @@ const scheduleRule = ` ## Schedule Rule
 
 // Key are from components/sections/template/data/workflows.ts page in https://github.com/calcom/website
 export const calAIPhoneWorkflowTemplates = {
-  //  name: "Cal AI No-show Follow-up Call",
+  //  name: "Cal.ai No-show Follow-up Call",
   // description: "Automatically call attendee when marked as no-show"
   "wf-10": {
     generalPrompt: `## You are calling an attendee who was marked as a no-show for their appointment. Your goal is to help them reschedule. Be understanding, friendly, and non-judgmental.
@@ -47,7 +47,7 @@ ${responseGuideline}
   9. Thank them for their time and call function end_call to hang up.`,
   },
 
-  //   name: "Cal AI 1-hour Meeting Reminder",
+  //   name: "Cal.ai 1-hour Meeting Reminder",
   // description: "Remind attendee 1 hour before the meeting"
   "wf-11": {
     generalPrompt: `## You are calling to remind an attendee about their upcoming appointment in 1 hour. Be friendly, helpful, and concise.
diff --git a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
index aa3ffaa513a6da..027535f615da20 100644
--- a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
@@ -140,7 +140,7 @@ export const scheduleAIPhoneCall = async (args: ScheduleAIPhoneCallArgs) => {
   const featuresRepository = new FeaturesRepository(prisma);
   const calAIVoiceAgents = await featuresRepository.checkIfFeatureIsEnabledGlobally("cal-ai-voice-agents");
   if (!calAIVoiceAgents) {
-    logger.warn("Cal AI voice agents are disabled - skipping AI phone call scheduling");
+    logger.warn("Cal.ai voice agents are disabled - skipping AI phone call scheduling");
     return;
   }
 
@@ -259,7 +259,7 @@ const scheduleAIPhoneCallTask = async (args: ScheduleAIPhoneCallTaskArgs) => {
   const featuresRepository = new FeaturesRepository(prisma);
   const calAIVoiceAgents = await featuresRepository.checkIfFeatureIsEnabledGlobally("cal-ai-voice-agents");
   if (!calAIVoiceAgents) {
-    logger.warn("Cal AI voice agents are disabled - skipping AI phone call");
+    logger.warn("Cal.ai voice agents are disabled - skipping AI phone call");
     return;
   }
 
diff --git a/packages/features/tasker/tasks/executeAIPhoneCall.ts b/packages/features/tasker/tasks/executeAIPhoneCall.ts
index 4702afe7643a3c..ee502be99c4eef 100644
--- a/packages/features/tasker/tasks/executeAIPhoneCall.ts
+++ b/packages/features/tasker/tasks/executeAIPhoneCall.ts
@@ -38,7 +38,7 @@ export async function executeAIPhoneCall(payload: string) {
   const calAIVoiceAgents = await featuresRepository.checkIfFeatureIsEnabledGlobally("cal-ai-voice-agents");
 
   if (!calAIVoiceAgents) {
-    log.warn("Cal AI voice agents are disabled - skipping AI phone call");
+    log.warn("Cal.ai voice agents are disabled - skipping AI phone call");
     return;
   }
 
diff --git a/packages/lib/server/repository/PrismaApiKeyRepository.ts b/packages/lib/server/repository/PrismaApiKeyRepository.ts
index be4aae05b26917..f4d28ecbe0db33 100644
--- a/packages/lib/server/repository/PrismaApiKeyRepository.ts
+++ b/packages/lib/server/repository/PrismaApiKeyRepository.ts
@@ -28,7 +28,7 @@ export class PrismaApiKeyRepository {
       orderBy: { createdAt: "desc" },
     });
     return apiKeys.filter((apiKey) => {
-      if (apiKey.note?.startsWith("Cal AI Phone API Key")) {
+      if (apiKey.note?.startsWith("Cal.ai Phone API Key")) {
         return false;
       }
       return true;
diff --git a/packages/trpc/server/routers/viewer/aiVoiceAgent/testCall.handler.ts b/packages/trpc/server/routers/viewer/aiVoiceAgent/testCall.handler.ts
index 9769e9da3199e1..24f8018e8f680d 100644
--- a/packages/trpc/server/routers/viewer/aiVoiceAgent/testCall.handler.ts
+++ b/packages/trpc/server/routers/viewer/aiVoiceAgent/testCall.handler.ts
@@ -23,7 +23,7 @@ export const testCallHandler = async ({ ctx, input }: TestCallHandlerOptions) =>
   const featuresRepository = new FeaturesRepository(prisma);
   const calAIVoiceAgents = await featuresRepository.checkIfFeatureIsEnabledGlobally("cal-ai-voice-agents");
   if (!calAIVoiceAgents) {
-    logger.warn("Cal AI voice agents are disabled - skipping AI phone call scheduling");
+    logger.warn("Cal.ai voice agents are disabled - skipping AI phone call scheduling");
     return;
   }
 

From 5c0642974c1259deef562433aa12b8a56b5f35f4 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 20:51:14 +0530
Subject: [PATCH 05/18] fix: use

---
 .../ee/billing/credit-service.test.ts         | 143 ++++++++++++++++--
 .../features/ee/billing/credit-service.ts     |  25 ++-
 2 files changed, 143 insertions(+), 25 deletions(-)

diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index af3b08f82279db..95d6f1a47230ad 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -3,6 +3,7 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 
 import dayjs from "@calcom/dayjs";
 import * as EmailManager from "@calcom/emails/email-manager";
+import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
 import { MembershipRepository } from "@calcom/lib/server/repository/membership";
 import { TeamRepository } from "@calcom/lib/server/repository/team";
@@ -15,7 +16,7 @@ import { InternalTeamBilling } from "./teams/internal-team-billing";
 const MOCK_TX = {
   team: {
     findMany: vi.fn().mockResolvedValue([]),
-    findUnique: vi.fn().mockResolvedValue(null),
+    findFirst: vi.fn().mockResolvedValue(null),
   },
 };
 
@@ -71,6 +72,9 @@ vi.mock("@calcom/emails/email-manager");
 vi.mock("../workflows/lib/reminders/reminderScheduler", () => ({
   cancelScheduledMessagesAndScheduleEmails: vi.fn().mockResolvedValue(undefined),
 }));
+vi.mock("@calcom/lib/getOrgIdFromMemberOrTeamId", () => ({
+  default: vi.fn().mockResolvedValue(null),
+}));
 
 const creditService = new CreditService();
 
@@ -115,11 +119,7 @@ describe("CreditService", () => {
   describe("Team credits", () => {
     describe("hasAvailableCredits", () => {
       it("should return true if team has not yet reached limit", async () => {
-        vi.mocked(MOCK_TX.team.findUnique).mockResolvedValue({
-          id: 1,
-          isOrganization: false,
-          parentId: null,
-        });
+        vi.mocked(getOrgIdFromMemberOrTeamId).mockResolvedValue(null);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
@@ -145,11 +145,7 @@ describe("CreditService", () => {
       it("should return false if team limit reached this month", async () => {
         vi.setSystemTime(new Date("2024-06-20T11:59:59Z"));
 
-        vi.mocked(MOCK_TX.team.findUnique).mockResolvedValue({
-          id: 1,
-          isOrganization: false,
-          parentId: null,
-        });
+        vi.mocked(getOrgIdFromMemberOrTeamId).mockResolvedValue(null);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
           id: "1",
@@ -819,6 +815,131 @@ describe("CreditService", () => {
       expect(CreditsRepository.findCreditBalance).toHaveBeenCalledTimes(1);
       expect(CreditsRepository.findCreditBalance).toHaveBeenCalledWith({ teamId: 2 }, MOCK_TX);
     });
+
+    describe("Organization priority", () => {
+      it("should use organization credits when user belongs to org, ignoring team memberships", async () => {
+        vi.mocked(MembershipRepository.findAllAcceptedPublishedTeamMemberships).mockResolvedValue([
+          { teamId: 1 },
+          { teamId: 2 },
+        ]);
+
+        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+          { id: 1, isOrganization: true, parentId: null },
+          { id: 2, isOrganization: false, parentId: null },
+        ]);
+
+        vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
+          id: "1",
+          additionalCredits: 50,
+          limitReachedAt: null,
+          warningSentAt: null,
+        });
+
+        vi.spyOn(CreditService.prototype, "_getAllCreditsForTeam").mockResolvedValue({
+          totalMonthlyCredits: 1000,
+          totalRemainingMonthlyCredits: 800,
+          additionalCredits: 50,
+          totalCreditsUsedThisMonth: 200,
+        });
+
+        const result = await creditService.getTeamWithAvailableCredits(1);
+
+        expect(result).toEqual({
+          teamId: 1,
+          availableCredits: 850,
+          creditType: CreditType.MONTHLY,
+        });
+      });
+
+      it("should return org with limitReached when org has no credits, ignoring teams", async () => {
+        vi.mocked(MembershipRepository.findAllAcceptedPublishedTeamMemberships).mockResolvedValue([
+          { teamId: 1 },
+          { teamId: 2 },
+        ]);
+
+        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+          { id: 1, isOrganization: true, parentId: null },
+          { id: 2, isOrganization: false, parentId: null },
+        ]);
+
+        vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
+          id: "1",
+          additionalCredits: 0,
+          limitReachedAt: new Date(),
+          warningSentAt: null,
+        });
+
+        vi.spyOn(CreditService.prototype, "_getAllCreditsForTeam").mockResolvedValue({
+          totalMonthlyCredits: 1000,
+          totalRemainingMonthlyCredits: 0,
+          additionalCredits: 0,
+          totalCreditsUsedThisMonth: 1000,
+        });
+
+        const result = await creditService.getTeamWithAvailableCredits(1);
+
+        expect(result).toEqual({
+          teamId: 1,
+          availableCredits: 0,
+          creditType: CreditType.ADDITIONAL,
+          limitReached: true,
+        });
+      });
+
+      it("should check teams when user has no org membership", async () => {
+        vi.mocked(MembershipRepository.findAllAcceptedPublishedTeamMemberships).mockResolvedValue([
+          { teamId: 2 },
+        ]);
+
+        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
+          { id: 2, isOrganization: false, parentId: null },
+        ]);
+
+        vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
+          id: "2",
+          additionalCredits: 100,
+          limitReachedAt: null,
+          warningSentAt: null,
+        });
+
+        vi.spyOn(CreditService.prototype, "_getAllCreditsForTeam").mockResolvedValue({
+          totalMonthlyCredits: 500,
+          totalRemainingMonthlyCredits: 300,
+          additionalCredits: 100,
+          totalCreditsUsedThisMonth: 200,
+        });
+
+        const result = await creditService.getTeamWithAvailableCredits(1);
+
+        expect(result).toEqual({
+          teamId: 2,
+          availableCredits: 400,
+          creditType: CreditType.MONTHLY,
+        });
+      });
+
+      it("should use parent org credits when teamId belongs to org", async () => {
+        vi.mocked(getOrgIdFromMemberOrTeamId).mockResolvedValue(100);
+
+        vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
+          id: "100",
+          additionalCredits: 200,
+          limitReachedAt: null,
+          warningSentAt: null,
+        });
+
+        vi.spyOn(CreditService.prototype, "_getAllCreditsForTeam").mockResolvedValue({
+          totalMonthlyCredits: 2000,
+          totalRemainingMonthlyCredits: 1500,
+          additionalCredits: 200,
+          totalCreditsUsedThisMonth: 500,
+        });
+
+        const result = await creditService.hasAvailableCredits({ teamId: 50 });
+
+        expect(result).toBe(true);
+      });
+    });
   });
 
   describe("Idempotency", () => {
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 30670eea4a0851..c926bb313b4f14 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -9,6 +9,7 @@ import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billlin
 import { InternalTeamBilling } from "@calcom/features/ee/billing/teams/internal-team-billing";
 import { cancelScheduledMessagesAndScheduleEmails } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
 import { IS_SMS_CREDITS_ENABLED } from "@calcom/lib/constants";
+import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
@@ -167,14 +168,11 @@ export class CreditService {
       if (!IS_SMS_CREDITS_ENABLED) return true;
 
       if (teamId) {
-        // Check if this team has a parent organization
-        const team = await tx.team.findUnique({
-          where: { id: teamId },
-          select: { id: true, isOrganization: true, parentId: true },
-        });
+        // Check if this team belongs to an organization or is itself an organization
+        const orgId = await getOrgIdFromMemberOrTeamId({ teamId }, tx);
 
-        // If team has a parent (organization), check parent's credits instead
-        const teamIdToCheck = team?.parentId ?? teamId;
+        // Use organization credits if team belongs to org, otherwise use team's own credits
+        const teamIdToCheck = orgId ?? teamId;
 
         const creditBalance = await CreditsRepository.findCreditBalance({ teamId: teamIdToCheck }, tx);
 
@@ -227,7 +225,8 @@ export class CreditService {
 
   /*
     If user has memberships, it always returns a team, even if all have limit reached. In that case, limitReached: true is returned
-    Prioritizes organization credits over team credits
+    If user belongs to any organization, ONLY organization credits are checked (team memberships are ignored)
+    If user does not belong to an organization, team credits are checked
   */
   protected async _getTeamWithAvailableCredits({ userId, tx }: { userId: number; tx: PrismaTransaction }) {
     const memberships = await MembershipRepository.findAllAcceptedPublishedTeamMemberships(userId, tx);
@@ -255,12 +254,10 @@ export class CreditService {
       }
     }
 
-    // Check organizations first, then teams
-    const orderedMemberships = [...orgMemberships, ...teamMemberships];
-
+    // If user belongs to any organization, ONLY check organization credits
+    const membershipsToCheck = orgMemberships.length > 0 ? orgMemberships : teamMemberships;
 
-    //check if user is member of team that has available credits
-    for (const membership of orderedMemberships) {
+    for (const membership of membershipsToCheck) {
       const creditBalance = await CreditsRepository.findCreditBalance({ teamId: membership.teamId }, tx);
       const allCredits = await this._getAllCreditsForTeam({ teamId: membership.teamId, tx });
 
@@ -293,7 +290,7 @@ export class CreditService {
     }
 
     return {
-      teamId: orderedMemberships[0].teamId,
+      teamId: membershipsToCheck[0].teamId,
       availableCredits: 0,
       creditType: CreditType.ADDITIONAL,
       limitReached: true,

From f413c63820ba590d32fee39e5c362f67fa83e834 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 21:02:04 +0530
Subject: [PATCH 06/18] fix: feedback

---
 packages/features/ee/billing/credit-service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index c926bb313b4f14..4d537b2921b61a 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -580,7 +580,7 @@ export class CreditService {
           }),
         ];
 
-        if (result.creditFor === CreditUsageType.SMS) {
+        if (!result.creditFor || result.creditFor === CreditUsageType.SMS) {
           promises.push(
             cancelScheduledMessagesAndScheduleEmails({ teamId: result.teamId, userId: result.userId }).catch(
               (error) => {

From 27f30f5b5ec5f6f4fefba649f6373c9ea82598ab Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Thu, 9 Oct 2025 23:58:04 +0530
Subject: [PATCH 07/18] fix: types

---
 packages/lib/getOrgIdFromMemberOrTeamId.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/lib/getOrgIdFromMemberOrTeamId.ts b/packages/lib/getOrgIdFromMemberOrTeamId.ts
index 82875fc3a7dfd4..64dc34f71a6113 100644
--- a/packages/lib/getOrgIdFromMemberOrTeamId.ts
+++ b/packages/lib/getOrgIdFromMemberOrTeamId.ts
@@ -1,5 +1,7 @@
 import prisma from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
+import type { Prisma, PrismaClient } from "@calcom/prisma/client";
+
+type PrismaTransaction = Omit<PrismaClient, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use">;
 
 const getOrgMemberOrTeamWhere = (memberId?: number | null, teamId?: number | null) => {
   const conditions: Prisma.TeamWhereInput[] = [];
@@ -44,11 +46,15 @@ const getOrgMemberOrTeamWhere = (memberId?: number | null, teamId?: number | nul
   };
 };
 
-export default async function getOrgIdFromMemberOrTeamId(args: {
-  memberId?: number | null;
-  teamId?: number | null;
-}) {
-  const orgId = await prisma.team.findFirst({
+export default async function getOrgIdFromMemberOrTeamId(
+  args: {
+    memberId?: number | null;
+    teamId?: number | null;
+  },
+  tx?: PrismaTransaction
+) {
+  const client = tx ?? prisma;
+  const orgId = await client.team.findFirst({
     where: getOrgMemberOrTeamWhere(args.memberId, args.teamId),
     select: {
       id: true,

From ea19c1742a49afd5f90de8f4fccd7eb04d41e75d Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Fri, 10 Oct 2025 00:05:19 +0530
Subject: [PATCH 08/18] fix: types

---
 packages/lib/getOrgIdFromMemberOrTeamId.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/lib/getOrgIdFromMemberOrTeamId.ts b/packages/lib/getOrgIdFromMemberOrTeamId.ts
index 64dc34f71a6113..765c72ed4744ce 100644
--- a/packages/lib/getOrgIdFromMemberOrTeamId.ts
+++ b/packages/lib/getOrgIdFromMemberOrTeamId.ts
@@ -1,7 +1,5 @@
-import prisma from "@calcom/prisma";
-import type { Prisma, PrismaClient } from "@calcom/prisma/client";
-
-type PrismaTransaction = Omit<PrismaClient, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use">;
+import prisma, { type PrismaTransaction } from "@calcom/prisma";
+import type { Prisma } from "@calcom/prisma/client";
 
 const getOrgMemberOrTeamWhere = (memberId?: number | null, teamId?: number | null) => {
   const conditions: Prisma.TeamWhereInput[] = [];

From 1dabea49485a87ea029fe0ec98656d2d5a701b8c Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Fri, 10 Oct 2025 00:06:46 +0530
Subject: [PATCH 09/18] fix: types

---
 packages/features/ee/billing/credit-service.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 4d537b2921b61a..31f5957c2d6450 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -471,6 +471,11 @@ export class CreditService {
         creditBalance?.limitReachedAt &&
         (!teamId || dayjs(creditBalance?.limitReachedAt).isAfter(dayjs().startOf("month")))
       ) {
+        log.info("User or team has limit already reached or team has already reached limit this month", {
+          teamId,
+          userId,
+          creditBalance,
+        });
         return null; // user has limit already reached or team has already reached limit this month
       }
 

From 541984c01e8c154cac40f5805a6eae210b89c72a Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Fri, 10 Oct 2025 00:21:21 +0530
Subject: [PATCH 10/18] fix: tests

---
 .../api/webhooks/retell-ai/__tests__/route.test.ts   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
index c5c97b80f5a57d..6de8609356c94d 100644
--- a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
+++ b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
@@ -899,7 +899,7 @@ describe("Retell AI Webhook Handler", () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(PrismaAgentRepository.findByProviderAgentId).mockResolvedValue(mockAgent);
+      mockFindByProviderAgentId.mockResolvedValue(mockAgent);
       mockChargeCredits.mockResolvedValue(undefined);
 
       const body: RetellWebhookBody = {
@@ -951,7 +951,7 @@ describe("Retell AI Webhook Handler", () => {
         team: null,
       };
 
-      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
       mockChargeCredits.mockResolvedValue(undefined);
 
       const body: RetellWebhookBody = {
@@ -1004,7 +1004,7 @@ describe("Retell AI Webhook Handler", () => {
         user: null,
       };
 
-      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
       mockChargeCredits.mockResolvedValue(undefined);
 
       const body: RetellWebhookBody = {
@@ -1066,7 +1066,7 @@ describe("Retell AI Webhook Handler", () => {
         team: null,
       };
 
-      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
 
       mockChargeCredits.mockImplementation(async (params) => {
         if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
@@ -1132,7 +1132,7 @@ describe("Retell AI Webhook Handler", () => {
         updatedAt: new Date(),
       };
 
-      vi.mocked(PrismaAgentRepository.findByProviderAgentId).mockResolvedValue(mockAgent);
+      mockFindByProviderAgentId.mockResolvedValue(mockAgent);
 
       mockChargeCredits.mockImplementation(async (params) => {
         if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
@@ -1203,7 +1203,7 @@ describe("Retell AI Webhook Handler", () => {
         user: null,
       };
 
-      vi.mocked(PrismaPhoneNumberRepository.findByPhoneNumber).mockResolvedValue(mockPhoneNumber);
+      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
       mockChargeCredits.mockResolvedValue({ teamId: 5 });
 
       const body: RetellWebhookBody = {

From 966e8829b9cbe88ad6f9d8143fe2b18a82973491 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 21 Oct 2025 17:10:57 +0530
Subject: [PATCH 11/18] Merge branch 'main' into fix/cal-ai-credits

---
 .agents/knowledge-base.md                     |  220 ++-
 .github/CODEOWNERS                            |    9 +-
 .vscode/settings.json                         |    3 +-
 .yarn/versions/13de130d.yml                   |    0
 .yarn/versions/3a60c02f.yml                   |    0
 .yarn/versions/492e4e82.yml                   |    0
 .yarn/versions/c0a99150.yml                   |    2 +
 .yarn/versions/e11ed2da.yml                   |    0
 README.md                                     |    9 +-
 .../v1/lib/helpers/rateLimitApiKey.test.ts    |    4 +-
 apps/api/v1/lib/helpers/rateLimitApiKey.ts    |    2 +-
 apps/api/v1/lib/helpers/verifyApiKey.test.ts  |  152 +-
 apps/api/v1/lib/helpers/verifyApiKey.ts       |   37 +-
 apps/api/v1/lib/utils/isLockedOrBlocked.ts    |   10 +-
 apps/api/v1/lib/validations/user.ts           |    2 +-
 .../api/bookings/[id]/recordings/_get.ts      |    2 +-
 .../[id]/transcripts/[recordingId]/_get.ts    |    2 +-
 .../api/bookings/[id]/transcripts/_get.ts     |    2 +-
 apps/api/v1/pages/api/bookings/_post.ts       |   14 +-
 .../v1/pages/api/connected-calendars/_get.ts  |    2 +-
 .../api/v1/pages/api/teams/[teamId]/_patch.ts |    2 +-
 .../v1/pages/api/users/[userId]/_delete.ts    |    2 +-
 apps/api/v1/pages/api/users/_post.ts          |    2 +-
 .../lib/bookings/[id]/recordings/_get.test.ts |    4 +-
 .../transcripts/[recordingId]/_get.test.ts    |    4 +-
 .../bookings/[id]/transcripts/_get.test.ts    |    4 +-
 apps/api/v1/test/lib/bookings/_post.test.ts   |    4 +-
 apps/api/v1/test/lib/users/_post.test.ts      |  109 +-
 .../test/lib/utils/isLockedOrBlocked.test.ts  |   64 +-
 .../ee/bookings/2024-04-15/bookings.module.ts |    6 +
 .../bookings.controller.e2e-spec.ts           |   16 +-
 .../controllers/bookings.controller.ts        |   61 +-
 .../ee/bookings/2024-08-13/bookings.module.ts |    6 +
 .../controllers/bookings.controller.ts        |   62 +-
 .../controllers/e2e/user-bookings.e2e-spec.ts |  151 +-
 .../2024-08-13/services/bookings.service.ts   |  117 +-
 .../2024-08-13/services/errors.service.ts     |   13 +
 .../2024-08-13/services/input.service.ts      |    2 +-
 .../services/event-types.service.ts           |    6 +-
 .../event-types.controller.e2e-spec.ts        |  191 ++-
 .../controllers/event-types.controller.ts     |   28 +-
 .../services/input-event-types.service.ts     |   90 +-
 .../services/output-event-types.service.ts    |   28 +
 .../transformed/event-type.tranformed.ts      |    2 +
 .../internal-to-api/booking-fields.ts         |    2 +-
 .../controllers/schedules.controller.ts       |   29 +-
 .../src/lib/modules/booking-cancel.module.ts  |   10 +
 .../src/lib/modules/instant-booking.module.ts |    8 +
 .../lib/modules/recurring-booking.module.ts   |   10 +
 .../src/lib/modules/regular-booking.module.ts |   32 +
 .../lib/services/booking-cancel.service.ts    |   15 +
 .../instant-booking-create.service.ts         |    6 +
 .../lib/services/recurring-booking.service.ts |   13 +
 .../lib/services/regular-booking.service.ts   |   46 +
 .../controllers/atoms.schedules.controller.ts |   57 +
 ...m.ts => is-event-type-workflow-in-team.ts} |    9 +-
 .../is-routing-form-workflow-in-team.ts       |   59 +
 ...-member-team-admin-event-types.e2e-spec.ts |   13 +
 .../event-types/services/input.service.ts     |   73 +-
 .../event-types/services/output.service.ts    |   30 +-
 .../organizations/organizations.module.ts     |    8 +-
 .../org-team-workflows.controller.e2e-spec.ts |  570 +++++++-
 .../org-team-workflows.controller.ts          |  142 +-
 ...am-event-type-slots.controller.e2e-spec.ts |  206 ++-
 .../controllers/slots.controller.ts           |   12 +-
 .../services/slots.service.ts                 |   21 +-
 .../inputs/get-team-memberships.input.ts      |    5 +-
 .../users/inputs/create-managed-user.input.ts |    6 +-
 .../users/inputs/update-managed-user.input.ts |    3 +
 ...ts => create-event-type-workflow.input.ts} |   45 +-
 .../workflows/inputs/create-form-workflow.ts  |  106 ++
 ...ts => update-event-type-workflow.input.ts} |  118 +-
 .../inputs/update-form-workflow.input.ts      |   97 ++
 .../workflows/inputs/workflow-step.input.ts   |  108 +-
 .../inputs/workflow-trigger.input.ts          |   95 +-
 ...flow.output.ts => base-workflow.output.ts} |  142 +-
 .../outputs/event-type-workflow.output.ts     |  140 ++
 .../outputs/routing-form-workflow.output.ts   |  138 ++
 .../team-event-type-workflows.service.ts      |  113 ++
 ...=> team-routing-form-workflows.service.ts} |   62 +-
 .../services/workflows.input.service.ts       |  185 ++-
 .../services/workflows.output.service.ts      |  307 +++-
 .../modules/workflows/workflows.repository.ts |   73 +-
 .../booking-successful/[uid]/page.tsx         |   50 +
 .../team/[slug]/[type]/pageWithCachedData.tsx |    2 +-
 .../team/[slug]/[type]/queries.ts             |    4 +-
 .../(main-nav)/availability/page.tsx          |   13 +-
 .../(main-nav)/bookings/[status]/page.tsx     |    2 +-
 .../(main-nav)/teams/server-page.tsx          |    4 +-
 .../apps/(homepage)/page.tsx                  |    2 +-
 .../getting-started/[[...step]]/page.tsx      |    2 +-
 .../admin/organizations/[id]/edit/page.tsx    |    2 +-
 .../admin/users/[id]/edit/page.tsx            |    2 +-
 .../SettingsLayoutAppDirClient.tsx            |   50 +-
 .../developer/webhooks/[id]/page.tsx          |    5 +-
 .../settings/(settings-layout)/layout.tsx     |   20 +-
 .../(org-admin-only)/privacy/page.tsx         |   27 +-
 .../_components/FingerprintAnimation.tsx      |   63 +
 .../roles/_components/PbacOptInModal.tsx      |  129 ++
 .../roles/_components/PbacOptInView.tsx       |   59 +
 .../organizations/roles/page.tsx              |   20 +-
 .../teams/other/(main-page)/page.tsx          |    2 +-
 .../organizations/new/resume/page.tsx         |   22 +
 .../video/meeting-not-started/[uid]/page.tsx  |    2 +-
 .../app/(use-page-wrapper)/workflows/page.tsx |    2 +-
 .../app/api/availability/calendar/route.ts    |    2 +-
 apps/web/app/api/cancel/route.ts              |    9 +
 .../api/cron/calendar-subscriptions/route.ts  |    2 +-
 apps/web/app/api/cron/credentials/route.ts    |    4 +-
 .../app/api/cron/selected-calendars/route.ts  |    2 +-
 .../web/app/api/recorded-daily-video/route.ts |    2 +-
 .../web/app/api/support/conversation/route.ts |    4 +-
 apps/web/app/api/teams/api/create/route.ts    |    5 +
 apps/web/app/api/teams/create/route.ts        |    3 +
 apps/web/app/api/username/route.ts            |    2 +-
 .../video/recording/__tests__/route.test.ts   |    4 +-
 apps/web/app/api/video/recording/route.ts     |    2 +-
 .../calendar-subscription/[provider]/route.ts |    2 +-
 apps/web/app/cache/membership.ts              |    2 +-
 apps/web/components/apps/AppPage.tsx          |   25 +-
 .../apps/alby/AlbyPaymentComponent.tsx        |    2 +-
 .../btcpayserver/BtcpayPaymentComponent.tsx   |    2 +-
 .../components/booking/BookingListItem.tsx    |   75 +
 apps/web/components/booking/bookingActions.ts |   29 +-
 .../components/dialog/ReportBookingDialog.tsx |  139 ++
 apps/web/components/dialog/RerouteDialog.tsx  |    2 +-
 apps/web/components/error/error-page.tsx      |    1 +
 .../[[...step]]/getServerSideProps.ts         |    2 +-
 .../getServerSidePropsRoutingLink.ts          |   11 +-
 .../getServerSidePropsSingleForm.ts           |    4 +-
 apps/web/lib/booking.ts                       |   18 +-
 .../d/[link]/[slug]/getServerSideProps.tsx    |   11 +-
 .../team/[slug]/[type]/getServerSideProps.ts  |    4 +-
 apps/web/lib/pages/auth/verify-email.test.ts  |    6 +-
 apps/web/lib/pages/auth/verify-email.ts       |    4 +-
 .../reschedule/[uid]/getServerSideProps.ts    |    4 +-
 .../team/[slug]/[type]/getServerSideProps.tsx |   20 +-
 .../lib/team/[slug]/getServerSideProps.tsx    |    2 +-
 apps/web/lib/types/booking.ts                 |    6 +-
 .../web/lib/video/[uid]/getServerSideProps.ts |    8 +-
 .../meeting-ended/[uid]/getServerSideProps.ts |    2 +-
 .../[uid]/getServerSideProps.ts               |    2 +-
 apps/web/modules/auth/login-view.tsx          |    4 +-
 .../availability/availability-view.tsx        |    1 +
 .../bookings/components/BookingsCalendar.tsx  |   34 +
 .../bookings/components/BookingsList.tsx      |   69 +
 apps/web/modules/bookings/types.ts            |   25 +
 ...ookings-single-view.getServerSideProps.tsx |   11 +-
 .../bookings/views/bookings-single-view.tsx   |   12 +-
 ...ngs-listing-view.tsx => bookings-view.tsx} |  102 +-
 .../settings/my-account/general-view.tsx      |   16 +
 .../new/_components/AddNewTeamsForm.tsx       |    1 +
 .../new/_components/OnboardMembersView.tsx    |   71 +-
 .../new/_components/PaymentStatusView.tsx     |    6 +-
 .../organizations/new/resume-view.tsx         |  114 ++
 .../organizations/privacy/blocklist-table.tsx |  207 +++
 .../blocklist-entry-details-sheet.tsx         |  131 ++
 .../create-blocklist-entry-modal.tsx          |  173 +++
 .../settings/teams/[id]/event-types-view.tsx  |    2 +-
 apps/web/modules/test-setup.ts                |    2 +-
 .../users/views/users-public-view.test.tsx    |    9 +-
 apps/web/package.json                         |    5 +-
 apps/web/pages/_error.tsx                     |    1 +
 apps/web/pages/api/book/event.ts              |   15 +-
 apps/web/pages/api/book/instant-event.ts      |   11 +-
 apps/web/pages/api/book/recurring-event.ts    |   21 +-
 .../booking-duplicate-api-calls.e2e.ts        |  196 ++-
 apps/web/playwright/booking-seats.e2e.ts      |   18 +-
 apps/web/playwright/fixtures/apps.ts          |    3 +-
 apps/web/playwright/fixtures/users.ts         |    2 +-
 apps/web/playwright/lib/orgMigration.ts       |    2 +-
 .../organization-creation-flows.e2e.ts        |  451 ++++++
 .../organization/organization-creation.e2e.ts |  475 -------
 apps/web/playwright/out-of-office.e2e.ts      |   14 +-
 apps/web/playwright/payment-apps.e2e.ts       |   22 +-
 apps/web/public/static/locales/en/common.json |   78 +-
 .../lib/[user]/[type]/getServerSideProps.ts   |    6 +-
 .../server/lib/[user]/getServerSideProps.ts   |   17 +-
 .../sso/[provider]/getServerSideProps.tsx     |    2 +-
 apps/web/test/lib/checkBookingLimits.test.ts  |    2 +-
 apps/web/test/lib/checkDurationLimits.test.ts |    4 +-
 apps/web/test/lib/generateCsv.test.ts         |    5 +-
 .../utils/bookingScenario/bookingScenario.ts  |   32 +-
 .../getMockRequestDataForBooking.ts           |    1 +
 docs/api-reference/v2/openapi.json            | 1231 ++++++++++++++---
 docs/images/deploy-northflank.svg             |   79 ++
 docs/mint.json                                |   15 +-
 docs/platform/atoms/calendar-view.mdx         |    9 +-
 docs/platform/atoms/create-schedule.mdx       |  127 ++
 docs/platform/atoms/event-type.mdx            |   16 +-
 docs/platform/atoms/list-schedules.mdx        |  116 ++
 docs/self-hosting/deployments/northflank.mdx  |   13 +
 infra/README.md                               |    3 -
 infra/docker/api/Dockerfile                   |   73 -
 package.json                                  |    3 -
 packages/app-store/_appRegistry.ts            |    2 +-
 packages/app-store/_utils/installation.ts     |    2 +-
 .../_utils/oauth/getCurrentTokenObject.ts     |    2 +-
 .../_utils/oauth/updateProfilePhotoGoogle.ts  |    2 +-
 .../_utils/oauth/updateTokenObject.ts         |    2 +-
 .../_utils/throwIfNotHaveAdminAccessToTeam.ts |    2 +-
 .../pages/setup/_getServerSideProps.tsx       |    2 +-
 .../dailyvideo/lib/VideoApiAdapter.ts         |    4 +-
 .../app-store/delegationCredential.test.ts    |   10 +-
 packages/app-store/delegationCredential.ts    |    8 +-
 .../app-store/dub/lib/AnalyticsService.ts     |    2 +-
 packages/app-store/getVideoAdapters.ts        |   45 +
 .../app-store/googlecalendar/api/callback.ts  |    2 +-
 .../googlecalendar/lib/CalendarService.ts     |    2 +-
 .../lib/__tests__/getFreeBusyResult.test.ts   |  135 ++
 packages/app-store/hubspot/lib/CrmService.ts  |   19 +-
 packages/app-store/jelly/config.json          |    2 +-
 .../routing-forms/api/responses/[formId].ts   |    5 +-
 .../routerGetCrmContactOwnerEmail.ts          |    2 +-
 .../lib/formSubmissionUtils.test.ts           |  150 +-
 .../routing-forms/lib/formSubmissionUtils.ts  |   26 +-
 .../routing-forms/lib/getSerializableForm.ts  |    2 +-
 .../routing-forms/lib/handleResponse.test.ts  |    2 +
 .../lib/isFormCreateEditAllowed.ts            |    2 +-
 .../app-store/salesforce/lib/CrmService.ts    |    4 +-
 .../__tests__/CrmService.integration.test.ts  |   10 +-
 .../routingForm/incompleteBookingAction.ts    |    2 +-
 .../lib/routingFormBookingFormHandler.ts      |    2 +-
 .../api/__tests__/portal.test.ts              |    4 +-
 .../stripepayment/lib/PaymentService.ts       |    2 +-
 .../lib/getCustomerAndCheckoutSession.ts      |    2 +-
 .../lib/services/base/BillingPortalService.ts |    2 +-
 .../factory/BillingPortalServiceFactory.ts    |    2 +-
 packages/app-store/vital/lib/reschedule.ts    |    2 +-
 .../wipemycalother/lib/reschedule.ts          |    2 +-
 .../src/components/UserFieldsResponses.tsx    |    2 +-
 packages/embeds/embed-core/index.html         |    8 +
 .../embed-core/playground/lib/playground.ts   |    5 +
 .../embed-core/playwright/lib/testUtils.ts    |   16 +
 .../playwright/tests/action-based.e2e.ts      |   29 +
 .../embeds/embed-core/src/embed-iframe.ts     |  102 +-
 .../__tests__/isLinkReady.test.ts             |   11 +-
 .../src/embed-iframe/__tests__/utils.test.ts  |  230 +++
 .../src/embed-iframe/lib/embedStore.ts        |    4 +-
 .../embed-core/src/embed-iframe/lib/utils.ts  |  108 +-
 packages/features/apps/components/AllApps.tsx |    2 +-
 packages/features/apps/components/AppCard.tsx |    2 +-
 packages/features/auth/SAMLLogin.tsx          |    2 +-
 .../auth}/lib/getLocaleFromRequest.ts         |    0
 .../features/auth/lib/getServerSession.ts     |    2 +-
 .../auth}/lib/hooks/useLastUsed.tsx           |    0
 .../features/auth/lib/next-auth-options.ts    |    8 +-
 packages/features/auth/lib/verifyEmail.ts     |   15 +-
 .../auth/signup/handlers/calcomHandler.ts     |   13 +-
 .../auth/signup/handlers/selfHostedHandler.ts |    2 +-
 .../signup/utils/createOrUpdateMemberships.ts |    2 +-
 .../auth/signup/utils/organization.ts         |    2 +-
 packages/features/auth/signup/utils/token.ts  |    2 +-
 .../auth/signup/utils}/validateUsername.ts    |    0
 .../filterRedundantDateRanges.test.ts         |    0
 .../filterRedundantDateRanges.ts              |    2 +-
 .../mergeOverlappingDateRanges.test.ts        |    2 +-
 .../mergeOverlappingDateRanges.ts             |    2 +-
 .../getAggregatedAvailability.test.ts         |    0
 .../getAggregatedAvailability.ts              |    8 +-
 .../availability/lib/getUserAvailability.ts   |   22 +-
 .../BookEventForm/BookEventForm.tsx           |   10 +-
 .../BookEventForm/BookingFields.tsx           |    3 +-
 .../components/DecoyBookingSuccessCard.tsx    |  115 ++
 .../Booker/components/LargeCalendar.tsx       |    4 +-
 .../Booker/components/hooks/useBookings.ts    |   68 +-
 .../components/hooks/useDecoyBooking.ts       |   31 +
 .../Booker/components/hooks/usePrefetch.ts    |   47 +-
 .../utils/areDifferentValidMonths.test.ts     |   53 +
 .../Booker/utils/areDifferentValidMonths.ts   |   14 +
 .../utils/getPrefetchMonthCount.test.ts       |  103 ++
 .../Booker/utils/getPrefetchMonthCount.ts     |   35 +
 .../Booker/utils/isMonthChange.test.ts        |   44 +
 .../bookings/Booker/utils/isMonthChange.ts    |   11 +
 .../utils/isMonthViewPrefetchEnabled.test.ts  |   65 +
 .../utils/isMonthViewPrefetchEnabled.ts       |   14 +
 .../utils/isPrefetchNextMonthEnabled.test.ts  |  208 +++
 .../utils/isPrefetchNextMonthEnabled.ts       |   29 +
 .../components/BookingSuccessCard.tsx         |  114 ++
 .../components/event-meta/Members.tsx         |    4 +-
 .../di/BookingCancelService.container.ts      |   14 +
 .../di/BookingCancelService.module.ts         |   24 +
 .../InstantBookingCreateService.container.ts  |   13 +
 .../di/InstantBookingCreateService.module.ts  |   20 +
 .../di/RecurringBookingService.container.ts   |   14 +
 .../di/RecurringBookingService.module.ts      |   25 +
 .../di}/RegularBookingService.container.ts    |    7 +-
 .../di}/RegularBookingService.module.ts       |   15 +-
 .../{di/bookings => bookings/di}/tokens.ts    |    2 +
 .../bookings}/hooks/useBookerUrl.ts           |    0
 .../features/bookings/lib/EventManager.ts     |    6 +-
 .../bookings/lib/bookingCreateBodySchema.ts   |   66 +-
 .../lib/bookingSuccessRedirect.test.ts        |    0
 .../bookings}/lib/bookingSuccessRedirect.ts   |    3 +-
 .../lib}/buildEventUrlFromBooking.test.ts     |    4 +-
 .../bookings/lib}/buildEventUrlFromBooking.ts |    5 +-
 .../bookings/lib}/checkBookingLimits.ts       |    9 +-
 .../bookings/lib}/checkDurationLimits.ts      |    9 +-
 .../bookings/lib/client/decoyBookingStore.ts  |   86 ++
 .../bookings/lib/create-instant-booking.ts    |   10 +-
 .../bookings/lib/dto/BookingCancel.d.ts       |   35 +
 packages/features/bookings/lib/dto/types.d.ts |   26 +-
 .../getAllCredentials.test.ts                 |    4 +-
 .../getAllCredentials.ts                      |    2 +-
 .../bookings/lib}/getAllUserBookings.ts       |    0
 .../features/bookings/lib/getBookingFields.ts |    2 +-
 .../lib/getBookingResponsesSchema.test.ts     |   60 +
 .../bookings/lib/getBookingResponsesSchema.ts |    5 +-
 .../bookings/lib/getCalEventResponses.ts      |    2 +-
 .../lib}/getLuckyUser.integration-test.ts     |    0
 .../features/bookings/lib/getLuckyUser.ts     |    6 +-
 .../bookings/lib/handleBookingRequested.ts    |    2 +-
 .../bookings/lib/handleCancelBooking.ts       |   51 +-
 .../bookings/lib/handleConfirmation.ts        |    4 +-
 .../features/bookings/lib/handleNewBooking.ts |  308 ++++-
 .../checkActiveBookingsLimitForBooker.ts      |    4 +-
 .../checkBookingAndDurationLimits.ts          |    4 +-
 .../checkIfBookerEmailIsBlocked.ts            |   52 +-
 .../handleNewBooking/ensureAvailableUsers.ts  |    2 +-
 .../handleNewBooking/getEventTypesFromDB.ts   |    3 +-
 .../getRequiresConfirmationFlags.ts           |    4 +-
 .../handleNewBooking/loadAndValidateUsers.ts  |    9 +-
 .../lib/handleNewBooking/loadUsers.ts         |    2 +-
 .../originalRescheduledBookingUtils.ts        |    2 +-
 .../test/booking-validations.test.ts          |  822 ++++++++++-
 .../test/buildDryRunBooking.test.ts           |    1 +
 .../test/buildEventForTeamEventType.test.ts   |    1 +
 .../test/email-verification-booking.test.ts   |   12 +-
 .../test/getNewBookingHandler.ts              |   15 +-
 .../test/handleNewRecurringBooking.test.ts    |  315 +----
 .../test/spam-booking.integration-test.ts     |  873 ++++++++++++
 .../bookings/lib/handleNewRecurringBooking.ts |   35 +-
 .../handleSeats/cancel/cancelAttendeeSeat.ts  |    8 +-
 .../bookings/lib/handleSeats/handleSeats.ts   |    2 +-
 .../lib/lastAttendeeDeleteBooking.ts          |    2 +-
 .../filterHostsBySameRoundRobinHost.test.ts   |    2 +-
 .../filterHostsBySameRoundRobinHost.ts        |    2 +-
 ...QualifiedHostsWithDelegationCredentials.ts |    2 +-
 packages/features/bookings/lib/index.ts       |    1 +
 .../lib/interfaces/IBookingCancelService.ts   |   12 +
 .../bookings/lib/payment/getBooking.ts        |    2 +-
 .../lib/payment/handleNoShowFee.test.ts       |   14 +-
 .../bookings/lib/payment/handleNoShowFee.ts   |    6 +-
 .../processNoShowFeeOnCancellation.test.ts    |    4 +-
 .../payment/processNoShowFeeOnCancellation.ts |    2 +-
 .../repositories/BookingRepository.test.ts}   |    2 +-
 .../repositories/BookingRepository.ts}        |  130 +-
 .../bookings/services/BookingAccessService.ts |   98 ++
 packages/features/bookings/types.ts           |   12 +-
 .../bot-detection/BotDetectionService.test.ts |    2 +-
 .../bot-detection/BotDetectionService.ts      |    2 +-
 .../busyTimes/lib}/getBusyTimesFromLimits.ts  |   11 +-
 .../busyTimes/services}/getBusyTimes.test.ts  |    0
 .../busyTimes/services}/getBusyTimes.ts       |    7 +-
 .../lib/getShouldServeCache.test.ts           |   92 ++
 .../calendar-cache/lib/getShouldServeCache.ts |    2 +-
 .../GoogleCalendarSubscription.adapter.ts     |   22 +-
 .../GoogleCalendarSubscriptionAdapter.test.ts |  124 +-
 .../lib/cache/CalendarCacheEventRepository.ts |    4 +-
 .../lib/cache/CalendarCacheEventService.ts    |    1 +
 .../CalendarCacheEventRepository.test.ts      |    4 +-
 .../CalendarCacheEventService.test.ts         |    7 +-
 .../lib/sync/CalendarSyncService.ts           |    2 +-
 .../features/calendar-view/LargeCalendar.tsx  |   45 +-
 .../lib/getConnectedDestinationCalendars.ts   |    2 +-
 .../weeklyview/components/Calendar.tsx        |    3 +-
 .../calendars/weeklyview/state/store.ts       |    6 +-
 .../calendars/weeklyview/types/state.ts       |    4 +
 packages/features/conferencing/README.md      |    2 +-
 .../conferencing/lib}/videoClient.ts          |   43 +-
 .../credentials/deleteCredential.test.ts      |    6 +-
 .../repositories/CredentialRepository.ts}     |    3 +-
 .../crmManager}/crmScheduler.ts               |    0
 packages/features/data-table/GUIDE.md         |    2 +-
 .../__tests__/filterSegments/create.test.ts   |    6 +-
 .../__tests__/filterSegments/delete.test.ts   |    6 +-
 .../__tests__/filterSegments/get.test.ts      |    6 +-
 .../__tests__/filterSegments/update.test.ts   |    6 +-
 .../data-table/hooks/useDebouncedWidth.ts     |    4 +-
 .../data-table/repositories}/filterSegment.ts |    0
 .../repositories}/filterSegment.type.ts       |    0
 .../DelegationCredentialRepository.test.ts}   |    8 +-
 .../DelegationCredentialRepository.ts}        |    3 +-
 .../InstantBookingCreateService.container.ts  |   14 -
 .../RecurringBookingService.container.ts      |   29 -
 .../InstantBookingCreateService.module.ts     |   11 -
 .../modules/RecurringBookingService.module.ts |   12 -
 .../features/di/containers/BookingLimits.ts   |    2 +-
 packages/features/di/containers/BusyTimes.ts  |    2 +-
 .../features/di/containers/InsightsBooking.ts |    4 +-
 .../features/di/containers/InsightsRouting.ts |    4 +-
 packages/features/di/modules/Booking.ts       |    2 +-
 packages/features/di/modules/BusyTimes.ts     |    5 +-
 .../features/di/modules/CheckBookingLimits.ts |    2 +-
 packages/features/di/modules/EventType.ts     |    2 +-
 .../features/di/modules/InsightsBooking.ts    |    4 +-
 .../features/di/modules/InsightsRouting.ts    |    4 +-
 packages/features/di/modules/Membership.ts    |    2 +-
 packages/features/di/modules/Team.ts          |    2 +-
 packages/features/di/modules/User.ts          |    2 +-
 packages/features/di/tokens.ts                |    7 +-
 .../features/di/watchlist/Watchlist.tokens.ts |   12 +
 .../containers/SpamCheckService.container.ts  |   11 +
 .../di/watchlist/containers/watchlist.ts      |   66 +
 .../di/watchlist/modules/Watchlist.module.ts  |   36 +
 .../ee/api-keys/lib}/autoLock.test.ts         |    2 +-
 .../ee/api-keys}/lib/autoLock.ts              |    4 +-
 .../billing/api/webhook/_invoice.paid.org.ts  |   40 +-
 .../ee/billing/billing-service-factory.ts     |    2 +-
 .../ee/billing/credit-service.test.ts         |   10 +-
 .../features/ee/billing/credit-service.ts     |   67 +-
 .../billing/repository/IBillingRepository.ts  |    7 +
 ...test.ts => stripe-billing-service.test.ts} |    2 +-
 ...g-service.ts => stripe-billing-service.ts} |   47 +-
 .../ee/dsync/lib}/assignValueToUser.test.ts   |    1 -
 .../ee/dsync/lib}/assignValueToUser.ts        |   20 +-
 .../ee/dsync/lib/handleGroupEvents.ts         |    2 +-
 .../features/ee/dsync/lib/handleUserEvents.ts |    4 +-
 .../ee/dsync/lib/inviteExistingUserToOrg.ts   |    2 +-
 .../ee/dsync/lib/removeUserFromOrg.ts         |    2 +-
 .../lib/users/createUsersAndConnectToOrg.ts   |    4 +-
 .../lib/users/inviteExistingUserToOrg.ts      |    2 +-
 .../lib/ImpersonationProvider.ts              |    2 +-
 .../__mocks__/organizationMock.ts}            |    4 +-
 .../components/AdminOnboardingHandover.tsx    |   81 +-
 .../components/CreateANewOrganizationForm.tsx |   50 +-
 .../lib/OrganizationPaymentService.test.ts    |   12 +-
 .../lib/OrganizationPaymentService.ts         |   45 +-
 .../lib/OrganizationPermissionService.ts      |    7 +-
 .../lib/ensureOrganizationIsReviewed.ts       |    2 +-
 .../lib}/getBookerBaseUrlSync.ts              |    0
 .../organizations/lib/getBookerUrlServer.ts}  |    4 +-
 .../ee/organizations/lib}/getBrand.ts         |    0
 .../organizations/lib/getTeamUrlSync.test.ts} |    7 +-
 .../ee/organizations/lib/getTeamUrlSync.ts}   |    3 +-
 .../organizations/lib/onboardingStore.test.ts |  389 ++++++
 .../ee/organizations/lib/onboardingStore.ts   |   89 +-
 .../ee/organizations/lib/orgDomains.ts        |    4 +-
 .../createOrganizationFromOnboarding.test.ts  |  540 --------
 .../createOrganizationFromOnboarding.ts       |  567 --------
 .../lib/server/orgCreationUtils.test.ts       |  116 ++
 .../lib/server/orgCreationUtils.ts            |   13 +-
 .../onboarding/BaseOnboardingService.ts       |  605 ++++++++
 .../BillingEnabledOrgOnboardingService.ts     |  270 ++++
 .../IOrganizationOnboardingService.ts         |   32 +
 .../OrganizationOnboardingFactory.ts          |   53 +
 .../onboarding/OrganizationOnboardingSetup.md |  170 +++
 .../onboarding/SelfHostedOnboardingService.ts |  230 +++
 .../__tests__/BaseOnboardingService.test.ts   |  249 ++++
 ...BillingEnabledOrgOnboardingService.test.ts |  814 +++++++++++
 .../OrganizationOnboardingFactory.test.ts     |  204 +++
 .../SelfHostedOnboardingService.test.ts       |  523 +++++++
 .../lib/service/onboarding/index.ts           |    5 +
 .../lib/service/onboarding/types.ts           |  109 ++
 .../features/ee/organizations/lib/utils.ts    |   42 +
 .../pages/components/OtherTeamList.tsx        |    2 +-
 .../pages/components/OtherTeamsListing.tsx    |    2 +-
 .../settings/other-team-members-view.tsx      |    5 +-
 .../organizations/pages/settings/privacy.tsx  |   34 +-
 .../OrganizationRepository.test.ts}           |    7 +-
 .../repositories/OrganizationRepository.ts}   |    7 +-
 .../ee/organizations/types/schemas.ts         |    2 +
 .../ee/payments/components/Payment.tsx        |    2 +-
 .../features/ee/payments/pages/payment.tsx    |    2 +-
 .../roundRobinManualReassignment.test.ts      |    2 +-
 .../roundRobinManualReassignment.ts           |   11 +-
 .../roundRobinReassignment.test.ts            |    2 +-
 .../ee/round-robin/roundRobinReassignment.ts  |    8 +-
 .../validateRoundRobinSlotAvailability.ts     |   90 ++
 packages/features/ee/sso/lib/sso.ts           |    2 +-
 .../components/MakeTeamPrivateSwitch.tsx      |    1 -
 .../components/TeamAvailabilityTimes.tsx      |    2 +-
 .../ee/teams/components/TeamEventTypeForm.tsx |    2 +-
 .../ee/teams/components/TeamListItem.tsx      |    2 +-
 .../deleteWorkflowRemindersOfRemovedMember.ts |    2 +-
 packages/features/ee/teams/lib/queries.ts     |    6 +-
 .../ee/teams/pages/team-profile-view.tsx      |    2 +-
 .../ee/teams/pages/team-settings-view.tsx     |   15 +-
 .../repositories/TeamRepository.test.ts}      |  176 ++-
 .../ee/teams/repositories/TeamRepository.ts}  |   51 +-
 .../services}/teamService.alternative.test.ts |    8 +-
 .../services}/teamService.integration-test.ts |    2 +-
 .../ee/teams/services}/teamService.test.ts    |   14 +-
 .../ee/teams/services}/teamService.ts         |    8 +-
 .../workflows/api/scheduleEmailReminders.ts   |    2 +-
 .../ee/workflows/api/scheduleSMSReminders.ts  |    2 +-
 .../workflows/components/AddActionDialog.tsx  |   15 +-
 .../components/WorkflowDetailsPage.tsx        |   81 +-
 .../components/WorkflowStepContainer.tsx      |  362 ++---
 .../ee/workflows/lib/actionHelperFunctions.ts |   13 +-
 .../features/ee/workflows/lib/constants.ts    |   14 +
 .../ee/workflows/lib/getAllWorkflows.ts       |   34 +-
 .../features/ee/workflows/lib/getOptions.ts   |   31 +-
 .../lib/reminders/aiPhoneCallManager.ts       |    2 +-
 .../lib/reminders/emailReminderManager.ts     |  155 ++-
 .../lib/reminders/reminderScheduler.ts        |  168 ++-
 .../lib/reminders/smsReminderManager.ts       |    8 +-
 .../lib/reminders/whatsappReminderManager.ts  |    4 +-
 .../lib/repository/workflowReminder.ts        |   16 +
 .../lib/service/WorkflowService.test.ts       |  209 +++
 .../workflows/lib/service/WorkflowService.ts  |  234 ++++
 .../features/ee/workflows/pages/index.tsx     |    2 +-
 .../features/ee/workflows/pages/workflow.tsx  |   58 +-
 .../repositories/WorkflowRepository.test.ts}  |    4 +-
 .../repositories/WorkflowRepository.ts}       |  416 +++++-
 packages/features/embed/lib/EmbedTabs.tsx     |    2 +-
 packages/features/embed/lib/hooks/index.tsx   |    2 +-
 .../components/ChildrenEventTypeSelect.tsx    |    2 +-
 .../components/CreateEventTypeDialog.tsx      |    2 +-
 .../components/CreateEventTypeForm.tsx        |    2 +-
 .../components/tabs/apps/EventAppsTab.tsx     |   20 +-
 .../MaxActiveBookingsPerBookerController.tsx  |    4 +-
 .../tabs/workflows/EventWorkfowsTab.tsx       |    7 +-
 .../eventtypes}/hooks/useCreateEventType.ts   |    0
 .../features/eventtypes/lib/defaultEvents.ts  |    1 +
 .../eventtypes/lib/getEventTypeById.ts        |    6 +-
 .../eventtypes/lib/getEventTypesByViewer.ts   |   12 +-
 .../features/eventtypes/lib/getPublicEvent.ts |    4 +-
 .../repositories/EventRepository.ts}          |    0
 .../repositories}/eventTypeRepository.ts      |   66 +-
 .../flags/components/AssignFeatureSheet.tsx   |  208 +++
 .../flags/components/FlagAdminList.tsx        |   72 +-
 packages/features/flags/config.ts             |    1 +
 .../features/flags/features.repository.ts     |   32 +
 packages/features/flags/hooks/index.ts        |    1 +
 .../features/form-builder/FormBuilder.tsx     |    1 +
 packages/features/form-builder/schema.ts      |   17 -
 packages/features/handleMarkNoShow.ts         |    6 +-
 .../repositories}/hashedLinkRepository.ts     |    0
 .../hashedLink/services}/hashedLinkService.ts |    8 +-
 .../components/routing/RoutedToPerPeriod.tsx  |   14 +-
 .../insights/server/routing-events.ts         |    2 +-
 .../services}/InsightsBookingBaseService.ts   |   11 +-
 .../services}/InsightsBookingDIService.ts     |    0
 ...InsightsBookingService.integration-test.ts |    2 +-
 .../services}/InsightsRoutingBaseService.ts   |    3 +-
 .../services}/InsightsRoutingDIService.ts     |    0
 ...InsightsRoutingService.integration-test.ts |    2 +-
 .../handleInstantMeeting.test.ts              |   19 +-
 .../instant-meeting/handleInstantMeeting.ts   |   20 +-
 .../repositories/MembershipRepository.ts}     |   42 +-
 .../membership/services}/membershipService.ts |    3 +-
 .../notifications/sendNotification.ts         |   24 +-
 packages/features/pbac/README.md              |  708 +++++-----
 .../pbac/domain/types/permission-registry.ts  |   42 +-
 .../repositories/PermissionRepository.ts      |   46 +-
 .../PermissionRepository.integration-test.ts  |  324 +++++
 .../pbac}/lib/entityPermissionUtils.server.ts |    0
 .../permission-check.service.test.ts          |    4 +-
 .../pbac/services/permission-check.service.ts |    2 +-
 .../profile/lib}/checkRegularUsername.ts      |    5 +-
 .../profile/lib}/checkUsername.ts             |    2 +-
 .../lib/createAProfileForAnExistingUser.ts    |   13 +-
 .../features/profile/lib/getBranding.test.ts  |  193 +++
 packages/features/profile/lib/getBranding.ts  |   98 ++
 .../profile}/lib/hideBranding.ts              |   44 +-
 .../repositories/ProfileRepository.ts}        |   31 +-
 .../routing-forms/lib/getRoutedUrl.test.ts    |    4 +-
 .../routing-forms/lib/getRoutedUrl.ts         |    2 +-
 .../components/DateOverrideInputDialog.tsx    |   11 +-
 .../schedules/components/DateOverrideList.tsx |   16 +-
 .../schedules/components/ScheduleListItem.tsx |    7 +-
 .../schedules}/lib/date-ranges.test.ts        |    0
 .../schedules}/lib/date-ranges.ts             |    0
 .../schedules}/lib/slots.test.ts              |    2 +-
 .../{ => features/schedules}/lib/slots.ts     |   10 +-
 packages/features/shell/SideBar.tsx           |    2 +-
 packages/features/tasker/tasker.ts            |    3 +
 .../tasks/analytics/sendAnalyticsEvent.ts     |    2 +-
 packages/features/tasker/tasks/index.ts       |    4 +
 .../tasker/tasks/scanWorkflowBody.test.ts     |    6 +-
 .../formSubmissionValidation.ts               |   96 ++
 .../triggerFormSubmittedNoEventWebhook.ts     |   60 +-
 ...riggerFormSubmittedNoEventWorkflow.test.ts |  177 +++
 .../triggerFormSubmittedNoEventWorkflow.ts    |   58 +
 .../components/AvailabilitySliderTable.tsx    |    2 +-
 .../timezone-buddy/components/TimeDial.tsx    |    2 +-
 .../components/LargeCalendar.tsx              |    1 +
 .../components/UserTable/UserListTable.tsx    |    6 +-
 .../features/users/lib/UserListTableUtils.ts  |   93 ++
 .../{userDeletionService.ts => deleteUser.ts} |    0
 .../repositories/UserRepository.test.ts}      |    3 +-
 .../users/repositories/UserRepository.ts}     |  151 +-
 .../services}/userCreationService.test.ts     |   60 +-
 .../users/services}/userCreationService.ts    |   14 +-
 packages/features/watchlist/lib/dto/index.ts  |   22 +
 .../features/watchlist/lib/dto/mappers.ts     |  119 ++
 packages/features/watchlist/lib/dto/types.ts  |  106 ++
 .../watchlist/lib/facade/WatchlistFeature.ts  |   47 +
 .../checkIfFreeEmailDomain.test.ts            |   63 +
 .../checkIfFreeEmailDomain.ts                 |   30 +
 .../freeEmailDomainCheck/freeEmailDomains.ts  |    0
 .../lib/interface/IAuditRepository.ts         |   33 +
 .../watchlist/lib/interface/IAuditService.ts  |   17 +
 .../lib/interface/IBlockingService.ts         |   11 +
 .../lib/interface/IWatchlistRepositories.ts   |   79 ++
 .../lib/interface/IWatchlistService.ts        |    9 +
 .../repository/GlobalWatchlistRepository.ts   |  136 ++
 .../OrganizationWatchlistRepository.ts        |  143 ++
 .../PrismaWatchlistAuditRepository.ts         |   93 ++
 .../lib/service/GlobalBlockingService.test.ts |  196 +++
 .../lib/service/GlobalBlockingService.ts      |   49 +
 .../OrganizationBlockingService.test.ts       |  175 +++
 .../service/OrganizationBlockingService.ts    |   59 +
 .../watchlist/lib/service/SpamCheckService.ts |   63 +
 .../lib/service/WatchlistAuditService.ts      |   44 +
 .../lib/service/WatchlistService.test.ts      |  373 +++++
 .../watchlist/lib/service/WatchlistService.ts |   87 ++
 .../features/watchlist/lib/telemetry/index.ts |    3 +
 .../watchlist/lib/telemetry/no-op-span.ts     |    9 +
 .../watchlist/lib/telemetry/sentry-span.ts    |   11 +
 .../features/watchlist/lib/telemetry/types.ts |   11 +
 packages/features/watchlist/lib/types.ts      |   61 +
 .../watchlist/lib/utils/normalization.test.ts |   97 ++
 .../watchlist/lib/utils/normalization.ts      |   93 ++
 ...k-if-email-in-watchlist.controller.test.ts |  247 ++++
 .../check-if-email-in-watchlist.controller.ts |   70 +-
 ...ck-if-users-are-blocked.controller.test.ts |  284 ++++
 .../check-if-users-are-blocked.controller.ts  |   74 +-
 ...list-all-system-entries.controller.test.ts |  327 +++++
 .../list-all-system-entries.controller.ts     |   31 +
 .../features/watchlist/watchlist.model.ts     |   22 -
 .../watchlist.repository.interface.ts         |    5 -
 .../watchlist/watchlist.repository.mock.ts    |   19 -
 .../watchlist/watchlist.repository.ts         |   95 --
 packages/features/webhooks/lib/dto/types.ts   |    2 +-
 .../lib/factory/FormPayloadBuilder.ts         |    2 +-
 .../webhooks/lib/interface/repository.ts      |   45 +-
 .../lib/repository/WebhookRepository.ts       |  195 ++-
 .../features/webhooks/lib/scheduleTrigger.ts  |    9 +-
 packages/features/webhooks/lib/sendPayload.ts |    7 +-
 .../lib/service/FormWebhookService.ts         |    2 +-
 .../features/webhooks/pages/webhooks-view.tsx |    2 +-
 packages/lib/CalEventParser.ts                |    2 +-
 .../lib => lib/bookings}/SystemField.ts       |    0
 .../getLabelValueMapFromResponses.ts          |    4 +-
 packages/lib/csvUtils.ts                      |   93 --
 packages/lib/dbReadResponseSchema.ts          |   18 +
 packages/lib/emailSchema.ts                   |   10 +
 packages/lib/errorCodes.ts                    |    4 +
 packages/lib/eslint.config.mjs                |    5 +
 .../checkIfFreeEmailDomain.test.ts            |   41 -
 .../checkIfFreeEmailDomain.ts                 |   14 -
 packages/lib/restrictionSchedule.ts           |   16 -
 .../transformers/getScheduleListItemData.ts   |   26 +
 .../repository/PrismaAgentRepository.ts       |   49 +-
 .../repository/PrismaApiKeyRepository.ts      |   19 +
 .../repository/PrismaRoutingFormRepository.ts |   45 +
 .../PrismaRoutingFormRepositoryInterface.ts   |    2 +
 .../server/repository/TeamRepository.test.ts  |  141 --
 .../repository/bookingReport.interface.ts     |   25 +
 .../server/repository/bookingReport.test.ts   |  130 ++
 .../lib/server/repository/bookingReport.ts    |   43 +
 .../lib/server/repository/formResponse.ts     |   34 +
 .../repository/organizationOnboarding.ts      |    4 +
 .../server/repository/watchlist.interface.ts  |   67 +
 .../server/repository/watchlist.repository.ts |  211 +++
 packages/lib/server/repository/webhook.ts     |  194 ---
 .../server/repository/workflowRelations.ts    |   94 ++
 .../lib/server/repository/workflowStep.ts     |   22 +
 packages/lib/server/service/ApiKeyService.ts  |   47 +
 packages/lib/server/service/workflows.ts      |  131 --
 .../service/attribute/server/getAttributes.ts |   32 +-
 packages/lib/tsconfig.json                    |    2 +-
 packages/platform/atoms/CHANGELOG.md          |   12 +
 .../availability/AvailabilitySettings.tsx     |   11 +-
 .../AvailabilitySettingsPlatformWrapper.tsx   |    1 +
 .../wrappers/CalendarViewPlatformWrapper.tsx  |  107 +-
 .../create-schedule/CreateScheduleForm.tsx    |  108 ++
 .../platform/atoms/create-schedule/index.tsx  |    1 +
 .../CreateSchedulePlatformWrapper.tsx         |   69 +
 .../CreateEventTypePlatformWrapper.tsx        |    2 +-
 .../wrappers/EventTypeWebWrapper.tsx          |   10 +-
 .../hooks/schedules/useAtomCreateSchedule.ts  |   48 +
 .../schedules/useAtomDuplicateSchedule.ts     |   45 +
 .../hooks/schedules/useAtomGetAllSchedules.ts |   30 +
 .../schedules/useEnsureDefaultSchedule.ts     |   22 +
 packages/platform/atoms/index.ts              |    6 +
 .../platform/atoms/list-schedules/index.ts    |    1 +
 .../wrappers/ListSchedulesPlatformWrapper.tsx |  129 ++
 packages/platform/atoms/package.json          |    2 +-
 .../[scheduleId].tsx}                         |    5 +
 .../base/src/pages/availability/index.tsx     |   23 +
 .../examples/base/src/pages/booking.tsx       |    2 +-
 .../availability-settings-atom.e2e.ts         |   13 +-
 packages/platform/libraries/app-store.ts      |    2 +-
 packages/platform/libraries/bookings.ts       |    9 +-
 packages/platform/libraries/conferencing.ts   |    2 +-
 packages/platform/libraries/event-types.ts    |    2 +
 packages/platform/libraries/index.ts          |   13 +-
 packages/platform/libraries/repositories.ts   |   10 +-
 packages/platform/libraries/schedules.ts      |   15 +
 packages/platform/libraries/slots.ts          |    4 +-
 .../2024-08-13/inputs/cancel-booking.input.ts |    5 +
 .../booker-active-booking-limit.input.ts      |   25 +
 .../inputs/create-event-type.input.ts         |   54 +-
 .../inputs/email-settings.input.ts            |   20 +
 .../event-types_2024_06_14/inputs/index.ts    |    1 +
 .../inputs/update-event-type.input.ts         |   63 +-
 ...eRecurrenceAndBookerActiveBookingsLimit.ts |   40 +
 .../booker-active-bookings-limit.output.ts    |   21 +
 .../outputs/event-type.output.ts              |   26 +-
 .../RequiresOneOfPropertiesWhenNotDisabled.ts |   49 +
 .../migration.sql                             |   26 +
 .../migration.sql                             |    2 +
 .../migration.sql                             |    5 +
 .../migration.sql                             |    9 +
 .../migration.sql                             |    2 +
 .../migration.sql                             |    3 +
 .../migration.sql                             |    9 +
 .../migration.sql                             |   49 +
 .../migration.sql                             |    2 +
 .../migration.sql                             |   14 +
 .../migration.sql                             |    4 +
 packages/prisma/schema.prisma                 |  131 +-
 packages/prisma/zod-utils.ts                  |    9 +-
 .../server/middlewares/sessionMiddleware.ts   |    9 +-
 .../apps/routing-forms/deleteForm.handler.ts  |    2 +-
 .../routing-forms/formMutation.handler.ts     |    2 +-
 .../apps/routing-forms/formQuery.handler.ts   |    2 +-
 .../apps/routing-forms/forms.handler.ts       |    2 +-
 .../getAttributesForTeam.handler.ts           |    2 +-
 .../getResponseWithFormFields.handler.ts      |    4 +-
 .../loggedInViewer/stripeCustomer.handler.ts  |    2 +-
 ...IfUserEmailVerificationRequired.handler.ts |   11 +
 .../routers/publicViewer/event.handler.ts     |    2 +-
 .../server/routers/viewer/admin/_router.ts    |   21 +
 .../admin/assignFeatureToTeam.handler.ts      |   36 +
 .../admin/assignFeatureToTeam.schema.ts       |    8 +
 .../admin/getTeamsForFeature.handler.ts       |   80 ++
 .../viewer/admin/getTeamsForFeature.schema.ts |   10 +
 .../admin/unassignFeatureFromTeam.handler.ts  |   30 +
 .../admin/unassignFeatureFromTeam.schema.ts   |    8 +
 .../admin/whitelistUserWorkflows.handler.ts   |    2 +-
 .../viewer/aiVoiceAgent/listCalls.handler.ts  |    2 +-
 .../apps/appCredentialsByType.handler.ts      |    2 +-
 ...amMembersMatchingAttributeLogic.handler.ts |    2 +-
 .../viewer/availability/list.handler.ts       |    5 +-
 .../availability/schedule/create.handler.ts   |    4 +-
 .../schedule/duplicate.handler.ts             |    4 +-
 .../team/listTeamAvailability.handler.ts      |    6 +-
 .../routers/viewer/bookings/_router.tsx       |   11 +
 .../viewer/bookings/addGuests.handler.ts      |   41 +-
 .../viewer/bookings/confirm.handler.ts        |    4 +-
 .../viewer/bookings/editLocation.handler.ts   |    6 +-
 .../routers/viewer/bookings/get.handler.ts    |   15 +-
 .../bookings/reportBooking.handler.test.ts    |  344 +++++
 .../viewer/bookings/reportBooking.handler.ts  |  137 ++
 .../viewer/bookings/reportBooking.schema.ts   |   11 +
 .../bookings/requestReschedule.handler.ts     |    6 +-
 .../calVideo/getCalVideoRecordings.handler.ts |    2 +-
 ...ownloadLinkOfCalVideoRecordings.handler.ts |    2 +-
 .../viewer/credits/buyCredits.handler.ts      |    8 +-
 .../credits/downloadExpenseLog.handler.ts     |    2 +-
 .../viewer/credits/getAllCredits.handler.ts   |    4 +-
 .../delegationCredential/add.handler.ts       |    2 +-
 .../delegationCredential/delete.handler.ts    |    2 +-
 .../getAffectedMembersForDisable.handler.ts   |    4 +-
 .../delegationCredential/list.handler.ts      |    2 +-
 .../toggleEnabled.handler.ts                  |    4 +-
 .../delegationCredential/update.handler.ts    |    2 +-
 .../viewer/delegationCredential/utils.ts      |    2 +-
 .../__tests__/getUserEventGroups.test.ts      |   64 +-
 .../viewer/eventTypes/__tests__/util.test.ts  |  161 ++-
 .../routers/viewer/eventTypes/_router.ts      |   24 +-
 .../eventTypes/getActiveOnOptions.handler.ts  |  275 ++++
 .../eventTypes/getActiveOnOptions.schema.ts   |    8 +
 .../getEventTypesFromGroup.handler.ts         |    2 +-
 .../eventTypes/getHashedLink.handler.ts       |    4 +-
 .../eventTypes/getHashedLinks.handler.ts      |    4 +-
 .../getTeamAndEventTypeOptions.handler.ts     |  227 ---
 .../getTeamAndEventTypeOptions.schema.ts      |   10 -
 .../eventTypes/getUserEventGroups.handler.ts  |    4 +-
 .../viewer/eventTypes/heavy/create.handler.ts |    2 +-
 .../heavy/duplicate.handler.test.ts           |    6 +-
 .../eventTypes/heavy/duplicate.handler.ts     |    2 +-
 .../viewer/eventTypes/heavy/update.handler.ts |    6 +-
 .../eventTypes/usecases/EventGroupBuilder.ts  |    4 +-
 .../server/routers/viewer/eventTypes/util.ts  |   20 +-
 .../viewer/eventTypes/utils/transformUtils.ts |    4 +-
 .../routers/viewer/filterSegments/_router.tsx |    2 +-
 .../viewer/filterSegments/create.handler.ts   |    4 +-
 .../viewer/filterSegments/delete.handler.ts   |    4 +-
 .../viewer/filterSegments/list.handler.ts     |    4 +-
 .../filterSegments/preference.handler.ts      |    4 +-
 .../viewer/filterSegments/update.handler.ts   |    4 +-
 .../routers/viewer/me/deleteMe.handler.ts     |    2 +-
 .../server/routers/viewer/me/get.handler.ts   |    5 +-
 .../routers/viewer/me/myStats.handler.ts      |    2 +-
 .../routers/viewer/me/platformMe.handler.ts   |    2 +-
 .../viewer/me/updateProfile.handler.ts        |    6 +-
 .../routers/viewer/me/updateProfile.schema.ts |    1 +
 .../__tests__/createTeams.handler.test.ts     |   52 +-
 .../routers/viewer/organizations/_router.tsx  |   29 +
 .../viewer/organizations/adminGet.handler.ts  |    2 +-
 .../organizations/adminVerify.handler.ts      |    2 +-
 .../organizations/bulkDeleteUsers.handler.ts  |    2 +-
 .../viewer/organizations/create.handler.ts    |   46 +-
 .../organizations/createSelfHosted.handler.ts |   46 +-
 .../organizations/createTeams.handler.ts      |    6 +-
 .../createWatchlistEntry.handler.test.ts      |  303 ++++
 .../createWatchlistEntry.handler.ts           |   86 ++
 .../createWatchlistEntry.schema.ts            |   11 +
 .../createWithPaymentIntent.handler.ts        |   25 +-
 .../createWithPaymentIntent.schema.ts         |    8 +
 .../deleteWatchlistEntry.handler.test.ts      |  194 +++
 .../deleteWatchlistEntry.handler.ts           |   77 ++
 .../deleteWatchlistEntry.schema.ts            |    7 +
 .../viewer/organizations/getBrand.handler.ts  |    2 +-
 .../getWatchlistEntryDetails.handler.test.ts  |  357 +++++
 .../getWatchlistEntryDetails.handler.ts       |   85 ++
 .../getWatchlistEntryDetails.schema.ts        |    7 +
 .../intentToCreateOrg.handler.test.ts         |  171 ++-
 .../intentToCreateOrg.handler.ts              |   46 +-
 .../organizations/intentToCreateOrg.schema.ts |   18 +-
 .../viewer/organizations/list.handler.ts      |    2 +-
 .../organizations/listMembers.handler.test.ts |    2 +-
 .../organizations/listMembers.handler.ts      |    2 +-
 .../listOtherTeamMembers.handler.ts           |    4 +-
 .../organizations/listOtherTeams.handler.ts   |    2 +-
 .../listWatchlistEntries.handler.ts           |   89 ++
 .../listWatchlistEntries.schema.ts            |   16 +
 .../organizations/updateUser.handler.ts       |    2 +-
 .../viewer/payments/chargeCard.handler.ts     |    2 +-
 .../server/routers/viewer/pbac/_router.tsx    |   52 +-
 ...rsMatchingAttributeLogicOfRoute.handler.ts |    6 +-
 .../viewer/routing-forms/response.handler.ts  |    2 +
 .../slots/handleNotificationWhenNoSlots.ts    |    4 +-
 .../viewer/slots/isAvailable.handler.ts       |    2 +-
 .../trpc/server/routers/viewer/slots/util.ts  |   20 +-
 .../viewer/teams/acceptOrLeave.handler.ts     |    2 +-
 .../viewer/teams/changeMemberRole.handler.ts  |    2 +-
 .../routers/viewer/teams/create.handler.ts    |    2 +-
 .../viewer/teams/createInvite.handler.ts      |    2 +-
 .../routers/viewer/teams/delete.handler.ts    |    2 +-
 .../routers/viewer/teams/get.handler.test.ts  |    4 +-
 .../routers/viewer/teams/get.handler.ts       |    2 +-
 .../teams/getMemberAvailability.handler.ts    |    2 +-
 .../viewer/teams/hasActiveTeamPlan.handler.ts |    2 +-
 .../viewer/teams/hasTeamPlan.handler.ts       |    2 +-
 .../inviteMember/inviteMember.handler.ts      |    2 +-
 .../viewer/teams/inviteMember/utils.ts        |    6 +-
 .../teams/inviteMemberByToken.handler.ts      |    2 +-
 .../viewer/teams/legacyListMembers.handler.ts |    2 +-
 .../routers/viewer/teams/list.handler.ts      |    2 +-
 .../viewer/teams/listMembers.handler.ts       |    6 +-
 .../routers/viewer/teams/publish.handler.ts   |    2 +-
 .../removeMember/BaseRemoveMemberService.ts   |    2 +-
 .../LegacyRemoveMemberService.test.ts         |    6 +-
 .../__tests__/PBACRemoveMemberService.test.ts |    4 +-
 .../viewer/teams/resendInvitation.handler.ts  |   19 +-
 .../getRoundRobinHostsToReasign.handler.ts    |    2 +-
 .../roundRobinManualReassign.handler.ts       |    2 +-
 .../roundRobin/roundRobinReassign.handler.ts  |    2 +-
 .../viewer/teams/skipTeamTrials.handler.ts    |    2 +-
 .../viewer/teams/skipTeamTrials.test.ts       |    4 +-
 .../routers/viewer/teams/update.handler.ts    |    2 +-
 .../routers/viewer/webhook/get.handler.ts     |    5 +-
 .../viewer/webhook/getByViewer.handler.ts     |    8 +-
 .../workflows/activateEventType.handler.ts    |    4 +-
 .../viewer/workflows/delete.handler.test.ts   |    4 +-
 .../viewer/workflows/delete.handler.ts        |    2 +-
 .../viewer/workflows/filteredList.handler.tsx |    2 +-
 .../routers/viewer/workflows/get.handler.ts   |    2 +-
 .../routers/viewer/workflows/get.schema.ts    |    4 +-
 .../workflows/getAllActiveWorkflows.schema.ts |    3 +-
 .../workflows/getVerifiedEmails.handler.ts    |    2 +-
 .../workflows/getVerifiedNumbers.handler.ts   |    2 +-
 .../routers/viewer/workflows/list.handler.ts  |  219 +--
 .../routers/viewer/workflows/list.schema.ts   |   11 +-
 .../viewer/workflows/update.handler.ts        |  547 +++-----
 .../routers/viewer/workflows/update.schema.ts |   69 +-
 .../server/routers/viewer/workflows/util.ts   |  143 +-
 .../ui/components/avatar/UserAvatarGroup.tsx  |    2 +-
 .../avatar/UserAvatarGroupWithOrg.tsx         |    2 +-
 .../editor/plugins/ToolbarPlugin.tsx          |   16 +-
 .../navigation/tabs/VerticalTabItem.tsx       |    1 +
 scripts/reassign-attributes.ts                |   41 +
 tests/libs/__mocks__/videoClient.ts           |    4 +-
 879 files changed, 29830 insertions(+), 7565 deletions(-)
 create mode 100644 .yarn/versions/13de130d.yml
 create mode 100644 .yarn/versions/3a60c02f.yml
 create mode 100644 .yarn/versions/492e4e82.yml
 create mode 100644 .yarn/versions/c0a99150.yml
 create mode 100644 .yarn/versions/e11ed2da.yml
 create mode 100644 apps/api/v2/src/lib/modules/booking-cancel.module.ts
 create mode 100644 apps/api/v2/src/lib/modules/instant-booking.module.ts
 create mode 100644 apps/api/v2/src/lib/modules/recurring-booking.module.ts
 create mode 100644 apps/api/v2/src/lib/modules/regular-booking.module.ts
 create mode 100644 apps/api/v2/src/lib/services/booking-cancel.service.ts
 create mode 100644 apps/api/v2/src/lib/services/instant-booking-create.service.ts
 create mode 100644 apps/api/v2/src/lib/services/recurring-booking.service.ts
 create mode 100644 apps/api/v2/src/lib/services/regular-booking.service.ts
 rename apps/api/v2/src/modules/auth/guards/workflows/{is-workflow-in-team.ts => is-event-type-workflow-in-team.ts} (82%)
 create mode 100644 apps/api/v2/src/modules/auth/guards/workflows/is-routing-form-workflow-in-team.ts
 rename apps/api/v2/src/modules/workflows/inputs/{create-workflow.input.ts => create-event-type-workflow.input.ts} (86%)
 create mode 100644 apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts
 rename apps/api/v2/src/modules/workflows/inputs/{update-workflow.input.ts => update-event-type-workflow.input.ts} (64%)
 create mode 100644 apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts
 rename apps/api/v2/src/modules/workflows/outputs/{workflow.output.ts => base-workflow.output.ts} (50%)
 create mode 100644 apps/api/v2/src/modules/workflows/outputs/event-type-workflow.output.ts
 create mode 100644 apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts
 create mode 100644 apps/api/v2/src/modules/workflows/services/team-event-type-workflows.service.ts
 rename apps/api/v2/src/modules/workflows/services/{team-workflows.service.ts => team-routing-form-workflows.service.ts} (50%)
 create mode 100644 apps/web/app/(booking-page-wrapper)/booking-successful/[uid]/page.tsx
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/FingerprintAnimation.tsx
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInModal.tsx
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx
 create mode 100644 apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
 create mode 100644 apps/web/components/dialog/ReportBookingDialog.tsx
 create mode 100644 apps/web/modules/bookings/components/BookingsCalendar.tsx
 create mode 100644 apps/web/modules/bookings/components/BookingsList.tsx
 create mode 100644 apps/web/modules/bookings/types.ts
 rename apps/web/modules/bookings/views/{bookings-listing-view.tsx => bookings-view.tsx} (82%)
 create mode 100644 apps/web/modules/settings/organizations/new/resume-view.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
 create mode 100644 apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
 create mode 100644 apps/web/playwright/organization/organization-creation-flows.e2e.ts
 delete mode 100644 apps/web/playwright/organization/organization-creation.e2e.ts
 create mode 100644 docs/images/deploy-northflank.svg
 create mode 100644 docs/platform/atoms/create-schedule.mdx
 create mode 100644 docs/platform/atoms/list-schedules.mdx
 create mode 100644 docs/self-hosting/deployments/northflank.mdx
 delete mode 100644 infra/README.md
 delete mode 100644 infra/docker/api/Dockerfile
 create mode 100644 packages/app-store/getVideoAdapters.ts
 create mode 100644 packages/app-store/googlecalendar/lib/__tests__/getFreeBusyResult.test.ts
 create mode 100644 packages/embeds/embed-core/src/embed-iframe/__tests__/utils.test.ts
 rename packages/{ => features/auth}/lib/getLocaleFromRequest.ts (100%)
 rename packages/{ => features/auth}/lib/hooks/useLastUsed.tsx (100%)
 rename packages/{lib => features/auth/signup/utils}/validateUsername.ts (100%)
 rename packages/{ => features/availability}/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts (100%)
 rename packages/{ => features/availability}/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts (95%)
 rename packages/{ => features/availability}/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts (97%)
 rename packages/{ => features/availability}/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts (92%)
 rename packages/{lib => features/availability/lib/getAggregatedAvailability}/getAggregatedAvailability.test.ts (100%)
 rename packages/{lib => features/availability/lib/getAggregatedAvailability}/getAggregatedAvailability.ts (87%)
 create mode 100644 packages/features/bookings/Booker/components/DecoyBookingSuccessCard.tsx
 create mode 100644 packages/features/bookings/Booker/components/hooks/useDecoyBooking.ts
 create mode 100644 packages/features/bookings/Booker/utils/areDifferentValidMonths.test.ts
 create mode 100644 packages/features/bookings/Booker/utils/areDifferentValidMonths.ts
 create mode 100644 packages/features/bookings/Booker/utils/getPrefetchMonthCount.test.ts
 create mode 100644 packages/features/bookings/Booker/utils/getPrefetchMonthCount.ts
 create mode 100644 packages/features/bookings/Booker/utils/isMonthChange.test.ts
 create mode 100644 packages/features/bookings/Booker/utils/isMonthChange.ts
 create mode 100644 packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.test.ts
 create mode 100644 packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.ts
 create mode 100644 packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.test.ts
 create mode 100644 packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.ts
 create mode 100644 packages/features/bookings/components/BookingSuccessCard.tsx
 create mode 100644 packages/features/bookings/di/BookingCancelService.container.ts
 create mode 100644 packages/features/bookings/di/BookingCancelService.module.ts
 create mode 100644 packages/features/bookings/di/InstantBookingCreateService.container.ts
 create mode 100644 packages/features/bookings/di/InstantBookingCreateService.module.ts
 create mode 100644 packages/features/bookings/di/RecurringBookingService.container.ts
 create mode 100644 packages/features/bookings/di/RecurringBookingService.module.ts
 rename packages/features/{di/bookings/containers => bookings/di}/RegularBookingService.container.ts (70%)
 rename packages/features/{di/bookings/modules => bookings/di}/RegularBookingService.module.ts (63%)
 rename packages/features/{di/bookings => bookings/di}/tokens.ts (78%)
 rename packages/{lib => features/bookings}/hooks/useBookerUrl.ts (100%)
 rename packages/{ => features/bookings}/lib/bookingSuccessRedirect.test.ts (100%)
 rename packages/{ => features/bookings}/lib/bookingSuccessRedirect.ts (99%)
 rename packages/{lib/bookings => features/bookings/lib}/buildEventUrlFromBooking.test.ts (96%)
 rename packages/{lib/bookings => features/bookings/lib}/buildEventUrlFromBooking.ts (92%)
 rename packages/{lib/intervalLimits/server => features/bookings/lib}/checkBookingLimits.ts (88%)
 rename packages/{lib/intervalLimits/server => features/bookings/lib}/checkDurationLimits.ts (81%)
 create mode 100644 packages/features/bookings/lib/client/decoyBookingStore.ts
 create mode 100644 packages/features/bookings/lib/dto/BookingCancel.d.ts
 rename packages/{lib/bookings => features/bookings/lib}/getAllUserBookings.ts (100%)
 rename packages/{lib/server => features/bookings/lib}/getLuckyUser.integration-test.ts (100%)
 create mode 100644 packages/features/bookings/lib/handleNewBooking/test/spam-booking.integration-test.ts
 create mode 100644 packages/features/bookings/lib/interfaces/IBookingCancelService.ts
 rename packages/{lib/server/repository/booking.test.ts => features/bookings/repositories/BookingRepository.test.ts} (99%)
 rename packages/{lib/server/repository/booking.ts => features/bookings/repositories/BookingRepository.ts} (90%)
 create mode 100644 packages/features/bookings/services/BookingAccessService.ts
 rename packages/{lib/intervalLimits/server => features/busyTimes/lib}/getBusyTimesFromLimits.ts (95%)
 rename packages/{lib => features/busyTimes/services}/getBusyTimes.test.ts (100%)
 rename packages/{lib => features/busyTimes/services}/getBusyTimes.ts (98%)
 create mode 100644 packages/features/calendar-cache/lib/getShouldServeCache.test.ts
 rename packages/{app-store => features/conferencing/lib}/videoClient.ts (87%)
 rename packages/{lib/server/repository/credential.ts => features/credentials/repositories/CredentialRepository.ts} (98%)
 rename packages/{lib/crmManager/tasker => features/crmManager}/crmScheduler.ts (100%)
 rename packages/{lib/server/repository => features/data-table}/__tests__/filterSegments/create.test.ts (93%)
 rename packages/{lib/server/repository => features/data-table}/__tests__/filterSegments/delete.test.ts (94%)
 rename packages/{lib/server/repository => features/data-table}/__tests__/filterSegments/get.test.ts (97%)
 rename packages/{lib/server/repository => features/data-table}/__tests__/filterSegments/update.test.ts (96%)
 rename packages/{lib/server/repository => features/data-table/repositories}/filterSegment.ts (100%)
 rename packages/{lib/server/repository => features/data-table/repositories}/filterSegment.type.ts (100%)
 rename packages/{lib/server/repository/__tests__/delegationCredential.test.ts => features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts} (96%)
 rename packages/{lib/server/repository/delegationCredential.ts => features/delegation-credentials/repositories/DelegationCredentialRepository.ts} (98%)
 delete mode 100644 packages/features/di/bookings/containers/InstantBookingCreateService.container.ts
 delete mode 100644 packages/features/di/bookings/containers/RecurringBookingService.container.ts
 delete mode 100644 packages/features/di/bookings/modules/InstantBookingCreateService.module.ts
 delete mode 100644 packages/features/di/bookings/modules/RecurringBookingService.module.ts
 create mode 100644 packages/features/di/watchlist/Watchlist.tokens.ts
 create mode 100644 packages/features/di/watchlist/containers/SpamCheckService.container.ts
 create mode 100644 packages/features/di/watchlist/containers/watchlist.ts
 create mode 100644 packages/features/di/watchlist/modules/Watchlist.module.ts
 rename packages/{lib/__tests__ => features/ee/api-keys/lib}/autoLock.test.ts (99%)
 rename packages/{ => features/ee/api-keys}/lib/autoLock.ts (98%)
 rename packages/features/ee/billing/{stripe-billling-service.test.ts => stripe-billing-service.test.ts} (97%)
 rename packages/features/ee/billing/{stripe-billling-service.ts => stripe-billing-service.ts} (76%)
 rename packages/{lib/service/attribute/server => features/ee/dsync/lib}/assignValueToUser.test.ts (99%)
 rename packages/{lib/service/attribute/server => features/ee/dsync/lib}/assignValueToUser.ts (96%)
 rename packages/{lib/server/repository/__mocks__/organization.ts => features/ee/organizations/__mocks__/organizationMock.ts} (86%)
 rename packages/{lib/getBookerUrl => features/ee/organizations/lib}/getBookerBaseUrlSync.ts (100%)
 rename packages/{lib/getBookerUrl/server.ts => features/ee/organizations/lib/getBookerUrlServer.ts} (74%)
 rename packages/{lib/server => features/ee/organizations/lib}/getBrand.ts (100%)
 rename packages/{lib/getBookerUrl/client.test.ts => features/ee/organizations/lib/getTeamUrlSync.test.ts} (80%)
 rename packages/{lib/getBookerUrl/client.ts => features/ee/organizations/lib/getTeamUrlSync.ts} (74%)
 create mode 100644 packages/features/ee/organizations/lib/onboardingStore.test.ts
 delete mode 100644 packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts
 delete mode 100644 packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.ts
 create mode 100644 packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/BaseOnboardingService.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/BillingEnabledOrgOnboardingService.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/IOrganizationOnboardingService.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingFactory.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingSetup.md
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/SelfHostedOnboardingService.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/__tests__/BaseOnboardingService.test.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/__tests__/BillingEnabledOrgOnboardingService.test.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/__tests__/OrganizationOnboardingFactory.test.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/__tests__/SelfHostedOnboardingService.test.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/index.ts
 create mode 100644 packages/features/ee/organizations/lib/service/onboarding/types.ts
 rename packages/{lib/server/repository/organization.test.ts => features/ee/organizations/repositories/OrganizationRepository.test.ts} (94%)
 rename packages/{lib/server/repository/organization.ts => features/ee/organizations/repositories/OrganizationRepository.ts} (97%)
 create mode 100644 packages/features/ee/round-robin/utils/validateRoundRobinSlotAvailability.ts
 rename packages/{lib/server/repository/team.test.ts => features/ee/teams/repositories/TeamRepository.test.ts} (57%)
 rename packages/{lib/server/repository/team.ts => features/ee/teams/repositories/TeamRepository.ts} (91%)
 rename packages/{lib/server/service => features/ee/teams/services}/teamService.alternative.test.ts (91%)
 rename packages/{lib/server/service/__tests__ => features/ee/teams/services}/teamService.integration-test.ts (99%)
 rename packages/{lib/server/service => features/ee/teams/services}/teamService.test.ts (95%)
 rename packages/{lib/server/service => features/ee/teams/services}/teamService.ts (97%)
 create mode 100644 packages/features/ee/workflows/lib/service/WorkflowService.test.ts
 create mode 100644 packages/features/ee/workflows/lib/service/WorkflowService.ts
 rename packages/{lib/server/repository/workflow.test.ts => features/ee/workflows/repositories/WorkflowRepository.test.ts} (94%)
 rename packages/{lib/server/repository/workflow.ts => features/ee/workflows/repositories/WorkflowRepository.ts} (57%)
 rename packages/{lib => features/eventtypes}/hooks/useCreateEventType.ts (100%)
 rename packages/{lib/server/repository/event.ts => features/eventtypes/repositories/EventRepository.ts} (100%)
 rename packages/{lib/server/repository => features/eventtypes/repositories}/eventTypeRepository.ts (95%)
 create mode 100644 packages/features/flags/components/AssignFeatureSheet.tsx
 rename packages/{lib/server/repository => features/hashedLink/repositories}/hashedLinkRepository.ts (100%)
 rename packages/{lib/server/service => features/hashedLink/services}/hashedLinkService.ts (96%)
 rename packages/{lib/server/service => features/insights/services}/InsightsBookingBaseService.ts (99%)
 rename packages/{lib/server/service => features/insights/services}/InsightsBookingDIService.ts (100%)
 rename packages/{lib/server/service/__tests__ => features/insights/services}/InsightsBookingService.integration-test.ts (99%)
 rename packages/{lib/server/service => features/insights/services}/InsightsRoutingBaseService.ts (99%)
 rename packages/{lib/server/service => features/insights/services}/InsightsRoutingDIService.ts (100%)
 rename packages/{lib/server/service/__tests__ => features/insights/services}/InsightsRoutingService.integration-test.ts (99%)
 rename packages/{lib/server/repository/membership.ts => features/membership/repositories/MembershipRepository.ts} (91%)
 rename packages/{lib/server/service => features/membership/services}/membershipService.ts (90%)
 create mode 100644 packages/features/pbac/infrastructure/repositories/__tests__/PermissionRepository.integration-test.ts
 rename packages/{ => features/pbac}/lib/entityPermissionUtils.server.ts (100%)
 rename packages/{lib/server => features/profile/lib}/checkRegularUsername.ts (84%)
 rename packages/{lib/server => features/profile/lib}/checkUsername.ts (83%)
 rename packages/{ => features/profile}/lib/createAProfileForAnExistingUser.ts (84%)
 create mode 100644 packages/features/profile/lib/getBranding.test.ts
 create mode 100644 packages/features/profile/lib/getBranding.ts
 rename packages/{ => features/profile}/lib/hideBranding.ts (71%)
 rename packages/{lib/server/repository/profile.ts => features/profile/repositories/ProfileRepository.ts} (96%)
 rename packages/{ => features/schedules}/lib/date-ranges.test.ts (100%)
 rename packages/{ => features/schedules}/lib/date-ranges.ts (100%)
 rename packages/{ => features/schedules}/lib/slots.test.ts (99%)
 rename packages/{ => features/schedules}/lib/slots.ts (95%)
 create mode 100644 packages/features/tasker/tasks/triggerFormSubmittedNoEvent/formSubmissionValidation.ts
 create mode 100644 packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.test.ts
 create mode 100644 packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.ts
 create mode 100644 packages/features/users/lib/UserListTableUtils.ts
 rename packages/features/users/lib/{userDeletionService.ts => deleteUser.ts} (100%)
 rename packages/{lib/server/repository/user.test.ts => features/users/repositories/UserRepository.test.ts} (96%)
 rename packages/{lib/server/repository/user.ts => features/users/repositories/UserRepository.ts} (87%)
 rename packages/{lib/server/service => features/users/services}/userCreationService.test.ts (68%)
 rename packages/{lib/server/service => features/users/services}/userCreationService.ts (81%)
 create mode 100644 packages/features/watchlist/lib/dto/index.ts
 create mode 100644 packages/features/watchlist/lib/dto/mappers.ts
 create mode 100644 packages/features/watchlist/lib/dto/types.ts
 create mode 100644 packages/features/watchlist/lib/facade/WatchlistFeature.ts
 create mode 100644 packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
 create mode 100644 packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
 rename packages/{ => features/watchlist}/lib/freeEmailDomainCheck/freeEmailDomains.ts (100%)
 create mode 100644 packages/features/watchlist/lib/interface/IAuditRepository.ts
 create mode 100644 packages/features/watchlist/lib/interface/IAuditService.ts
 create mode 100644 packages/features/watchlist/lib/interface/IBlockingService.ts
 create mode 100644 packages/features/watchlist/lib/interface/IWatchlistRepositories.ts
 create mode 100644 packages/features/watchlist/lib/interface/IWatchlistService.ts
 create mode 100644 packages/features/watchlist/lib/repository/GlobalWatchlistRepository.ts
 create mode 100644 packages/features/watchlist/lib/repository/OrganizationWatchlistRepository.ts
 create mode 100644 packages/features/watchlist/lib/repository/PrismaWatchlistAuditRepository.ts
 create mode 100644 packages/features/watchlist/lib/service/GlobalBlockingService.test.ts
 create mode 100644 packages/features/watchlist/lib/service/GlobalBlockingService.ts
 create mode 100644 packages/features/watchlist/lib/service/OrganizationBlockingService.test.ts
 create mode 100644 packages/features/watchlist/lib/service/OrganizationBlockingService.ts
 create mode 100644 packages/features/watchlist/lib/service/SpamCheckService.ts
 create mode 100644 packages/features/watchlist/lib/service/WatchlistAuditService.ts
 create mode 100644 packages/features/watchlist/lib/service/WatchlistService.test.ts
 create mode 100644 packages/features/watchlist/lib/service/WatchlistService.ts
 create mode 100644 packages/features/watchlist/lib/telemetry/index.ts
 create mode 100644 packages/features/watchlist/lib/telemetry/no-op-span.ts
 create mode 100644 packages/features/watchlist/lib/telemetry/sentry-span.ts
 create mode 100644 packages/features/watchlist/lib/telemetry/types.ts
 create mode 100644 packages/features/watchlist/lib/types.ts
 create mode 100644 packages/features/watchlist/lib/utils/normalization.test.ts
 create mode 100644 packages/features/watchlist/lib/utils/normalization.ts
 create mode 100644 packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
 create mode 100644 packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
 create mode 100644 packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
 create mode 100644 packages/features/watchlist/operations/list-all-system-entries.controller.ts
 delete mode 100644 packages/features/watchlist/watchlist.model.ts
 delete mode 100644 packages/features/watchlist/watchlist.repository.interface.ts
 delete mode 100644 packages/features/watchlist/watchlist.repository.mock.ts
 delete mode 100644 packages/features/watchlist/watchlist.repository.ts
 rename packages/{features/bookings/lib => lib/bookings}/SystemField.ts (100%)
 rename packages/lib/{ => bookings}/getLabelValueMapFromResponses.ts (89%)
 create mode 100644 packages/lib/dbReadResponseSchema.ts
 delete mode 100644 packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
 delete mode 100644 packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
 delete mode 100644 packages/lib/restrictionSchedule.ts
 create mode 100644 packages/lib/schedules/transformers/getScheduleListItemData.ts
 delete mode 100644 packages/lib/server/repository/TeamRepository.test.ts
 create mode 100644 packages/lib/server/repository/bookingReport.interface.ts
 create mode 100644 packages/lib/server/repository/bookingReport.test.ts
 create mode 100644 packages/lib/server/repository/bookingReport.ts
 create mode 100644 packages/lib/server/repository/watchlist.interface.ts
 create mode 100644 packages/lib/server/repository/watchlist.repository.ts
 delete mode 100644 packages/lib/server/repository/webhook.ts
 create mode 100644 packages/lib/server/repository/workflowRelations.ts
 create mode 100644 packages/lib/server/repository/workflowStep.ts
 create mode 100644 packages/lib/server/service/ApiKeyService.ts
 delete mode 100644 packages/lib/server/service/workflows.ts
 create mode 100644 packages/platform/atoms/create-schedule/CreateScheduleForm.tsx
 create mode 100644 packages/platform/atoms/create-schedule/index.tsx
 create mode 100644 packages/platform/atoms/create-schedule/wrappers/CreateSchedulePlatformWrapper.tsx
 create mode 100644 packages/platform/atoms/hooks/schedules/useAtomCreateSchedule.ts
 create mode 100644 packages/platform/atoms/hooks/schedules/useAtomDuplicateSchedule.ts
 create mode 100644 packages/platform/atoms/hooks/schedules/useAtomGetAllSchedules.ts
 create mode 100644 packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts
 create mode 100644 packages/platform/atoms/list-schedules/index.ts
 create mode 100644 packages/platform/atoms/list-schedules/wrappers/ListSchedulesPlatformWrapper.tsx
 rename packages/platform/examples/base/src/pages/{availability.tsx => availability/[scheduleId].tsx} (93%)
 create mode 100644 packages/platform/examples/base/src/pages/availability/index.tsx
 create mode 100644 packages/platform/types/event-types/event-types_2024_06_14/inputs/booker-active-booking-limit.input.ts
 create mode 100644 packages/platform/types/event-types/event-types_2024_06_14/inputs/email-settings.input.ts
 create mode 100644 packages/platform/types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit.ts
 create mode 100644 packages/platform/types/event-types/event-types_2024_06_14/outputs/booker-active-bookings-limit.output.ts
 create mode 100644 packages/platform/types/utils/RequiresOneOfPropertiesWhenNotDisabled.ts
 create mode 100644 packages/prisma/migrations/20250909093954_add_form_submitted_workflow_trigger/migration.sql
 create mode 100644 packages/prisma/migrations/20250909134440_add_form_submitted_no_event/migration.sql
 create mode 100644 packages/prisma/migrations/20250930135416_add_type_to_workflow/migration.sql
 create mode 100644 packages/prisma/migrations/20251005102651_add_onboarding_v3_feature_flag/migration.sql
 create mode 100644 packages/prisma/migrations/20251006111422_add_requires_booker_email_verification/migration.sql
 create mode 100644 packages/prisma/migrations/20251007090722_modify_onboarding_table_orgs/migration.sql
 create mode 100644 packages/prisma/migrations/20251010135752_billing_tables_add_dates/migration.sql
 create mode 100644 packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
 create mode 100644 packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
 create mode 100644 packages/prisma/migrations/20251015211003000_add_watchlist_admin_permissions/migration.sql
 create mode 100644 packages/prisma/migrations/20251017161715_cleanup_future_events/migration.sql
 create mode 100644 packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/getTeamsForFeature.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/getTeamsForFeature.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.schema.ts
 delete mode 100644 packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.handler.ts
 delete mode 100644 packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
 create mode 100644 packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts
 create mode 100644 scripts/reassign-attributes.ts

diff --git a/.agents/knowledge-base.md b/.agents/knowledge-base.md
index 11d1987d92108b..36d25bc53f2373 100644
--- a/.agents/knowledge-base.md
+++ b/.agents/knowledge-base.md
@@ -111,7 +111,7 @@ The event types page UI components are located in `apps/web/modules/event-types/
 
 Changes to shared UI patterns (like tab layouts and button alignments) need to be checked across multiple views to maintain consistency:
 - Event types page layout: `apps/web/modules/event-types/views/event-types-listing-view.tsx`
-- Bookings page layout: `apps/web/modules/bookings/views/bookings-listing-view.tsx`
+- Bookings page layout: `apps/web/modules/bookings/views/bookings-view.tsx`
 - Common elements like tabs, search bars, and filter buttons should maintain consistent alignment across views
 
 ## When working on workflow triggers or similar enum-based features in the Cal.com codebase
@@ -306,6 +306,224 @@ import { Button } from "@calcom/ui/components/button";
 - **Tests**: Same as source file + `.test.ts` or `.spec.ts`
 - **Avoid**: Dot-suffixes like `.service.ts`, `.repository.ts` (except for tests, types, specs)
 
+## Repository Method Conventions
+
+Repositories should follow consistent naming and design patterns to promote reusability and maintainability.
+
+### Method Naming Rules
+
+**1. Don't include the repository's entity name in method names**
+
+Method names should be concise and avoid redundancy since the repository class name already indicates the entity type.
+
+```typescript
+// ✅ Good - Concise method names
+class BookingRepository {
+  findById(id: string) { ... }
+  findByUserId(userId: string) { ... }
+  create(data: BookingCreateInput) { ... }
+  delete(id: string) { ... }
+}
+
+// ❌ Bad - Redundant entity name in methods
+class BookingRepository {
+  findBookingById(id: string) { ... }
+  findBookingByUserId(userId: string) { ... }
+  createBooking(data: BookingCreateInput) { ... }
+  deleteBooking(id: string) { ... }
+}
+```
+
+**2. Use `include` or similar keywords for methods that fetch relational data**
+
+When a method retrieves additional related entities, make this explicit in the method name using keywords like `include`, `with`, or `andRelations`.
+
+```typescript
+// ✅ Good - Clear indication of included relations
+class EventTypeRepository {
+  findById(id: string) {
+    return prisma.eventType.findUnique({
+      where: { id },
+    });
+  }
+
+  findByIdIncludeHosts(id: string) {
+    return prisma.eventType.findUnique({
+      where: { id },
+      include: {
+        hosts: true,
+      },
+    });
+  }
+
+  findByIdIncludeHostsAndSchedule(id: string) {
+    return prisma.eventType.findUnique({
+      where: { id },
+      include: {
+        hosts: true,
+        schedule: true,
+      },
+    });
+  }
+}
+
+// ❌ Bad - Unclear what data is included
+class EventTypeRepository {
+  findById(id: string) {
+    return prisma.eventType.findUnique({
+      where: { id },
+      include: {
+        hosts: true,
+        schedule: true,
+      },
+    });
+  }
+
+  findByIdForReporting(id: string) {
+    return prisma.eventType.findUnique({
+      where: { id },
+      include: {
+        hosts: true,
+      },
+    });
+  }
+}
+```
+
+**3. Keep methods generic and reusable - avoid use-case-specific names**
+
+Repository methods should be general-purpose and describe what data they return, not how or where it's used. This promotes code reuse across different features.
+
+```typescript
+// ✅ Good - Generic, reusable methods
+class BookingRepository {
+  findByUserIdIncludeAttendees(userId: string) {
+    return prisma.booking.findMany({
+      where: { userId },
+      include: {
+        attendees: true,
+      },
+    });
+  }
+
+  findByDateRangeIncludeEventType(startDate: Date, endDate: Date) {
+    return prisma.booking.findMany({
+      where: {
+        startTime: { gte: startDate },
+        endTime: { lte: endDate },
+      },
+      include: {
+        eventType: true,
+      },
+    });
+  }
+}
+
+// ❌ Bad - Use-case-specific method names
+class BookingRepository {
+  findBookingsForReporting(userId: string) {
+    return prisma.booking.findMany({
+      where: { userId },
+      include: {
+        attendees: true,
+      },
+    });
+  }
+
+  findBookingsForDashboard(startDate: Date, endDate: Date) {
+    return prisma.booking.findMany({
+      where: {
+        startTime: { gte: startDate },
+        endTime: { lte: endDate },
+      },
+      include: {
+        eventType: true,
+      },
+    });
+  }
+}
+```
+
+**4. No business logic in repositories**
+
+Repositories should only handle data access. Business logic, validations, and complex transformations belong in the Service layer.
+
+```typescript
+// ✅ Good - Repository only handles data access
+class BookingRepository {
+  findByIdIncludeAttendees(id: string) {
+    return prisma.booking.findUnique({
+      where: { id },
+      include: {
+        attendees: true,
+      },
+    });
+  }
+
+  updateStatus(id: string, status: BookingStatus) {
+    return prisma.booking.update({
+      where: { id },
+      data: { status },
+    });
+  }
+}
+
+class BookingService {
+  async confirmBooking(bookingId: string) {
+    const booking = await this.bookingRepository.findByIdIncludeAttendees(bookingId);
+    
+    if (!booking) {
+      throw new Error("Booking not found");
+    }
+
+    if (booking.status !== "PENDING") {
+      throw new Error("Only pending bookings can be confirmed");
+    }
+
+    // Business logic: send confirmation emails
+    await this.emailService.sendConfirmationToAttendees(booking.attendees);
+    
+    // Update status through repository
+    return this.bookingRepository.updateStatus(bookingId, "CONFIRMED");
+  }
+}
+
+// ❌ Bad - Business logic in repository
+class BookingRepository {
+  async confirmBooking(bookingId: string) {
+    const booking = await prisma.booking.findUnique({
+      where: { id: bookingId },
+      include: {
+        attendees: true,
+      },
+    });
+
+    if (!booking) {
+      throw new Error("Booking not found");
+    }
+
+    if (booking.status !== "PENDING") {
+      throw new Error("Only pending bookings can be confirmed");
+    }
+
+    // ❌ Business logic shouldn't be here
+    await sendEmailToAttendees(booking.attendees);
+
+    return prisma.booking.update({
+      where: { id: bookingId },
+      data: { status: "CONFIRMED" },
+    });
+  }
+}
+```
+
+### Summary
+
+- Method names should be concise: `findById` not `findBookingById`
+- Use `include`/`with` keywords when fetching relations: `findByIdIncludeHosts`
+- Keep methods generic and reusable: `findByUserIdIncludeAttendees` not `findBookingsForReporting`
+- No business logic in repositories - that belongs in Services
+
 ## When using Day.js
 
 ```typescript
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9fdb484f79179b..525c155e22702d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,7 +10,6 @@
 /apps/web/lib/handleOrgRedirect.ts @calcom/Foundation
 /apps/web/middleware.ts @calcom/Foundation
 /deploy/**/* @calcom/Foundation
-/infra/**/* @calcom/Foundation
 /packages/app-store/applecalendar/**/* @calcom/Foundation
 /packages/app-store/caldavcalendar/**/* @calcom/Foundation
 /packages/app-store/exchange2013calendar/**/* @calcom/Foundation
@@ -25,10 +24,10 @@
 /packages/embeds/**/* @calcom/Foundation
 /packages/features/auth/lib/next-auth-options.ts @calcom/Foundation
 /packages/features/bookings/lib/**/* @calcom/Foundation
-/packages/lib/getAggregatedAvailability.ts @calcom/Foundation
-/packages/lib/getUserAvailability.ts @calcom/Foundation
-/packages/lib/server/getLuckyUser.ts @calcom/Foundation
-/packages/lib/slots.ts @calcom/Foundation
+/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts @calcom/Foundation
+/packages/features/availability/lib/getUserAvailability.ts @calcom/Foundation
+/packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation
+/packages/features/schedules/lib/slots.ts @calcom/Foundation
 /packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
 /packages/platform/**/* @calcom/Platform @calcom/Foundation
 /packages/prisma/**/* @calcom/Foundation
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c344645fab61f7..43ae1c6a83d9d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": false,
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
diff --git a/.yarn/versions/13de130d.yml b/.yarn/versions/13de130d.yml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/.yarn/versions/3a60c02f.yml b/.yarn/versions/3a60c02f.yml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/.yarn/versions/492e4e82.yml b/.yarn/versions/492e4e82.yml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/.yarn/versions/c0a99150.yml b/.yarn/versions/c0a99150.yml
new file mode 100644
index 00000000000000..b98fefe38f8195
--- /dev/null
+++ b/.yarn/versions/c0a99150.yml
@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"
diff --git a/.yarn/versions/e11ed2da.yml b/.yarn/versions/e11ed2da.yml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/README.md b/README.md
index 75ba34a148f87b..bae70679f9e076 100644
--- a/README.md
+++ b/README.md
@@ -234,9 +234,10 @@ for Logger level to be set at info, for example.
 
    </details>
 
-   If you don't want to create a local DB. Then you can also consider using services like railway.app or render.
+   If you don't want to create a local DB. Then you can also consider using services like railway.app, Northflank or render.
 
    - [Setup postgres DB with railway.app](https://docs.railway.app/guides/postgresql)
+   - [Setup postgres DB with Northflank](https://northflank.com/guides/deploy-postgres-database-on-northflank)
    - [Setup postgres DB with render](https://render.com/docs/databases)
 
 1. Copy and paste your `DATABASE_URL` from `.env` to `.env.appStore`.
@@ -390,6 +391,12 @@ Cal.com, Inc. does not provide official support for Docker, but we will accept f
 
 You can deploy Cal.com on [Railway](https://railway.app) using the button above. The team at Railway also have a [detailed blog post](https://blog.railway.app/p/calendso) on deploying Cal.com on their platform.
 
+### Northflank
+
+[![Deploy on Northflank](https://assets.northflank.com/deploy_to_northflank_smm_36700fb050.svg)](https://northflank.com/stacks/deploy-calcom)
+
+You can deploy Cal.com on [Northflank](https://northflank.com) using the button above. The team at Northflank also have a [detailed blog post](https://northflank.com/guides/deploy-calcom-with-northflank) on deploying Cal.com on their platform.
+
 ### Vercel
 
 Currently Vercel Pro Plan is required to be able to Deploy this application with Vercel, due to limitations on the number of serverless functions on the free plan.
diff --git a/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts b/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts
index 86dfc51d0548ae..cad5fcf63372f5 100644
--- a/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts
+++ b/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts
@@ -4,7 +4,7 @@ import type { NextApiResponse, NextApiRequest } from "next";
 import { createMocks } from "node-mocks-http";
 import { describe, it, expect, vi } from "vitest";
 
-import { handleAutoLock } from "@calcom/lib/autoLock";
+import { handleAutoLock } from "@calcom/features/ee/api-keys/lib/autoLock";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import { HttpError } from "@calcom/lib/http-error";
 
@@ -19,7 +19,7 @@ vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
   checkRateLimitAndThrowError: vi.fn(),
 }));
 
-vi.mock("@calcom/lib/autoLock", () => ({
+vi.mock("@calcom/features/ee/api-keys/lib/autoLock", () => ({
   handleAutoLock: vi.fn(),
 }));
 
diff --git a/apps/api/v1/lib/helpers/rateLimitApiKey.ts b/apps/api/v1/lib/helpers/rateLimitApiKey.ts
index b490c011bc61ff..444f0f62614451 100644
--- a/apps/api/v1/lib/helpers/rateLimitApiKey.ts
+++ b/apps/api/v1/lib/helpers/rateLimitApiKey.ts
@@ -1,6 +1,6 @@
 import type { NextMiddleware } from "next-api-middleware";
 
-import { handleAutoLock } from "@calcom/lib/autoLock";
+import { handleAutoLock } from "@calcom/features/ee/api-keys/lib/autoLock";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import { HttpError } from "@calcom/lib/http-error";
 
diff --git a/apps/api/v1/lib/helpers/verifyApiKey.test.ts b/apps/api/v1/lib/helpers/verifyApiKey.test.ts
index fc296f24c3ff5a..8cb47d561fe98c 100644
--- a/apps/api/v1/lib/helpers/verifyApiKey.test.ts
+++ b/apps/api/v1/lib/helpers/verifyApiKey.test.ts
@@ -1,19 +1,42 @@
-import prismock from "../../../../../tests/libs/__mocks__/prisma";
-
+/**
+ * Unit Tests for verifyApiKey middleware
+ *
+ * These tests verify the middleware logic without touching the database.
+ * All dependencies (repositories, utilities) are mocked.
+ */
 import type { Request, Response } from "express";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import type { ILicenseKeyService } from "@calcom/ee/common/server/LicenseKeyService";
-import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
-import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
+import LicenseKeyService, { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
+import { PrismaApiKeyRepository } from "@calcom/lib/server/repository/PrismaApiKeyRepository";
 import type { IDeploymentRepository } from "@calcom/lib/server/repository/deployment.interface";
-import prisma from "@calcom/prisma";
-import { MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
+import { ApiKeyService } from "@calcom/lib/server/service/ApiKeyService";
+import { UserPermissionRole } from "@calcom/prisma/enums";
 
+import { isAdminGuard } from "../utils/isAdmin";
+import { isLockedOrBlocked } from "../utils/isLockedOrBlocked";
+import { ScopeOfAdmin } from "../utils/scopeOfAdmin";
 import { verifyApiKey } from "./verifyApiKey";
 
+vi.mock("@calcom/lib/server/service/ApiKeyService", () => ({
+  ApiKeyService: vi.fn(),
+}));
+
+vi.mock("@calcom/lib/server/repository/PrismaApiKeyRepository", () => ({
+  PrismaApiKeyRepository: vi.fn(),
+}));
+
+vi.mock("../utils/isAdmin", () => ({
+  isAdminGuard: vi.fn(),
+}));
+
+vi.mock("../utils/isLockedOrBlocked", () => ({
+  isLockedOrBlocked: vi.fn(),
+}));
+
 vi.mock("@calcom/lib/crypto", () => ({
   symmetricDecrypt: vi.fn().mockReturnValue("mocked-decrypted-value"),
   symmetricEncrypt: vi.fn().mockReturnValue("mocked-encrypted-value"),
@@ -32,17 +55,29 @@ afterEach(() => {
 });
 
 const mockDeploymentRepository: IDeploymentRepository = {
-  getLicenseKeyWithId: vi.fn().mockResolvedValue("mockLicenseKey"), // Mocked return value
+  getLicenseKeyWithId: vi.fn().mockResolvedValue("mockLicenseKey"),
   getSignatureToken: vi.fn().mockResolvedValue("mockSignatureToken"),
 };
 
-describe("Verify API key", () => {
+describe("Verify API key - Unit Tests", () => {
   let service: ILicenseKeyService;
+  let mockApiKeyService: ApiKeyService;
 
   beforeEach(async () => {
     service = await LicenseKeyService.create(mockDeploymentRepository);
-
     vi.spyOn(service, "checkLicense");
+
+    vi.spyOn(LicenseKeySingleton, "getInstance").mockResolvedValue(service as LicenseKeyService);
+
+    mockApiKeyService = {
+      verifyKeyByHashedKey: vi.fn(),
+    } as unknown as ApiKeyService;
+
+    vi.mocked(ApiKeyService).mockImplementation(() => mockApiKeyService);
+    vi.mocked(PrismaApiKeyRepository).mockImplementation(() => ({} as unknown as PrismaApiKeyRepository));
+
+    vi.mocked(isAdminGuard).mockReset();
+    vi.mocked(isLockedOrBlocked).mockReset();
   });
 
   it("should throw an error if the api key is not valid", async () => {
@@ -98,22 +133,25 @@ describe("Verify API key", () => {
       query: {
         apiKey: "cal_test_key",
       },
-      prisma,
     });
-    const hashedKey = hashAPIKey("test_key");
-    await prismock.apiKey.create({
-      data: {
-        hashedKey,
-        user: {
-          create: {
-            email: "admin@example.com",
-            role: UserPermissionRole.ADMIN,
-            locked: false,
-          },
-        },
+
+    vi.mocked(mockApiKeyService.verifyKeyByHashedKey).mockResolvedValue({
+      valid: true,
+      userId: 1,
+      user: {
+        role: UserPermissionRole.ADMIN,
+        locked: false,
+        email: "admin@example.com",
       },
     });
 
+    vi.mocked(isAdminGuard).mockResolvedValue({
+      isAdmin: true,
+      scope: ScopeOfAdmin.SystemWide,
+    });
+
+    vi.mocked(isLockedOrBlocked).mockResolvedValue(false);
+
     const middleware = {
       fn: verifyApiKey,
     };
@@ -139,40 +177,25 @@ describe("Verify API key", () => {
       query: {
         apiKey: "cal_test_key",
       },
-      prisma,
     });
-    const hashedKey = hashAPIKey("test_key");
-    await prismock.apiKey.create({
-      data: {
-        hashedKey,
-        user: {
-          create: {
-            email: "org-admin@acme.com",
-            role: UserPermissionRole.USER,
-            locked: false,
-            teams: {
-              create: {
-                accepted: true,
-                role: MembershipRole.OWNER,
-                team: {
-                  create: {
-                    name: "ACME",
-                    isOrganization: true,
-                    organizationSettings: {
-                      create: {
-                        isAdminAPIEnabled: true,
-                        orgAutoAcceptEmail: "acme.com",
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
+
+    vi.mocked(mockApiKeyService.verifyKeyByHashedKey).mockResolvedValue({
+      valid: true,
+      userId: 2,
+      user: {
+        role: UserPermissionRole.USER,
+        locked: false,
+        email: "org-admin@acme.com",
       },
     });
 
+    vi.mocked(isAdminGuard).mockResolvedValue({
+      isAdmin: true,
+      scope: ScopeOfAdmin.OrgOwnerOrAdmin,
+    });
+
+    vi.mocked(isLockedOrBlocked).mockResolvedValue(false);
+
     const middleware = {
       fn: verifyApiKey,
     };
@@ -198,22 +221,25 @@ describe("Verify API key", () => {
       query: {
         apiKey: "cal_test_key",
       },
-      prisma,
     });
-    const hashedKey = hashAPIKey("test_key");
-    await prismock.apiKey.create({
-      data: {
-        hashedKey,
-        user: {
-          create: {
-            email: "locked@example.com",
-            role: UserPermissionRole.USER,
-            locked: true,
-          },
-        },
+
+    vi.mocked(mockApiKeyService.verifyKeyByHashedKey).mockResolvedValue({
+      valid: true,
+      userId: 3,
+      user: {
+        role: UserPermissionRole.USER,
+        locked: true,
+        email: "locked@example.com",
       },
     });
 
+    vi.mocked(isAdminGuard).mockResolvedValue({
+      isAdmin: false,
+      scope: ScopeOfAdmin.SystemWide,
+    });
+
+    vi.mocked(isLockedOrBlocked).mockResolvedValue(true);
+
     const middleware = {
       fn: verifyApiKey,
     };
diff --git a/apps/api/v1/lib/helpers/verifyApiKey.ts b/apps/api/v1/lib/helpers/verifyApiKey.ts
index 75f24f01e39e9d..e7b92d0ba2055c 100644
--- a/apps/api/v1/lib/helpers/verifyApiKey.ts
+++ b/apps/api/v1/lib/helpers/verifyApiKey.ts
@@ -3,21 +3,15 @@ import type { NextMiddleware } from "next-api-middleware";
 import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
 import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
+import { PrismaApiKeyRepository } from "@calcom/lib/server/repository/PrismaApiKeyRepository";
 import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";
-import prisma from "@calcom/prisma";
+import { ApiKeyService } from "@calcom/lib/server/service/ApiKeyService";
+import { prisma } from "@calcom/prisma";
 
 import { isAdminGuard } from "../utils/isAdmin";
 import { isLockedOrBlocked } from "../utils/isLockedOrBlocked";
 import { ScopeOfAdmin } from "../utils/scopeOfAdmin";
 
-// Used to check if the apiKey is not expired, could be extracted if reused. but not for now.
-export const dateNotInPast = function (date: Date) {
-  const now = new Date();
-  if (now.setHours(0, 0, 0, 0) > date.setHours(0, 0, 0, 0)) {
-    return true;
-  }
-};
-
 // This verifies the apiKey and sets the user if it is valid.
 export const verifyApiKey: NextMiddleware = async (req, res, next) => {
   const deploymentRepo = new DeploymentRepository(prisma);
@@ -32,24 +26,19 @@ export const verifyApiKey: NextMiddleware = async (req, res, next) => {
 
   const strippedApiKey = `${req.query.apiKey}`.replace(process.env.API_KEY_PREFIX || "cal_", "");
   const hashedKey = hashAPIKey(strippedApiKey);
-  const apiKey = await prisma.apiKey.findUnique({
-    where: { hashedKey },
-    include: {
-      user: {
-        select: { role: true, locked: true, email: true },
-      },
-    },
-  });
-  if (!apiKey) return res.status(401).json({ error: "Your API key is not valid." });
-  if (apiKey.expiresAt && dateNotInPast(apiKey.expiresAt)) {
-    return res.status(401).json({ error: "This API key is expired." });
+
+  // Use service layer for API key verification
+  const apiKeyRepo = new PrismaApiKeyRepository(prisma);
+  const apiKeyService = new ApiKeyService({ apiKeyRepo });
+  const result = await apiKeyService.verifyKeyByHashedKey(hashedKey);
+
+  if (!result.valid) {
+    return res.status(401).json({ error: result.error });
   }
-  if (!apiKey.userId || !apiKey.user)
-    return res.status(404).json({ error: "No user found for this API key." });
 
   // save the user id in the request for later use
-  req.userId = apiKey.userId;
-  req.user = apiKey.user;
+  req.userId = result.userId!;
+  req.user = result.user!;
 
   const { isAdmin, scope } = await isAdminGuard(req);
   const userIsLockedOrBlocked = await isLockedOrBlocked(req);
diff --git a/apps/api/v1/lib/utils/isLockedOrBlocked.ts b/apps/api/v1/lib/utils/isLockedOrBlocked.ts
index 0786678a24500e..e0f3d423b00b35 100644
--- a/apps/api/v1/lib/utils/isLockedOrBlocked.ts
+++ b/apps/api/v1/lib/utils/isLockedOrBlocked.ts
@@ -1,9 +1,17 @@
 import type { NextApiRequest } from "next";
 
+import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";
 import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 
 export async function isLockedOrBlocked(req: NextApiRequest) {
   const user = req.user;
   if (!user?.email) return false;
-  return user.locked || (await checkIfEmailIsBlockedInWatchlistController(user.email));
+  return (
+    user.locked ||
+    (await checkIfEmailIsBlockedInWatchlistController({
+      email: user.email,
+      organizationId: null,
+      span: sentrySpan,
+    }))
+  );
 }
diff --git a/apps/api/v1/lib/validations/user.ts b/apps/api/v1/lib/validations/user.ts
index efbf1207576d44..c205e1e05e76be 100644
--- a/apps/api/v1/lib/validations/user.ts
+++ b/apps/api/v1/lib/validations/user.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 
+import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
 import { emailSchema } from "@calcom/lib/emailSchema";
-import { checkUsername } from "@calcom/lib/server/checkUsername";
 import { iso8601 } from "@calcom/prisma/zod-utils";
 import { UserSchema } from "@calcom/prisma/zod/modelSchema/UserSchema";
 
diff --git a/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts b/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts
index f7d68b6bdafda6..2c222e6e30bc54 100644
--- a/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts
+++ b/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import {
   getRecordingsOfCalVideoByRoomName,
   getDownloadLinkOfCalVideoByRecordingId,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
diff --git a/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts b/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts
index ee47e89fe9b5b0..d57b9711425b2a 100644
--- a/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts
+++ b/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import {
   getTranscriptsAccessLinkFromRecordingId,
   checkIfRoomNameMatchesInRecording,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
diff --git a/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts b/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts
index 17ff122d5e8498..f4de9c9c73a05d 100644
--- a/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts
+++ b/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";
 
-import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/app-store/videoClient";
+import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/features/conferencing/lib/videoClient";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
diff --git a/apps/api/v1/pages/api/bookings/_post.ts b/apps/api/v1/pages/api/bookings/_post.ts
index 12caca5758aa58..3b1c1c57f23a66 100644
--- a/apps/api/v1/pages/api/bookings/_post.ts
+++ b/apps/api/v1/pages/api/bookings/_post.ts
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
+import { getRegularBookingService } from "@calcom/features/bookings/di/RegularBookingService.container";
 import getBookingDataSchemaForApi from "@calcom/features/bookings/lib/getBookingDataSchemaForApi";
-import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
@@ -239,15 +239,17 @@ async function handler(req: NextApiRequest) {
   }
 
   try {
-    return await handleNewBooking(
-      {
-        bookingData: req.body,
+    const regularBookingService = getRegularBookingService();
+
+    return await regularBookingService.createBookingForApiV1({
+      bookingData: req.body,
+      bookingMeta: {
         userId,
         hostname: req.headers.host || "",
         forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
       },
-      getBookingDataSchemaForApi
-    );
+      bookingDataSchemaGetter: getBookingDataSchemaForApi,
+    });
   } catch (error: unknown) {
     const knownError = error as Error;
     if (knownError?.message === ErrorCode.NoAvailableUsersFound) {
diff --git a/apps/api/v1/pages/api/connected-calendars/_get.ts b/apps/api/v1/pages/api/connected-calendars/_get.ts
index 9329281a279e1f..fa4a8bd5c9013d 100644
--- a/apps/api/v1/pages/api/connected-calendars/_get.ts
+++ b/apps/api/v1/pages/api/connected-calendars/_get.ts
@@ -2,9 +2,9 @@ import type { NextApiRequest } from "next";
 
 import type { UserWithCalendars } from "@calcom/features/calendars/lib/getConnectedDestinationCalendars";
 import { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/features/calendars/lib/getConnectedDestinationCalendars";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma from "@calcom/prisma";
 
 import { extractUserIdsFromQuery } from "~/lib/utils/extractUserIdsFromQuery";
diff --git a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts b/apps/api/v1/pages/api/teams/[teamId]/_patch.ts
index d7fe9e33e220ae..b588c0147afb6f 100644
--- a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts
+++ b/apps/api/v1/pages/api/teams/[teamId]/_patch.ts
@@ -1,10 +1,10 @@
 import type { NextApiRequest } from "next";
 
 import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/payments";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
diff --git a/apps/api/v1/pages/api/users/[userId]/_delete.ts b/apps/api/v1/pages/api/users/[userId]/_delete.ts
index 8ed534c49d0fa4..27c465ea079254 100644
--- a/apps/api/v1/pages/api/users/[userId]/_delete.ts
+++ b/apps/api/v1/pages/api/users/[userId]/_delete.ts
@@ -1,6 +1,6 @@
 import type { NextApiRequest } from "next";
 
-import { deleteUser } from "@calcom/features/users/lib/userDeletionService";
+import { deleteUser } from "@calcom/features/users/lib/deleteUser";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";
diff --git a/apps/api/v1/pages/api/users/_post.ts b/apps/api/v1/pages/api/users/_post.ts
index 001de340d5aa17..3d79edde381a12 100644
--- a/apps/api/v1/pages/api/users/_post.ts
+++ b/apps/api/v1/pages/api/users/_post.ts
@@ -1,8 +1,8 @@
 import type { NextApiRequest } from "next";
 
+import { UserCreationService } from "@calcom/features/users/services/userCreationService";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { UserCreationService } from "@calcom/lib/server/service/userCreationService";
 import { CreationSource } from "@calcom/prisma/enums";
 
 import { schemaUserCreateBodyParams } from "~/lib/validations/user";
diff --git a/apps/api/v1/test/lib/bookings/[id]/recordings/_get.test.ts b/apps/api/v1/test/lib/bookings/[id]/recordings/_get.test.ts
index 582f01d830db68..8cf1fe62f725cc 100644
--- a/apps/api/v1/test/lib/bookings/[id]/recordings/_get.test.ts
+++ b/apps/api/v1/test/lib/bookings/[id]/recordings/_get.test.ts
@@ -9,7 +9,7 @@ import { buildBooking } from "@calcom/lib/test/builder";
 import {
   getRecordingsOfCalVideoByRoomName,
   getDownloadLinkOfCalVideoByRecordingId,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
 
 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
 
@@ -22,7 +22,7 @@ type CustomNextApiResponse = NextApiResponse & Response;
 const adminUserId = 1;
 const memberUserId = 10;
 
-vi.mock("@calcom/app-store/videoClient", () => {
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => {
   return {
     getRecordingsOfCalVideoByRoomName: vi.fn(),
     getDownloadLinkOfCalVideoByRecordingId: vi.fn(),
diff --git a/apps/api/v1/test/lib/bookings/[id]/transcripts/[recordingId]/_get.test.ts b/apps/api/v1/test/lib/bookings/[id]/transcripts/[recordingId]/_get.test.ts
index 9839308d0c9b93..3a9eebba2474b5 100644
--- a/apps/api/v1/test/lib/bookings/[id]/transcripts/[recordingId]/_get.test.ts
+++ b/apps/api/v1/test/lib/bookings/[id]/transcripts/[recordingId]/_get.test.ts
@@ -8,7 +8,7 @@ import { describe, expect, test, vi, afterEach } from "vitest";
 import {
   getTranscriptsAccessLinkFromRecordingId,
   checkIfRoomNameMatchesInRecording,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
 import { buildBooking } from "@calcom/lib/test/builder";
 
 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
@@ -19,7 +19,7 @@ import handler from "../../../../../../pages/api/bookings/[id]/transcripts/[reco
 type CustomNextApiRequest = NextApiRequest & Request;
 type CustomNextApiResponse = NextApiResponse & Response;
 
-vi.mock("@calcom/app-store/videoClient", () => {
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => {
   return {
     getTranscriptsAccessLinkFromRecordingId: vi.fn(),
     checkIfRoomNameMatchesInRecording: vi.fn(),
diff --git a/apps/api/v1/test/lib/bookings/[id]/transcripts/_get.test.ts b/apps/api/v1/test/lib/bookings/[id]/transcripts/_get.test.ts
index 6234bca548b354..053f5861dee58f 100644
--- a/apps/api/v1/test/lib/bookings/[id]/transcripts/_get.test.ts
+++ b/apps/api/v1/test/lib/bookings/[id]/transcripts/_get.test.ts
@@ -6,7 +6,7 @@ import { createMocks } from "node-mocks-http";
 import { describe, expect, test, vi, afterEach } from "vitest";
 
 import { buildBooking } from "@calcom/lib/test/builder";
-import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/app-store/videoClient";
+import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/features/conferencing/lib/videoClient";
 
 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
 
@@ -16,7 +16,7 @@ import handler from "../../../../../pages/api/bookings/[id]/transcripts/_get";
 type CustomNextApiRequest = NextApiRequest & Request;
 type CustomNextApiResponse = NextApiResponse & Response;
 
-vi.mock("@calcom/app-store/videoClient", () => {
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => {
   return {
     getAllTranscriptsAccessLinkFromRoomName: vi.fn(),
   };
diff --git a/apps/api/v1/test/lib/bookings/_post.test.ts b/apps/api/v1/test/lib/bookings/_post.test.ts
index 5f741182745b68..da25f3a596ea92 100644
--- a/apps/api/v1/test/lib/bookings/_post.test.ts
+++ b/apps/api/v1/test/lib/bookings/_post.test.ts
@@ -66,7 +66,7 @@ vi.mock("@calcom/features/webhooks/lib/sendOrSchedulePayload", () => ({
 }));
 
 const mockFindOriginalRescheduledBooking = vi.fn();
-vi.mock("@calcom/lib/server/repository/booking", () => ({
+vi.mock("@calcom/features/bookings/repositories/BookingRepository", () => ({
   BookingRepository: vi.fn().mockImplementation(() => ({
     findOriginalRescheduledBooking: mockFindOriginalRescheduledBooking,
   })),
@@ -133,7 +133,7 @@ vi.mock("@calcom/features/bookings/lib/handleNewBooking/ensureAvailableUsers", (
   }),
 }));
 
-vi.mock("@calcom/lib/server/repository/profile", () => ({
+vi.mock("@calcom/features/profile/repositories/ProfileRepository", () => ({
   ProfileRepository: {
     findManyForUser: vi.fn().mockResolvedValue([]),
     buildPersonalProfileFromUser: vi.fn().mockReturnValue({
diff --git a/apps/api/v1/test/lib/users/_post.test.ts b/apps/api/v1/test/lib/users/_post.test.ts
index 7aabe2fd03e85d..09a9c34a1b6b4e 100644
--- a/apps/api/v1/test/lib/users/_post.test.ts
+++ b/apps/api/v1/test/lib/users/_post.test.ts
@@ -1,9 +1,13 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
-
+/**
+ * Unit Tests for POST /api/users
+ *
+ * These tests verify the API endpoint logic without touching the database.
+ * All dependencies (UserCreationService) are mocked.
+ */
 import type { Request, Response } from "express";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
-import { describe, test, expect, vi } from "vitest";
+import { describe, test, expect, vi, beforeEach } from "vitest";
 
 import handler from "../../../pages/api/users/_post";
 
@@ -18,9 +22,41 @@ vi.mock("@calcom/lib/server/i18n", () => {
   };
 });
 
+vi.mock("@calcom/features/profile/lib/checkUsername", () => ({
+  checkUsername: vi.fn().mockResolvedValue({
+    available: true,
+    premium: false,
+  }),
+}));
+
+vi.mock("@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller", () => ({
+  checkIfEmailIsBlockedInWatchlistController: vi.fn().mockResolvedValue(false),
+}));
+
+const mockCreate = vi.fn();
+vi.mock("@calcom/features/users/repositories/UserRepository", () => ({
+  UserRepository: vi.fn().mockImplementation(() => ({
+    create: mockCreate,
+  })),
+}));
+
+vi.mock("@calcom/lib/auth/hashPassword", () => ({
+  hashPassword: vi.fn().mockResolvedValue("hashed-password"),
+}));
+
 vi.stubEnv("CALCOM_LICENSE_KEY", undefined);
 
-describe("POST /api/users", () => {
+describe("POST /api/users - Unit Tests", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockCreate.mockResolvedValue({
+      id: 1,
+      email: "test@example.com",
+      username: "test",
+      locked: false,
+    });
+  });
+
   test("should throw 401 if not system-wide admin", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
@@ -34,7 +70,9 @@ describe("POST /api/users", () => {
     await handler(req, res);
 
     expect(res.statusCode).toBe(401);
+    expect(mockCreate).not.toHaveBeenCalled();
   });
+
   test("should throw a 400 if no email is provided", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
@@ -47,7 +85,9 @@ describe("POST /api/users", () => {
     await handler(req, res);
 
     expect(res.statusCode).toBe(400);
+    expect(mockCreate).not.toHaveBeenCalled();
   });
+
   test("should throw a 400 if no username is provided", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
@@ -60,15 +100,24 @@ describe("POST /api/users", () => {
     await handler(req, res);
 
     expect(res.statusCode).toBe(400);
+    expect(mockCreate).not.toHaveBeenCalled();
   });
+
   test("should create user successfully", async () => {
+    mockCreate.mockResolvedValue({
+      id: 1,
+      email: "test@example.com",
+      username: "testuser123",
+      locked: false,
+      organizationId: null,
+    });
+
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "POST",
       body: {
         email: "test@example.com",
-        username: "test",
+        username: "testuser123",
       },
-      prisma: prismock,
     });
     req.isSystemWideAdmin = true;
 
@@ -76,57 +125,19 @@ describe("POST /api/users", () => {
 
     expect(res.statusCode).toBe(200);
 
-    const userQuery = await prismock.user.findFirst({
-      where: {
-        email: "test@example.com",
-      },
-    });
-
-    expect(userQuery).toEqual(
+    expect(mockCreate).toHaveBeenCalledWith(
       expect.objectContaining({
         email: "test@example.com",
-        username: "test",
+        username: "testuser123",
         locked: false,
-        organizationId: null,
       })
     );
-  });
 
-  test("should auto lock user if email is in watchlist", async () => {
-    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
-      method: "POST",
-      body: {
-        email: "test@example.com",
-        username: "test",
-      },
-      prisma: prismock,
-    });
-    req.isSystemWideAdmin = true;
-
-    await prismock.watchlist.create({
-      data: {
-        type: "EMAIL",
-        value: "test@example.com",
-        severity: "CRITICAL",
-        createdById: 1,
-      },
-    });
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-
-    const userQuery = await prismock.user.findFirst({
-      where: {
-        email: "test@example.com",
-      },
-    });
-
-    expect(userQuery).toEqual(
+    const responseData = JSON.parse(res._getData());
+    expect(responseData.user).toEqual(
       expect.objectContaining({
         email: "test@example.com",
-        username: "test",
-        locked: true,
+        username: "testuser123",
         organizationId: null,
       })
     );
diff --git a/apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts b/apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts
index b67f45ca19cc6e..935073d6529adb 100644
--- a/apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts
+++ b/apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts
@@ -1,38 +1,52 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
-
 import type { NextApiRequest } from "next";
-import { describe, expect, it, beforeEach } from "vitest";
+import { describe, expect, it, beforeEach, vi, afterEach } from "vitest";
+
+import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
+import type { WatchlistFeature } from "@calcom/features/watchlist/lib/facade/WatchlistFeature";
 
 import { isLockedOrBlocked } from "../../../lib/utils/isLockedOrBlocked";
 
+vi.mock("@calcom/features/di/watchlist/containers/watchlist", () => ({
+  getWatchlistFeature: vi.fn(),
+}));
+
 describe("isLockedOrBlocked", () => {
-  beforeEach(async () => {
-    await prismock.watchlist.createMany({
-      data: [
-        {
-          type: "DOMAIN",
-          value: "spam.com",
-          createdById: 1,
-        },
-        {
-          type: "DOMAIN",
-          value: "blocked.com",
-          createdById: 1,
-        },
-      ],
-    });
+  let mockWatchlistFeature: WatchlistFeature;
+
+  beforeEach(() => {
+    const mockGlobalBlocking = {
+      isBlocked: vi.fn(),
+    };
+    const mockOrgBlocking = {
+      isBlocked: vi.fn(),
+    };
+
+    mockWatchlistFeature = {
+      globalBlocking: mockGlobalBlocking,
+      orgBlocking: mockOrgBlocking,
+    } as unknown as WatchlistFeature;
+
+    vi.mocked(getWatchlistFeature).mockResolvedValue(mockWatchlistFeature);
+  });
+
+  afterEach(() => {
+    vi.resetAllMocks();
   });
 
   it("should return false if no user in request", async () => {
     const req = { userId: null, user: null } as unknown as NextApiRequest;
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(false);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).not.toHaveBeenCalled();
   });
 
   it("should return false if user has no email", async () => {
     const req = { userId: 123, user: { email: null } } as unknown as NextApiRequest;
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(false);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).not.toHaveBeenCalled();
   });
 
   it("should return true if user is locked", async () => {
@@ -46,6 +60,8 @@ describe("isLockedOrBlocked", () => {
 
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).not.toHaveBeenCalled();
   });
 
   it("should return true if user email domain is watchlisted", async () => {
@@ -57,8 +73,12 @@ describe("isLockedOrBlocked", () => {
       },
     } as unknown as NextApiRequest;
 
+    vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked).mockResolvedValue({ isBlocked: true });
+
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).toHaveBeenCalledWith("test@blocked.com");
   });
 
   it("should return false if user is not locked and email domain is not watchlisted", async () => {
@@ -70,8 +90,12 @@ describe("isLockedOrBlocked", () => {
       },
     } as unknown as NextApiRequest;
 
+    vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked).mockResolvedValue({ isBlocked: false });
+
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(false);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).toHaveBeenCalledWith("test@example.com");
   });
 
   it("should handle email domains case-insensitively", async () => {
@@ -83,7 +107,11 @@ describe("isLockedOrBlocked", () => {
       },
     } as unknown as NextApiRequest;
 
+    vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked).mockResolvedValue({ isBlocked: true });
+
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);
+
+    expect(vi.mocked(mockWatchlistFeature.globalBlocking.isBlocked)).toHaveBeenCalledWith("test@blocked.com");
   });
 });
diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/bookings.module.ts b/apps/api/v2/src/ee/bookings/2024-04-15/bookings.module.ts
index d645d46aae8a4e..bfd8d69e4e3048 100644
--- a/apps/api/v2/src/ee/bookings/2024-04-15/bookings.module.ts
+++ b/apps/api/v2/src/ee/bookings/2024-04-15/bookings.module.ts
@@ -6,6 +6,9 @@ import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
 import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { InstantBookingModule } from "@/lib/modules/instant-booking.module";
+import { RecurringBookingModule } from "@/lib/modules/recurring-booking.module";
+import { RegularBookingModule } from "@/lib/modules/regular-booking.module";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
 import { AppsRepository } from "@/modules/apps/apps.repository";
 import { BillingModule } from "@/modules/billing/billing.module";
@@ -35,6 +38,9 @@ import { Module } from "@nestjs/common";
     SchedulesModule_2024_04_15,
     EventTypesModule_2024_06_14,
     ProfilesModule,
+    RegularBookingModule,
+    RecurringBookingModule,
+    InstantBookingModule,
   ],
   providers: [
     TokensRepository,
diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts
index ceea40c9087af9..fe798022c2d632 100644
--- a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts
+++ b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts
@@ -21,7 +21,7 @@ import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import { handleNewBooking } from "@calcom/platform-libraries";
+import { type RegularBookingCreateResult } from "@calcom/platform-libraries/bookings";
 import type { ApiSuccessResponse, ApiErrorResponse } from "@calcom/platform-types";
 import type { User } from "@calcom/prisma/client";
 
@@ -41,7 +41,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
 
     let eventTypeId: number;
 
-    let createdBooking: Awaited<ReturnType<typeof handleNewBooking>>;
+    let createdBooking: RegularBookingCreateResult;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -131,8 +131,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
         .send(body)
         .expect(201)
         .then(async (response) => {
-          const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
-            response.body;
+          const responseBody: ApiSuccessResponse<RegularBookingCreateResult> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(responseBody.data.userPrimaryEmail).toBeDefined();
@@ -231,8 +230,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
         .expect(201)
         .then(async (response) => {
-          const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
-            response.body;
+          const responseBody: ApiSuccessResponse<RegularBookingCreateResult> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(responseBody.data.userPrimaryEmail).toBeDefined();
@@ -289,8 +287,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
           .send(body)
           .expect(201)
           .then(async (response) => {
-            const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
-              response.body;
+            const responseBody: ApiSuccessResponse<RegularBookingCreateResult> = response.body;
             expect(responseBody.status).toEqual(SUCCESS_STATUS);
             expect(responseBody.data).toBeDefined();
             expect(responseBody.data.userPrimaryEmail).toBeDefined();
@@ -387,8 +384,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
         .send(body)
         .expect(201)
         .then(async (response) => {
-          const responseBody: ApiSuccessResponse<Awaited<ReturnType<typeof handleNewBooking>>> =
-            response.body;
+          const responseBody: ApiSuccessResponse<RegularBookingCreateResult> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(responseBody.data.userPrimaryEmail).toBeDefined();
diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts
index 9b2c06301a9f7e..f02fdff352faa7 100644
--- a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts
+++ b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts
@@ -7,6 +7,9 @@ import { MarkNoShowOutput_2024_04_15 } from "@/ee/bookings/2024-04-15/outputs/ma
 import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { sha256Hash, isApiKey, stripApiKey } from "@/lib/api-key";
 import { VERSION_2024_04_15, VERSION_2024_06_11, VERSION_2024_06_14 } from "@/lib/api-versions";
+import { InstantBookingCreateService } from "@/lib/services/instant-booking-create.service";
+import { RecurringBookingService } from "@/lib/services/recurring-booking.service";
+import { RegularBookingService } from "@/lib/services/regular-booking.service";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
@@ -45,11 +48,8 @@ import { v4 as uuidv4 } from "uuid";
 import { X_CAL_CLIENT_ID, X_CAL_PLATFORM_EMBED } from "@calcom/platform-constants";
 import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
 import {
-  handleNewRecurringBooking,
-  handleNewBooking,
   BookingResponse,
   HttpError,
-  handleInstantMeeting,
   handleMarkNoShow,
   getAllUserBookings,
   getBookingInfo,
@@ -58,6 +58,7 @@ import {
   ErrorCode,
 } from "@calcom/platform-libraries";
 import { CreationSource } from "@calcom/platform-libraries";
+import { type InstantBookingCreateResult } from "@calcom/platform-libraries/bookings";
 import {
   GetBookingsInput_2024_04_15,
   CancelBookingInput_2024_04_15,
@@ -109,7 +110,10 @@ export class BookingsController_2024_04_15 {
     private readonly apiKeyRepository: ApiKeysRepository,
     private readonly platformBookingsService: PlatformBookingsService,
     private readonly usersRepository: UsersRepository,
-    private readonly usersService: UsersService
+    private readonly usersService: UsersService,
+    private readonly regularBookingService: RegularBookingService,
+    private readonly recurringBookingService: RecurringBookingService,
+    private readonly instantBookingCreateService: InstantBookingCreateService
   ) {}
 
   @Get("/")
@@ -187,17 +191,19 @@ export class BookingsController_2024_04_15 {
     const { orgSlug, locationUrl } = body;
     try {
       const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl, isEmbed);
-      const booking = await handleNewBooking({
+      const booking = await this.regularBookingService.createBooking({
         bookingData: bookingRequest.body,
-        userId: bookingRequest.userId,
-        hostname: bookingRequest.headers?.host || "",
-        forcedSlug: orgSlug,
-        platformClientId: bookingRequest.platformClientId,
-        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-        platformCancelUrl: bookingRequest.platformCancelUrl,
-        platformBookingUrl: bookingRequest.platformBookingUrl,
-        platformBookingLocation: bookingRequest.platformBookingLocation,
-        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        bookingMeta: {
+          userId: bookingRequest.userId,
+          hostname: bookingRequest.headers?.host || "",
+          forcedSlug: orgSlug,
+          platformClientId: bookingRequest.platformClientId,
+          platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+          platformCancelUrl: bookingRequest.platformCancelUrl,
+          platformBookingUrl: bookingRequest.platformBookingUrl,
+          platformBookingLocation: bookingRequest.platformBookingLocation,
+          areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        },
       });
       if (booking.userId && booking.uid && booking.startTime) {
         void (await this.billingService.increaseUsageByUserId(booking.userId, {
@@ -315,15 +321,17 @@ export class BookingsController_2024_04_15 {
 
       const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed);
 
-      const createdBookings: BookingResponse[] = await handleNewRecurringBooking({
+      const createdBookings: BookingResponse[] = await this.recurringBookingService.createBooking({
         bookingData: bookingRequest.body,
-        userId: bookingRequest.userId,
-        hostname: bookingRequest.headers?.host || "",
-        platformClientId: bookingRequest.platformClientId,
-        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-        platformCancelUrl: bookingRequest.platformCancelUrl,
-        platformBookingUrl: bookingRequest.platformBookingUrl,
-        platformBookingLocation: bookingRequest.platformBookingLocation,
+        bookingMeta: {
+          userId: bookingRequest.userId,
+          hostname: bookingRequest.headers?.host || "",
+          platformClientId: bookingRequest.platformClientId,
+          platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+          platformCancelUrl: bookingRequest.platformCancelUrl,
+          platformBookingUrl: bookingRequest.platformBookingUrl,
+          platformBookingLocation: bookingRequest.platformBookingLocation,
+        },
       });
 
       createdBookings.forEach(async (booking) => {
@@ -351,14 +359,15 @@ export class BookingsController_2024_04_15 {
     @Body() body: CreateBookingInput_2024_04_15,
     @Headers(X_CAL_CLIENT_ID) clientId?: string,
     @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
-  ): Promise<ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>>> {
+  ): Promise<ApiResponse<InstantBookingCreateResult>> {
     const oAuthClientId =
       clientId?.toString() || (await this.getOAuthClientIdFromEventType(body.eventTypeId));
     req.userId = (await this.getOwnerId(req)) ?? -1;
     try {
-      const instantMeeting = await handleInstantMeeting(
-        await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
-      );
+      const bookingReq = await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed);
+      const instantMeeting = await this.instantBookingCreateService.createBooking({
+        bookingData: bookingReq.body,
+      });
 
       if (instantMeeting.userId && instantMeeting.bookingUid) {
         const now = new Date();
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/bookings.module.ts b/apps/api/v2/src/ee/bookings/2024-08-13/bookings.module.ts
index d0d37f9e979247..3359fa8d0caa8d 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/bookings.module.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/bookings.module.ts
@@ -16,6 +16,9 @@ import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_0
 import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { InstantBookingModule } from "@/lib/modules/instant-booking.module";
+import { RecurringBookingModule } from "@/lib/modules/recurring-booking.module";
+import { RegularBookingModule } from "@/lib/modules/regular-booking.module";
 import { ApiKeysRepository } from "@/modules/api-keys/api-keys-repository";
 import { AppsRepository } from "@/modules/apps/apps.repository";
 import { BillingModule } from "@/modules/billing/billing.module";
@@ -58,6 +61,9 @@ import { Module } from "@nestjs/common";
     TeamsEventTypesModule,
     MembershipsModule,
     ProfilesModule,
+    RegularBookingModule,
+    RecurringBookingModule,
+    InstantBookingModule,
   ],
   providers: [
     TokensRepository,
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts
index 64ed229bcf76ba..42260bf1b4e450 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts
@@ -87,7 +87,7 @@ import {
 @DocsTags("Bookings")
 @ApiHeader({
   name: "cal-api-version",
-  description: `Must be set to ${VERSION_2024_08_13}`,
+  description: `Must be set to ${VERSION_2024_08_13}. If not set to this value, the endpoint will default to an older version.`,
   example: VERSION_2024_08_13,
   required: true,
   schema: {
@@ -133,6 +133,8 @@ export class BookingsController_2024_08_13 {
 
       If you are creating a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or
       you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.
+
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
       `,
   })
   @ApiBody({
@@ -188,6 +190,8 @@ export class BookingsController_2024_08_13 {
       
       If you are fetching a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or
       you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.
+
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
       `,
   })
   async getBooking(
@@ -206,7 +210,10 @@ export class BookingsController_2024_08_13 {
   @UseGuards(BookingUidGuard)
   @ApiOperation({
     summary: "Get all the recordings for the booking",
-    description: `Fetches all the recordings for the booking \`:bookingUid\``,
+    description: `Fetches all the recordings for the booking \`:bookingUid\`
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async getBookingRecordings(@Param("bookingUid") bookingUid: string): Promise<GetBookingRecordingsOutput> {
     const recordings = await this.calVideoService.getRecordings(bookingUid);
@@ -221,7 +228,10 @@ export class BookingsController_2024_08_13 {
   @UseGuards(BookingUidGuard)
   @ApiOperation({
     summary: "Get all the transcripts download links for the booking",
-    description: `Fetches all the transcripts download links for the booking \`:bookingUid\``,
+    description: `Fetches all the transcripts download links for the booking \`:bookingUid\`
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async getBookingTranscripts(@Param("bookingUid") bookingUid: string): Promise<GetBookingTranscriptsOutput> {
     const transcripts = await this.calVideoService.getTranscripts(bookingUid);
@@ -236,7 +246,10 @@ export class BookingsController_2024_08_13 {
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @Permissions([BOOKING_READ])
-  @ApiOperation({ summary: "Get all bookings" })
+  @ApiOperation({
+    summary: "Get all bookings",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async getBookings(
     @Query() queryParams: GetBookingsInput_2024_08_13,
     @GetUser() user: ApiAuthGuardUser
@@ -263,7 +276,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(OPTIONAL_API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Reschedule a booking",
-    description: "Reschedule a booking or seated booking",
+    description: `Reschedule a booking or seated booking
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   @ApiBody({
     schema: {
@@ -315,6 +331,8 @@ export class BookingsController_2024_08_13 {
     
     If you are cancelling a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or
     you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.
+
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
     `,
   })
   @ApiBody({
@@ -350,7 +368,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Mark a booking absence",
-    description: "The provided authorization header refers to the owner of the booking.",
+    description: `The provided authorization header refers to the owner of the booking.
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async markNoShow(
     @Param("bookingUid") bookingUid: string,
@@ -372,8 +393,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Reassign a booking to auto-selected host",
-    description:
-      "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.",
+    description: `Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.
+      
+       <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+      `,
   })
   async reassignBooking(
     @Param("bookingUid") bookingUid: string,
@@ -394,8 +417,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Reassign a booking to a specific host",
-    description:
-      "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.",
+    description: `Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.
+      
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+      `,
   })
   async reassignBookingToUser(
     @Param("bookingUid") bookingUid: string,
@@ -423,7 +448,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Confirm a booking",
-    description: "The provided authorization header refers to the owner of the booking.",
+    description: `The provided authorization header refers to the owner of the booking.
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async confirmBooking(
     @Param("bookingUid") bookingUid: string,
@@ -444,7 +472,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Decline a booking",
-    description: "The provided authorization header refers to the owner of the booking.",
+    description: `The provided authorization header refers to the owner of the booking.
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note> 
+    `,
   })
   async declineBooking(
     @Param("bookingUid") bookingUid: string,
@@ -465,8 +496,10 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Get 'Add to Calendar' links for a booking",
-    description:
-      "Retrieve calendar links for a booking that can be used to add the event to various calendar services. Returns links for Google Calendar, Microsoft Office, Microsoft Outlook, and a downloadable ICS file.",
+    description: `Retrieve calendar links for a booking that can be used to add the event to various calendar services. Returns links for Google Calendar, Microsoft Office, Microsoft Outlook, and a downloadable ICS file.
+      
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note> 
+      `,
   })
   @HttpCode(HttpStatus.OK)
   async getCalendarLinks(@Param("bookingUid") bookingUid: string): Promise<CalendarLinksOutput_2024_08_13> {
@@ -485,6 +518,7 @@ export class BookingsController_2024_08_13 {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
     summary: "Get booking references",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
   })
   @HttpCode(HttpStatus.OK)
   async getBookingReferences(
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts
index 4cc21e3b59cd8a..dc57ee99c07f4d 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts
@@ -2494,7 +2494,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           .expect(400);
 
         expect(response.body.error.message).toEqual(
-          `Missing attendee phone number - it is required by the event type. Pass it as \"attendee.phoneNumber\" string in the request.`
+          `Missing attendee phone number - it is required by the event type. Pass it as "attendee.phoneNumber" string in the request.`
         );
       });
 
@@ -3026,13 +3026,154 @@ describe("Bookings Endpoints 2024-08-13", () => {
               });
           });
         });
+
+        describe("event type with max bookings count per booker", () => {
+          it("should not allow booking more than maximumActiveBookings per attendee", async () => {
+            const eventTypeIdWithMaxBookerBookings = await eventTypesRepositoryFixture.create(
+              {
+                slug: `max-bookings-count-per-booker-${randomString(10)}`,
+                length: 60,
+                title: "Event Type with max bookings count per booker",
+                maxActiveBookingsPerBooker: 1,
+              },
+              user.id
+            );
+
+            const body: CreateBookingInput_2024_08_13 = {
+              start: new Date(Date.UTC(2040, 0, 13, 10, 0, 0)).toISOString(),
+              eventTypeId: eventTypeIdWithMaxBookerBookings.id,
+              attendee: {
+                name: "alice",
+                email: "alice@gmail.com",
+                timeZone: "Europe/Rome",
+                language: "it",
+              },
+            };
+
+            const response = await request(app.getHttpServer())
+              .post("/v2/bookings")
+              .send(body)
+              .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+              .expect(201);
+
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.id).toBeDefined();
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
+              );
+            }
+
+            const response2 = await request(app.getHttpServer())
+              .post("/v2/bookings")
+              .send(body)
+              .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+              .expect(400);
+
+            expect(response2.body.error.message).toBe(
+              "Attendee with this email can't book because the maximum number of active bookings has been reached."
+            );
+
+            const body2: CreateBookingInput_2024_08_13 = {
+              start: new Date(Date.UTC(2040, 0, 13, 12, 0, 0)).toISOString(),
+              eventTypeId: eventTypeIdWithMaxBookerBookings.id,
+              attendee: {
+                name: "bob",
+                email: "bob@gmail.com",
+                timeZone: "Europe/Rome",
+                language: "it",
+              },
+            };
+
+            const response3 = await request(app.getHttpServer())
+              .post("/v2/bookings")
+              .send(body2)
+              .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+              .expect(201);
+
+            const responseBody2: CreateBookingOutput_2024_08_13 = response3.body;
+            expect(responseBody2.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody2.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody2.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody2.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody2.data;
+              expect(data.id).toBeDefined();
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
+              );
+            }
+          });
+
+          it("should not allow booking more than maximumActiveBookings per attendee and offer rescheduling", async () => {
+            const eventTypeIdWithMaxBookerBookings = await eventTypesRepositoryFixture.create(
+              {
+                slug: `max-bookings-count-per-booker-with-reschedule-${randomString(10)}`,
+                length: 60,
+                title: "Event Type with max bookings count per booker with reschedule",
+                maxActiveBookingsPerBooker: 1,
+                maxActiveBookingPerBookerOfferReschedule: true,
+              },
+              user.id
+            );
+
+            const body: CreateBookingInput_2024_08_13 = {
+              start: new Date(Date.UTC(2040, 0, 13, 14, 0, 0)).toISOString(),
+              eventTypeId: eventTypeIdWithMaxBookerBookings.id,
+              attendee: {
+                name: "charlie",
+                email: "charlie@gmail.com",
+                timeZone: "Europe/Rome",
+                language: "it",
+              },
+            };
+
+            const response = await request(app.getHttpServer())
+              .post("/v2/bookings")
+              .send(body)
+              .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+              .expect(201);
+
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.id).toBeDefined();
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
+              );
+            }
+
+            const response2 = await request(app.getHttpServer())
+              .post("/v2/bookings")
+              .send(body)
+              .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+              .expect(400);
+
+            expect(response2.body.error.message).toBe(
+              `Attendee with this email can't book because the maximum number of active bookings has been reached. You can reschedule your existing booking (${responseBody.data.uid}) to a new timeslot instead.`
+            );
+          });
+        });
       });
     });
 
-    function responseDataIsRecurranceBooking(data: any): data is RecurringBookingOutput_2024_08_13 {
+    function responseDataIsRecurranceBooking(data: unknown): data is RecurringBookingOutput_2024_08_13 {
       return (
         !Array.isArray(data) &&
         typeof data === "object" &&
+        data !== null &&
         data &&
         "id" in data &&
         "recurringBookingUid" in data
@@ -3048,11 +3189,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
     });
   });
 
-  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
-    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  function responseDataIsBooking(data: unknown): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data !== null && data && "id" in data;
   }
 
-  function responseDataIsRecurringBooking(data: any): data is RecurringBookingOutput_2024_08_13[] {
+  function responseDataIsRecurringBooking(data: unknown): data is RecurringBookingOutput_2024_08_13[] {
     return Array.isArray(data);
   }
 });
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts b/apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts
index b3a91219243983..b9d94bc8f0cb4d 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts
@@ -6,6 +6,9 @@ import { OutputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/servi
 import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
 import { getPagination } from "@/lib/pagination/pagination";
+import { InstantBookingCreateService } from "@/lib/services/instant-booking-create.service";
+import { RecurringBookingService } from "@/lib/services/recurring-booking.service";
+import { RegularBookingService } from "@/lib/services/regular-booking.service";
 import { AuthOptionalUser } from "@/modules/auth/decorators/get-optional-user/get-optional-user.decorator";
 import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { BillingService } from "@/modules/billing/services/billing.service";
@@ -37,10 +40,8 @@ import { DateTime } from "luxon";
 import { z } from "zod";
 
 import {
-  handleNewRecurringBooking,
   getTranslation,
   getAllUserBookings,
-  handleInstantMeeting,
   handleCancelBooking,
   roundRobinReassignment,
   roundRobinManualReassignment,
@@ -48,7 +49,6 @@ import {
   confirmBookingHandler,
   getCalendarLinks,
 } from "@calcom/platform-libraries";
-import { handleNewBooking } from "@calcom/platform-libraries";
 import {
   CreateBookingInput_2024_08_13,
   CreateBookingInput,
@@ -109,7 +109,10 @@ export class BookingsService_2024_08_13 {
     private readonly teamsEventTypesRepository: TeamsEventTypesRepository,
     private readonly membershipsRepository: MembershipsRepository,
     private readonly membershipsService: MembershipsService,
-    private readonly errorsBookingsService: ErrorsBookingsService_2024_08_13
+    private readonly errorsBookingsService: ErrorsBookingsService_2024_08_13,
+    private readonly regularBookingService: RegularBookingService,
+    private readonly recurringBookingService: RecurringBookingService,
+    private readonly instantBookingCreateService: InstantBookingCreateService
   ) {}
 
   async createBooking(request: Request, body: CreateBookingInput, authUser: AuthOptionalUser) {
@@ -464,7 +467,9 @@ export class BookingsService_2024_08_13 {
     }
 
     const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
-    const booking = await handleInstantMeeting(bookingRequest);
+    const booking = await this.instantBookingCreateService.createBooking({
+      bookingData: bookingRequest.body,
+    });
 
     const databaseBooking = await this.bookingsRepository.getByIdWithAttendeesAndUserAndEvent(
       booking.bookingId
@@ -482,17 +487,19 @@ export class BookingsService_2024_08_13 {
     eventType: EventTypeWithOwnerAndTeam
   ) {
     const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body, eventType);
-    const bookings = await handleNewRecurringBooking({
+    const bookings = await this.recurringBookingService.createBooking({
       bookingData: bookingRequest.body,
-      userId: bookingRequest.userId,
-      hostname: bookingRequest.headers?.host || "",
-      platformClientId: bookingRequest.platformClientId,
-      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-      platformCancelUrl: bookingRequest.platformCancelUrl,
-      platformBookingUrl: bookingRequest.platformBookingUrl,
-      platformBookingLocation: bookingRequest.platformBookingLocation,
-      noEmail: bookingRequest.noEmail,
-      areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      bookingMeta: {
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+        noEmail: bookingRequest.noEmail,
+        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      },
     });
     const ids = bookings.map((booking) => booking.id || 0);
     return this.outputService.getOutputRecurringBookings(ids);
@@ -505,16 +512,18 @@ export class BookingsService_2024_08_13 {
     userIsEventTypeAdminOrOwner: boolean
   ) {
     const bookingRequest = await this.inputService.createRecurringBookingRequest(request, body, eventType);
-    const bookings = await handleNewRecurringBooking({
+    const bookings = await this.recurringBookingService.createBooking({
       bookingData: bookingRequest.body,
-      userId: bookingRequest.userId,
-      hostname: bookingRequest.headers?.host || "",
-      platformClientId: bookingRequest.platformClientId,
-      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-      platformCancelUrl: bookingRequest.platformCancelUrl,
-      platformBookingUrl: bookingRequest.platformBookingUrl,
-      platformBookingLocation: bookingRequest.platformBookingLocation,
-      areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      bookingMeta: {
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      },
     });
     return this.outputService.getOutputCreateRecurringSeatedBookings(
       bookings.map((booking) => ({ uid: booking.uid || "", seatUid: booking.seatReferenceUid || "" })),
@@ -528,16 +537,18 @@ export class BookingsService_2024_08_13 {
     eventType: EventTypeWithOwnerAndTeam
   ) {
     const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
-    const booking = await handleNewBooking({
+    const booking = await this.regularBookingService.createBooking({
       bookingData: bookingRequest.body,
-      userId: bookingRequest.userId,
-      hostname: bookingRequest.headers?.host || "",
-      platformClientId: bookingRequest.platformClientId,
-      platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-      platformCancelUrl: bookingRequest.platformCancelUrl,
-      platformBookingUrl: bookingRequest.platformBookingUrl,
-      platformBookingLocation: bookingRequest.platformBookingLocation,
-      areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      bookingMeta: {
+        userId: bookingRequest.userId,
+        hostname: bookingRequest.headers?.host || "",
+        platformClientId: bookingRequest.platformClientId,
+        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+        platformCancelUrl: bookingRequest.platformCancelUrl,
+        platformBookingUrl: bookingRequest.platformBookingUrl,
+        platformBookingLocation: bookingRequest.platformBookingLocation,
+        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+      },
     });
 
     if (!booking.uid) {
@@ -560,16 +571,18 @@ export class BookingsService_2024_08_13 {
   ) {
     const bookingRequest = await this.inputService.createBookingRequest(request, body, eventType);
     try {
-      const booking = await handleNewBooking({
+      const booking = await this.regularBookingService.createBooking({
         bookingData: bookingRequest.body,
-        userId: bookingRequest.userId,
-        hostname: bookingRequest.headers?.host || "",
-        platformClientId: bookingRequest.platformClientId,
-        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-        platformCancelUrl: bookingRequest.platformCancelUrl,
-        platformBookingUrl: bookingRequest.platformBookingUrl,
-        platformBookingLocation: bookingRequest.platformBookingLocation,
-        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        bookingMeta: {
+          userId: bookingRequest.userId,
+          hostname: bookingRequest.headers?.host || "",
+          platformClientId: bookingRequest.platformClientId,
+          platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+          platformCancelUrl: bookingRequest.platformCancelUrl,
+          platformBookingUrl: bookingRequest.platformBookingUrl,
+          platformBookingLocation: bookingRequest.platformBookingLocation,
+          areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        },
       });
 
       if (!booking.uid) {
@@ -755,16 +768,18 @@ export class BookingsService_2024_08_13 {
         bookingUid,
         body
       );
-      const booking = await handleNewBooking({
+      const booking = await this.regularBookingService.createBooking({
         bookingData: bookingRequest.body,
-        userId: bookingRequest.userId,
-        hostname: bookingRequest.headers?.host || "",
-        platformClientId: bookingRequest.platformClientId,
-        platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
-        platformCancelUrl: bookingRequest.platformCancelUrl,
-        platformBookingUrl: bookingRequest.platformBookingUrl,
-        platformBookingLocation: bookingRequest.platformBookingLocation,
-        areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        bookingMeta: {
+          userId: bookingRequest.userId,
+          hostname: bookingRequest.headers?.host || "",
+          platformClientId: bookingRequest.platformClientId,
+          platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
+          platformCancelUrl: bookingRequest.platformCancelUrl,
+          platformBookingUrl: bookingRequest.platformBookingUrl,
+          platformBookingLocation: bookingRequest.platformBookingLocation,
+          areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        },
       });
       if (!booking.uid) {
         throw new Error("Booking missing uid");
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/services/errors.service.ts b/apps/api/v2/src/ee/bookings/2024-08-13/services/errors.service.ts
index 0563358baf3b79..beeadd63950dc7 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/services/errors.service.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/services/errors.service.ts
@@ -48,6 +48,19 @@ export class ErrorsBookingsService_2024_08_13 {
         throw new BadRequestException("Attempting to book a meeting in the past.");
       } else if (error.message === "hosts_unavailable_for_booking") {
         throw new BadRequestException(hostsUnavaile);
+      } else if (error.message === "booker_limit_exceeded_error") {
+        throw new BadRequestException(
+          "Attendee with this email can't book because the maximum number of active bookings has been reached."
+        );
+      } else if (error.message === "booker_limit_exceeded_error_reschedule") {
+        const errorData =
+          "data" in error ? (error.data as { rescheduleUid: string }) : { rescheduleUid: undefined };
+        let message =
+          "Attendee with this email can't book because the maximum number of active bookings has been reached.";
+        if (errorData?.rescheduleUid) {
+          message += ` You can reschedule your existing booking (${errorData.rescheduleUid}) to a new timeslot instead.`;
+        }
+        throw new BadRequestException(message);
       }
     }
     throw error;
diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts b/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts
index de185c48d62e63..b2a931e08c2ba1 100644
--- a/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts
+++ b/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts
@@ -817,7 +817,7 @@ export class InputBookingsService_2024_08_13 {
     // for an individual person, so api users need to call booking by booking using uid + seatUid to cancel it.
     return {
       uid: bookingUid,
-      cancellationReason: "",
+      cancellationReason: inputBooking.cancellationReason || "",
       allRemainingBookings: false,
       seatReferenceUid: inputBooking.seatUid,
     };
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_04_15/services/event-types.service.ts b/apps/api/v2/src/ee/event-types/event-types_2024_04_15/services/event-types.service.ts
index 7a08114549febc..d7cc75cd79b92c 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_04_15/services/event-types.service.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_04_15/services/event-types.service.ts
@@ -137,7 +137,11 @@ export class EventTypesService_2024_04_15 {
       !bookingFields.find((field) => field.type === "email") &&
       !bookingFields.find((field) => field.type === "phone")
     ) {
-      bookingFields.push({ ...systemBeforeFieldEmail, type: BaseField.email, editable: Editable.system });
+      bookingFields.push({
+        ...systemBeforeFieldEmail,
+        type: BaseField.email,
+        editable: Editable.systemButOptional,
+      });
     }
 
     await updateEventType({
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts
index 1e4f5e2509f4cc..8ac36da0d51e25 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts
@@ -31,16 +31,18 @@ import {
   FrequencyInput,
 } from "@calcom/platform-enums";
 import { SchedulingType } from "@calcom/platform-libraries";
-import type {
-  ApiSuccessResponse,
-  CreateEventTypeInput_2024_06_14,
-  EventTypeOutput_2024_06_14,
-  GuestsDefaultFieldOutput_2024_06_14,
-  NameDefaultFieldInput_2024_06_14,
-  NotesDefaultFieldInput_2024_06_14,
-  SplitNameDefaultFieldOutput_2024_06_14,
-  UpdateEventTypeInput_2024_06_14,
+import {
+  type ApiSuccessResponse,
+  type CreateEventTypeInput_2024_06_14,
+  type EventTypeOutput_2024_06_14,
+  type GuestsDefaultFieldOutput_2024_06_14,
+  type NameDefaultFieldInput_2024_06_14,
+  type NotesDefaultFieldInput_2024_06_14,
+  type SplitNameDefaultFieldOutput_2024_06_14,
+  type UpdateEventTypeInput_2024_06_14,
 } from "@calcom/platform-types";
+import { FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE } from "@calcom/platform-types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit";
+import { REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR } from "@calcom/platform-types/utils/RequiresOneOfPropertiesWhenNotDisabled";
 import type { PlatformOAuthClient, Team, User, Schedule, EventType } from "@calcom/prisma/client";
 
 const orderBySlug = (a: { slug: string }, b: { slug: string }) => {
@@ -1442,6 +1444,177 @@ describe("Event types Endpoints", () => {
         .expect(200);
     });
 
+    describe("bookerActiveBookingsLimit", () => {
+      describe("negative tests", () => {
+        it("should not create an event type with bookerActiveBookingsLimit and recurrence", async () => {
+          const body: CreateEventTypeInput_2024_06_14 = {
+            title: "Coding class with bookerActiveBookingsLimit",
+            slug: "coding-class-booker-active-bookings-limit",
+            description: "Let's learn how to code like a pro.",
+            lengthInMinutes: 60,
+            bookerActiveBookingsLimit: {
+              maximumActiveBookings: 2,
+              offerReschedule: true,
+            },
+            recurrence: {
+              frequency: FrequencyInput.weekly,
+              interval: 2,
+              occurrences: 10,
+            },
+          };
+
+          const response = await request(app.getHttpServer())
+            .post("/api/v2/event-types")
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(400);
+
+          expect(
+            response.body.error.message.includes(FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE)
+          ).toBe(true);
+        });
+
+        it("should not allow creating an event type with bookerActiveBookingsLimit disabled:false", async () => {
+          const body: CreateEventTypeInput_2024_06_14 = {
+            title: "Coding class with bookerActiveBookingsLimit disabled:false",
+            slug: "coding-class-booker-active-bookings-limit-disabled",
+            description: "Let's learn how to code like a pro.",
+            lengthInMinutes: 60,
+            // note(Lauris): disabled false means that it is enabled so it should have maximumActiveBookings and / or offerReschedule provided
+            bookerActiveBookingsLimit: {
+              disabled: false,
+            },
+          };
+
+          const response = await request(app.getHttpServer())
+            .post("/api/v2/event-types")
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(400);
+
+          expect(response.body.error.message.includes(REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR)).toBe(true);
+        });
+      });
+
+      describe("positive tests", () => {
+        let eventTypeWithBookerActiveBookingsLimitId: number;
+
+        it("should create an event type with bookerActiveBookingsLimit", async () => {
+          const body: CreateEventTypeInput_2024_06_14 = {
+            title: "Coding class with bookerActiveBookingsLimit",
+            slug: "coding-class-booker-active-bookings-limit",
+            description: "Let's learn how to code like a pro.",
+            lengthInMinutes: 60,
+            bookerActiveBookingsLimit: {
+              maximumActiveBookings: 2,
+              offerReschedule: true,
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/api/v2/event-types")
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(201)
+            .then(async (response) => {
+              const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+              const createdEventType = responseBody.data;
+              expect(createdEventType).toHaveProperty("id");
+              expect(createdEventType.title).toEqual(body.title);
+              expect(createdEventType.bookerActiveBookingsLimit).toEqual(body.bookerActiveBookingsLimit);
+              eventTypeWithBookerActiveBookingsLimitId = createdEventType.id;
+            });
+        });
+
+        it("should update an event type with bookerActiveBookingsLimit", async () => {
+          const body: UpdateEventTypeInput_2024_06_14 = {
+            bookerActiveBookingsLimit: {
+              disabled: true,
+            },
+          };
+
+          return request(app.getHttpServer())
+            .patch(`/api/v2/event-types/${eventTypeWithBookerActiveBookingsLimitId}`)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(200)
+            .then(async (response) => {
+              const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+              const updatedEventType = responseBody.data;
+              expect(updatedEventType.bookerActiveBookingsLimit).toEqual(body.bookerActiveBookingsLimit);
+              eventTypeWithBookerActiveBookingsLimitId = updatedEventType.id;
+            });
+        });
+
+        it("should create an event type with bookerActiveBookingsLimit and recurrence disabled", async () => {
+          const body: CreateEventTypeInput_2024_06_14 = {
+            title: "Coding class with bookerActiveBookingsLimit and recurrence disabled",
+            slug: "coding-class-booker-active-bookings-limit-recurrence-disabled",
+            description: "Let's learn how to code like a pro.",
+            lengthInMinutes: 60,
+            bookerActiveBookingsLimit: {
+              maximumActiveBookings: 2,
+              offerReschedule: true,
+            },
+            recurrence: {
+              disabled: true,
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/api/v2/event-types")
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(201)
+            .then(async (response) => {
+              const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+              const createdEventType = responseBody.data;
+              expect(createdEventType).toHaveProperty("id");
+              expect(createdEventType.title).toEqual(body.title);
+              expect(createdEventType.bookerActiveBookingsLimit).toEqual(body.bookerActiveBookingsLimit);
+              eventTypeWithBookerActiveBookingsLimitId = createdEventType.id;
+            });
+        });
+
+        it("should create an event type with recurrence and bookerActiveBookingsLimit disabled", async () => {
+          const body: CreateEventTypeInput_2024_06_14 = {
+            title: "Coding class with bookerActiveBookingsLimit disabled and recurrence",
+            slug: "coding-class-booker-active-bookings-limit-disabled-and-recurrence",
+            description: "Let's learn how to code like a pro.",
+            lengthInMinutes: 60,
+            bookerActiveBookingsLimit: {
+              disabled: true,
+            },
+            recurrence: {
+              frequency: FrequencyInput.weekly,
+              interval: 2,
+              occurrences: 10,
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/api/v2/event-types")
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+            .set("Authorization", `Bearer ${apiKeyString}`)
+            .send(body)
+            .expect(201)
+            .then(async (response) => {
+              const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+              const createdEventType = responseBody.data;
+              expect(createdEventType).toHaveProperty("id");
+              expect(createdEventType.title).toEqual(body.title);
+              expect(createdEventType.bookerActiveBookingsLimit).toEqual(body.bookerActiveBookingsLimit);
+              eventTypeWithBookerActiveBookingsLimitId = createdEventType.id;
+            });
+        });
+      });
+    });
+
     afterAll(async () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await teamRepositoryFixture.delete(organization.id);
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.ts
index b338e3774a8549..b4c8d88a2a29e7 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.ts
@@ -61,7 +61,7 @@ import {
 @DocsTags("Event Types")
 @ApiHeader({
   name: "cal-api-version",
-  description: `Must be set to ${VERSION_2024_06_14}`,
+  description: `Must be set to ${VERSION_2024_06_14}. If not set to this value, the endpoint will default to an older version.`,
   example: VERSION_2024_06_14,
   required: true,
   schema: {
@@ -80,7 +80,10 @@ export class EventTypesController_2024_06_14 {
   @Permissions([EVENT_TYPE_WRITE])
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
-  @ApiOperation({ summary: "Create an event type" })
+  @ApiOperation({
+    summary: "Create an event type",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async createEventType(
     @Body() body: CreateEventTypeInput_2024_06_14,
     @GetUser() user: UserWithProfile
@@ -102,7 +105,10 @@ export class EventTypesController_2024_06_14 {
   @Permissions([EVENT_TYPE_READ])
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
-  @ApiOperation({ summary: "Get an event type" })
+  @ApiOperation({
+    summary: "Get an event type",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async getEventTypeById(
     @Param("eventTypeId") eventTypeId: string,
     @GetUser() user: UserWithProfile
@@ -122,8 +128,10 @@ export class EventTypesController_2024_06_14 {
   @Get("/")
   @ApiOperation({
     summary: "Get all event types",
-    description:
-      "Hidden event types are returned only if authentication is provided and it belongs to the event type owner.",
+    description: `Hidden event types are returned only if authentication is provided and it belongs to the event type owner.
+      
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+      `,
   })
   @UseGuards(OptionalApiAuthGuard)
   @ApiHeader(OPTIONAL_X_CAL_CLIENT_ID_HEADER)
@@ -149,7 +157,10 @@ export class EventTypesController_2024_06_14 {
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Update an event type" })
+  @ApiOperation({
+    summary: "Update an event type",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async updateEventType(
     @Param("eventTypeId", ParseIntPipe) eventTypeId: number,
     @Body() body: UpdateEventTypeInput_2024_06_14,
@@ -173,7 +184,10 @@ export class EventTypesController_2024_06_14 {
   @Permissions([EVENT_TYPE_WRITE])
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
-  @ApiOperation({ summary: "Delete an event type" })
+  @ApiOperation({
+    summary: "Delete an event type",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async deleteEventType(
     @Param("eventTypeId") eventTypeId: number,
     @GetUser("id") userId: number
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts
index c05e7c765b26fc..c904901e89000e 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts
@@ -28,7 +28,11 @@ import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable, BadRequestException } from "@nestjs/common";
 
 import { getApps, getUsersCredentialsIncludeServiceAccountKey } from "@calcom/platform-libraries/app-store";
-import { validateCustomEventName, EventTypeMetaDataSchema } from "@calcom/platform-libraries/event-types";
+import {
+  validateCustomEventName,
+  EventTypeMetaDataSchema,
+  EventTypeMetadata,
+} from "@calcom/platform-libraries/event-types";
 import {
   CreateEventTypeInput_2024_06_14,
   DestinationCalendar_2024_06_14,
@@ -67,11 +71,13 @@ export class InputEventTypesService_2024_06_14 {
       eventName: transformedBody.eventName,
     });
 
-    transformedBody.destinationCalendar &&
-      (await this.validateInputDestinationCalendar(user.id, transformedBody.destinationCalendar));
+    if (transformedBody.destinationCalendar) {
+      await this.validateInputDestinationCalendar(user.id, transformedBody.destinationCalendar);
+    }
 
-    transformedBody.useEventTypeDestinationCalendarEmail &&
-      (await this.validateInputUseDestinationCalendarEmail(user.id));
+    if (transformedBody.useEventTypeDestinationCalendarEmail) {
+      await this.validateInputUseDestinationCalendarEmail(user.id);
+    }
 
     return transformedBody;
   }
@@ -93,11 +99,13 @@ export class InputEventTypesService_2024_06_14 {
       eventName: transformedBody.eventName,
     });
 
-    transformedBody.destinationCalendar &&
-      (await this.validateInputDestinationCalendar(user.id, transformedBody.destinationCalendar));
+    if (transformedBody.destinationCalendar) {
+      await this.validateInputDestinationCalendar(user.id, transformedBody.destinationCalendar);
+    }
 
-    transformedBody.useEventTypeDestinationCalendarEmail &&
-      (await this.validateInputUseDestinationCalendarEmail(user.id));
+    if (transformedBody.useEventTypeDestinationCalendarEmail) {
+      await this.validateInputUseDestinationCalendarEmail(user.id);
+    }
 
     return transformedBody;
   }
@@ -119,6 +127,7 @@ export class InputEventTypesService_2024_06_14 {
       customName,
       useDestinationCalendarEmail,
       disableGuests,
+      bookerActiveBookingsLimit,
       ...rest
     } = inputEventType;
     const confirmationPolicyTransformed = this.transformInputConfirmationPolicy(confirmationPolicy);
@@ -130,6 +139,17 @@ export class InputEventTypesService_2024_06_14 {
         ? this.getBookingFieldsWithGuestsToggled(bookingFields, disableGuests)
         : bookingFields;
 
+    const maxActiveBookingsPerBooker = bookerActiveBookingsLimit
+      ? this.transformInputBookerActiveBookingsLimit(bookerActiveBookingsLimit)
+      : {};
+
+    const metadata: EventTypeMetadata = {
+      bookerLayouts: this.transformInputBookerLayouts(bookerLayouts),
+      requiresConfirmationThreshold:
+        confirmationPolicyTransformed?.requiresConfirmationThreshold ?? undefined,
+      multipleDuration: lengthInMinutesOptions,
+    };
+
     const eventType = {
       ...rest,
       length: lengthInMinutes,
@@ -140,12 +160,7 @@ export class InputEventTypesService_2024_06_14 {
         ? this.transformInputIntervalLimits(bookingLimitsDuration)
         : undefined,
       ...this.transformInputBookingWindow(bookingWindow),
-      metadata: {
-        bookerLayouts: this.transformInputBookerLayouts(bookerLayouts),
-        requiresConfirmationThreshold:
-          confirmationPolicyTransformed?.requiresConfirmationThreshold ?? undefined,
-        multipleDuration: lengthInMinutesOptions,
-      },
+      metadata,
       requiresConfirmation: confirmationPolicyTransformed?.requiresConfirmation ?? undefined,
       requiresConfirmationWillBlockSlot:
         confirmationPolicyTransformed?.requiresConfirmationWillBlockSlot ?? undefined,
@@ -154,11 +169,27 @@ export class InputEventTypesService_2024_06_14 {
       ...this.transformInputSeatOptions(seats),
       eventName: customName,
       useEventTypeDestinationCalendarEmail: useDestinationCalendarEmail,
+      ...maxActiveBookingsPerBooker,
     };
 
     return eventType;
   }
 
+  transformInputBookerActiveBookingsLimit(
+    bookerActiveBookingsLimit: CreateEventTypeInput_2024_06_14["bookerActiveBookingsLimit"]
+  ) {
+    if (!bookerActiveBookingsLimit || bookerActiveBookingsLimit.disabled) {
+      return {
+        maxActiveBookingsPerBooker: null,
+        maxActiveBookingPerBookerOfferReschedule: false,
+      };
+    }
+    return {
+      maxActiveBookingsPerBooker: bookerActiveBookingsLimit?.maximumActiveBookings,
+      maxActiveBookingPerBookerOfferReschedule: bookerActiveBookingsLimit?.offerReschedule,
+    };
+  }
+
   async transformInputUpdateEventType(inputEventType: UpdateEventTypeInput_2024_06_14, eventTypeId: number) {
     const {
       lengthInMinutes,
@@ -176,10 +207,11 @@ export class InputEventTypesService_2024_06_14 {
       customName,
       useDestinationCalendarEmail,
       disableGuests,
+      bookerActiveBookingsLimit,
       ...rest
     } = inputEventType;
     const eventTypeDb = await this.eventTypesRepository.getEventTypeWithMetaData(eventTypeId);
-    const metadataTransformed = !!eventTypeDb?.metadata
+    const metadataTransformed = eventTypeDb?.metadata
       ? EventTypeMetaDataSchema.parse(eventTypeDb.metadata)
       : {};
 
@@ -190,6 +222,18 @@ export class InputEventTypesService_2024_06_14 {
         ? this.getBookingFieldsWithGuestsToggled(bookingFields, disableGuests)
         : bookingFields;
 
+    const maxActiveBookingsPerBooker = bookerActiveBookingsLimit
+      ? this.transformInputBookerActiveBookingsLimit(bookerActiveBookingsLimit)
+      : {};
+
+    const metadata: EventTypeMetadata = {
+      ...metadataTransformed,
+      bookerLayouts: this.transformInputBookerLayouts(bookerLayouts),
+      requiresConfirmationThreshold:
+        confirmationPolicyTransformed?.requiresConfirmationThreshold ?? undefined,
+      multipleDuration: lengthInMinutesOptions,
+    };
+
     const eventType = {
       ...rest,
       length: lengthInMinutes,
@@ -202,13 +246,7 @@ export class InputEventTypesService_2024_06_14 {
         ? this.transformInputIntervalLimits(bookingLimitsDuration)
         : undefined,
       ...this.transformInputBookingWindow(bookingWindow),
-      metadata: {
-        ...metadataTransformed,
-        bookerLayouts: this.transformInputBookerLayouts(bookerLayouts),
-        requiresConfirmationThreshold:
-          confirmationPolicyTransformed?.requiresConfirmationThreshold ?? undefined,
-        multipleDuration: lengthInMinutesOptions,
-      },
+      metadata,
       recurringEvent: recurrence ? this.transformInputRecurrignEvent(recurrence) : undefined,
       requiresConfirmation: confirmationPolicyTransformed?.requiresConfirmation ?? undefined,
       requiresConfirmationWillBlockSlot:
@@ -217,6 +255,7 @@ export class InputEventTypesService_2024_06_14 {
       ...this.transformInputSeatOptions(seats),
       eventName: customName,
       useEventTypeDestinationCalendarEmail: useDestinationCalendarEmail,
+      ...maxActiveBookingsPerBooker,
     };
 
     return eventType;
@@ -319,7 +358,7 @@ export class InputEventTypesService_2024_06_14 {
 
   transformInputBookingWindow(inputBookingWindow: CreateEventTypeInput_2024_06_14["bookingWindow"]) {
     const res = transformFutureBookingLimitsApiToInternal(inputBookingWindow);
-    return !!res ? res : {};
+    return res ? res : {};
   }
 
   transformInputBookerLayouts(inputBookerLayouts: CreateEventTypeInput_2024_06_14["bookerLayouts"]) {
@@ -369,7 +408,7 @@ export class InputEventTypesService_2024_06_14 {
       requiresConfirmationDb = eventTypeDb?.requiresConfirmation ?? false;
     }
 
-    const seatsPerTimeSlotFinal = !!seatsPerTimeSlot ? seatsPerTimeSlot : seatsPerTimeSlotDb;
+    const seatsPerTimeSlotFinal = seatsPerTimeSlot ? seatsPerTimeSlot : seatsPerTimeSlotDb;
     const seatsEnabledFinal = !!seatsPerTimeSlotFinal && seatsPerTimeSlotFinal > 0;
 
     const locationsFinal = locations !== undefined ? locations : locationsDb;
@@ -394,6 +433,7 @@ export class InputEventTypesService_2024_06_14 {
       );
     }
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformLocations(locations: any) {
     if (!locations) return [];
 
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts
index b0db6cc1ecc7f8..d53d14e4e037fd 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts
@@ -92,6 +92,8 @@ type Input = Pick<
   | "calVideoSettings"
   | "hidden"
   | "bookingRequiresAuthentication"
+  | "maxActiveBookingsPerBooker"
+  | "maxActiveBookingPerBookerOfferReschedule"
 >;
 
 @Injectable()
@@ -165,6 +167,7 @@ export class OutputEventTypesService_2024_06_14 {
       periodEndDate: databaseEventType.periodEndDate,
     } as TransformFutureBookingsLimitSchema_2024_06_14);
     const destinationCalendar = this.transformDestinationCalendar(databaseEventType.destinationCalendar);
+    const bookerActiveBookingsLimit = this.transformBookerActiveBookingsLimit(databaseEventType);
 
     return {
       id,
@@ -210,9 +213,29 @@ export class OutputEventTypesService_2024_06_14 {
       calVideoSettings,
       hidden,
       bookingRequiresAuthentication,
+      bookerActiveBookingsLimit,
     };
   }
 
+  transformBookerActiveBookingsLimit(databaseEventType: Input) {
+    const noMaxActiveBookingsPerBooker =
+      !databaseEventType.maxActiveBookingsPerBooker && databaseEventType.maxActiveBookingsPerBooker !== 0;
+    const noMaxActiveBookingPerBookerOfferReschedule =
+      !databaseEventType.maxActiveBookingPerBookerOfferReschedule;
+
+    if (noMaxActiveBookingsPerBooker && noMaxActiveBookingPerBookerOfferReschedule) {
+      return {
+        disabled: true,
+      };
+    }
+
+    return {
+      maximumActiveBookings: databaseEventType.maxActiveBookingsPerBooker ?? undefined,
+      offerReschedule: databaseEventType.maxActiveBookingPerBookerOfferReschedule ?? undefined,
+    };
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformLocations(locationDb: any) {
     if (!locationDb) return [];
 
@@ -239,6 +262,7 @@ export class OutputEventTypesService_2024_06_14 {
     };
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformBookingFields(bookingFields: any) {
     if (!bookingFields) return [];
 
@@ -273,6 +297,7 @@ export class OutputEventTypesService_2024_06_14 {
     return this.transformBookingFields(defaultBookingFields);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformRecurringEvent(recurringEvent: any) {
     if (!recurringEvent) return null;
     const recurringEventParsed = parseRecurringEvent(recurringEvent);
@@ -280,6 +305,7 @@ export class OutputEventTypesService_2024_06_14 {
     return transformRecurrenceInternalToApi(recurringEventParsed);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformMetadata(metadata: any) {
     if (!metadata) return {};
     return EventTypeMetaDataSchema.parse(metadata);
@@ -301,6 +327,7 @@ export class OutputEventTypesService_2024_06_14 {
     });
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformIntervalLimits(bookingLimits: any) {
     const bookingLimitsParsed = parseBookingLimit(bookingLimits);
     return transformIntervalLimitsInternalToApi(bookingLimitsParsed);
@@ -327,6 +354,7 @@ export class OutputEventTypesService_2024_06_14 {
     );
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformEventTypeColor(eventTypeColor: any) {
     if (!eventTypeColor) return undefined;
     const parsedeventTypeColor = parseEventTypeColor(eventTypeColor);
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformed/event-type.tranformed.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformed/event-type.tranformed.ts
index 65a83998732fc2..c613b6d71cc6db 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformed/event-type.tranformed.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformed/event-type.tranformed.ts
@@ -38,6 +38,8 @@ export type InputEventTransformed_2024_06_14 = Omit<
   bookingFields?: ReturnType<typeof transformBookingFieldsApiToInternal>;
   durationLimits?: ReturnType<typeof transformIntervalLimitsApiToInternal>;
   recurringEvent?: ReturnType<typeof transformRecurrenceApiToInternal>;
+  maxActiveBookingsPerBooker?: number;
+  maxActiveBookingPerBookerOfferReschedule?: boolean;
   eventTypeColor?: ReturnType<typeof transformEventColorsApiToInternal>;
   useEventTypeDestinationCalendarEmail?: boolean;
 } & Partial<
diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/booking-fields.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/booking-fields.ts
index 73ab5e9009516c..c83bcc4a3a926c 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/booking-fields.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/booking-fields.ts
@@ -556,7 +556,7 @@ export const systemBeforeFieldEmail: EmailSystemField = {
   type: "email",
   name: "email",
   required: true,
-  editable: "system",
+  editable: "system-but-optional",
   sources: [
     {
       label: "Default",
diff --git a/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.ts b/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.ts
index 0cced597528140..b4c8da13bc5eb7 100644
--- a/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.ts
+++ b/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.ts
@@ -40,7 +40,7 @@ import {
 @DocsTags("Schedules")
 @ApiHeader({
   name: "cal-api-version",
-  description: `Must be set to ${VERSION_2024_06_11}`,
+  description: `Must be set to ${VERSION_2024_06_11}. If not set to this value, the endpoint will default to an older version.`,
   example: VERSION_2024_06_11,
   required: true,
   schema: {
@@ -69,6 +69,8 @@ export class SchedulesController_2024_06_11 {
       After creating a non-default schedule, you can update an event type to point to that schedule via the PATCH \`event-types/{eventTypeId}\` endpoint.
 
       When specifying start time and end time for each day use the 24 hour format e.g. 08:00, 15:00 etc.
+
+      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
       `,
   })
   async createSchedule(
@@ -91,7 +93,10 @@ export class SchedulesController_2024_06_11 {
   })
   @ApiOperation({
     summary: "Get default schedule",
-    description: "Get the default schedule of the authenticated user.",
+    description: `Get the default schedule of the authenticated user.
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async getDefaultSchedule(@GetUser() user: UserWithProfile): Promise<GetScheduleOutput_2024_06_11> {
     const schedule = await this.schedulesService.getUserScheduleDefault(user.id);
@@ -104,7 +109,10 @@ export class SchedulesController_2024_06_11 {
 
   @Get("/:scheduleId")
   @Permissions([SCHEDULE_READ])
-  @ApiOperation({ summary: "Get a schedule" })
+  @ApiOperation({
+    summary: "Get a schedule",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async getSchedule(
     @GetUser() user: UserWithProfile,
     @Param("scheduleId") scheduleId: number
@@ -121,7 +129,10 @@ export class SchedulesController_2024_06_11 {
   @Permissions([SCHEDULE_READ])
   @ApiOperation({
     summary: "Get all schedules",
-    description: "Get all schedules of the authenticated user.",
+    description: `Get all schedules of the authenticated user.
+    
+     <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
+    `,
   })
   async getSchedules(@GetUser() user: UserWithProfile): Promise<GetSchedulesOutput_2024_06_11> {
     const schedules = await this.schedulesService.getUserSchedules(user.id);
@@ -134,7 +145,10 @@ export class SchedulesController_2024_06_11 {
 
   @Patch("/:scheduleId")
   @Permissions([SCHEDULE_WRITE])
-  @ApiOperation({ summary: "Update a schedule" })
+  @ApiOperation({
+    summary: "Update a schedule",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async updateSchedule(
     @GetUser() user: UserWithProfile,
     @Body() bodySchedule: UpdateScheduleInput_2024_06_11,
@@ -155,7 +169,10 @@ export class SchedulesController_2024_06_11 {
   @Delete("/:scheduleId")
   @HttpCode(HttpStatus.OK)
   @Permissions([SCHEDULE_WRITE])
-  @ApiOperation({ summary: "Delete a schedule" })
+  @ApiOperation({
+    summary: "Delete a schedule",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
+  })
   async deleteSchedule(
     @GetUser("id") userId: number,
     @Param("scheduleId") scheduleId: number
diff --git a/apps/api/v2/src/lib/modules/booking-cancel.module.ts b/apps/api/v2/src/lib/modules/booking-cancel.module.ts
new file mode 100644
index 00000000000000..4151789caee90f
--- /dev/null
+++ b/apps/api/v2/src/lib/modules/booking-cancel.module.ts
@@ -0,0 +1,10 @@
+import { BookingCancelService } from "@/lib/services/booking-cancel.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule],
+  providers: [BookingCancelService],
+  exports: [BookingCancelService],
+})
+export class BookingCancelModule {}
diff --git a/apps/api/v2/src/lib/modules/instant-booking.module.ts b/apps/api/v2/src/lib/modules/instant-booking.module.ts
new file mode 100644
index 00000000000000..e7b3e652448dff
--- /dev/null
+++ b/apps/api/v2/src/lib/modules/instant-booking.module.ts
@@ -0,0 +1,8 @@
+import { InstantBookingCreateService } from "@/lib/services/instant-booking-create.service";
+import { Module } from "@nestjs/common";
+
+@Module({
+  providers: [InstantBookingCreateService],
+  exports: [InstantBookingCreateService],
+})
+export class InstantBookingModule {}
diff --git a/apps/api/v2/src/lib/modules/recurring-booking.module.ts b/apps/api/v2/src/lib/modules/recurring-booking.module.ts
new file mode 100644
index 00000000000000..bcb5d43f821e6d
--- /dev/null
+++ b/apps/api/v2/src/lib/modules/recurring-booking.module.ts
@@ -0,0 +1,10 @@
+import { RegularBookingModule } from "@/lib/modules/regular-booking.module";
+import { RecurringBookingService } from "@/lib/services/recurring-booking.service";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [RegularBookingModule],
+  providers: [RecurringBookingService],
+  exports: [RecurringBookingService],
+})
+export class RecurringBookingModule {}
diff --git a/apps/api/v2/src/lib/modules/regular-booking.module.ts b/apps/api/v2/src/lib/modules/regular-booking.module.ts
new file mode 100644
index 00000000000000..01618100d1016a
--- /dev/null
+++ b/apps/api/v2/src/lib/modules/regular-booking.module.ts
@@ -0,0 +1,32 @@
+import { PrismaAttributeRepository } from "@/lib/repositories/prisma-attribute.repository";
+import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
+import { PrismaFeaturesRepository } from "@/lib/repositories/prisma-features.repository";
+import { PrismaHostRepository } from "@/lib/repositories/prisma-host.repository";
+import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
+import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { CacheService } from "@/lib/services/cache.service";
+import { CheckBookingAndDurationLimitsService } from "@/lib/services/check-booking-and-duration-limits.service";
+import { CheckBookingLimitsService } from "@/lib/services/check-booking-limits.service";
+import { LuckyUserService } from "@/lib/services/lucky-user.service";
+import { RegularBookingService } from "@/lib/services/regular-booking.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule],
+  providers: [
+    PrismaAttributeRepository,
+    PrismaBookingRepository,
+    PrismaFeaturesRepository,
+    PrismaHostRepository,
+    PrismaOOORepository,
+    PrismaUserRepository,
+    CacheService,
+    CheckBookingAndDurationLimitsService,
+    CheckBookingLimitsService,
+    LuckyUserService,
+    RegularBookingService,
+  ],
+  exports: [RegularBookingService],
+})
+export class RegularBookingModule {}
diff --git a/apps/api/v2/src/lib/services/booking-cancel.service.ts b/apps/api/v2/src/lib/services/booking-cancel.service.ts
new file mode 100644
index 00000000000000..1457ad2468b85e
--- /dev/null
+++ b/apps/api/v2/src/lib/services/booking-cancel.service.ts
@@ -0,0 +1,15 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { BookingCancelService as BaseBookingCancelService } from "@calcom/features/bookings/lib/handleCancelBooking";
+
+@Injectable()
+export class BookingCancelService extends BaseBookingCancelService {
+  constructor(
+    prismaWriteService: PrismaWriteService,
+  ) {
+    super({
+      prismaClient: prismaWriteService.prisma,
+    });
+  }
+}
diff --git a/apps/api/v2/src/lib/services/instant-booking-create.service.ts b/apps/api/v2/src/lib/services/instant-booking-create.service.ts
new file mode 100644
index 00000000000000..e09e7f6ab1a549
--- /dev/null
+++ b/apps/api/v2/src/lib/services/instant-booking-create.service.ts
@@ -0,0 +1,6 @@
+import { Injectable } from "@nestjs/common";
+
+import { InstantBookingCreateService as BaseInstantBookingCreateService } from "@calcom/platform-libraries/bookings";
+
+@Injectable()
+export class InstantBookingCreateService extends BaseInstantBookingCreateService {}
diff --git a/apps/api/v2/src/lib/services/recurring-booking.service.ts b/apps/api/v2/src/lib/services/recurring-booking.service.ts
new file mode 100644
index 00000000000000..d40b53db4536ec
--- /dev/null
+++ b/apps/api/v2/src/lib/services/recurring-booking.service.ts
@@ -0,0 +1,13 @@
+import { RegularBookingService } from "@/lib/services/regular-booking.service";
+import { Injectable } from "@nestjs/common";
+
+import { RecurringBookingService as BaseRecurringBookingService } from "@calcom/platform-libraries/bookings";
+
+@Injectable()
+export class RecurringBookingService extends BaseRecurringBookingService {
+  constructor(regularBookingService: RegularBookingService) {
+    super({
+      regularBookingService,
+    });
+  }
+}
diff --git a/apps/api/v2/src/lib/services/regular-booking.service.ts b/apps/api/v2/src/lib/services/regular-booking.service.ts
new file mode 100644
index 00000000000000..f18775301b12cc
--- /dev/null
+++ b/apps/api/v2/src/lib/services/regular-booking.service.ts
@@ -0,0 +1,46 @@
+import { PrismaAttributeRepository } from "@/lib/repositories/prisma-attribute.repository";
+import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
+import { PrismaFeaturesRepository } from "@/lib/repositories/prisma-features.repository";
+import { PrismaHostRepository } from "@/lib/repositories/prisma-host.repository";
+import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
+import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { CacheService } from "@/lib/services/cache.service";
+import { CheckBookingAndDurationLimitsService } from "@/lib/services/check-booking-and-duration-limits.service";
+import { CheckBookingLimitsService } from "@/lib/services/check-booking-limits.service";
+import { LuckyUserService } from "@/lib/services/lucky-user.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { RegularBookingService as BaseRegularBookingService } from "@calcom/platform-libraries/bookings";
+import type { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class RegularBookingService extends BaseRegularBookingService {
+  constructor(
+    cacheService: CacheService,
+    checkBookingAndDurationLimitsService: CheckBookingAndDurationLimitsService,
+    prismaWriteService: PrismaWriteService,
+    bookingRepository: PrismaBookingRepository,
+    featuresRepository: PrismaFeaturesRepository,
+    checkBookingLimitsService: CheckBookingLimitsService,
+    luckyUserService: LuckyUserService,
+    hostRepository: PrismaHostRepository,
+    oooRepository: PrismaOOORepository,
+    userRepository: PrismaUserRepository,
+    attributeRepository: PrismaAttributeRepository
+  ) {
+    super({
+      cacheService,
+      checkBookingAndDurationLimitsService,
+      prismaClient: prismaWriteService.prisma as unknown as PrismaClient,
+      bookingRepository,
+      featuresRepository,
+      checkBookingLimitsService,
+      luckyUserService,
+      hostRepository,
+      oooRepository,
+      userRepository,
+      attributeRepository,
+    });
+  }
+}
diff --git a/apps/api/v2/src/modules/atoms/controllers/atoms.schedules.controller.ts b/apps/api/v2/src/modules/atoms/controllers/atoms.schedules.controller.ts
index a30a94fbaa8654..227a2decd60eda 100644
--- a/apps/api/v2/src/modules/atoms/controllers/atoms.schedules.controller.ts
+++ b/apps/api/v2/src/modules/atoms/controllers/atoms.schedules.controller.ts
@@ -11,6 +11,7 @@ import {
   Param,
   ParseIntPipe,
   Patch,
+  Post,
   Query,
   UseGuards,
   Version,
@@ -21,8 +22,16 @@ import {
   ApiExcludeController as DocsExcludeController,
   ApiOperation,
 } from "@nestjs/swagger";
+import { z } from "zod";
 
 import { SCHEDULE_READ, SCHEDULE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
+import type {
+  GetAvailabilityListHandlerReturn,
+  DuplicateScheduleHandlerReturn,
+} from "@calcom/platform-libraries/schedules";
+import { getAvailabilityListHandler, duplicateScheduleHandler } from "@calcom/platform-libraries/schedules";
+import type { CreateScheduleHandlerReturn, CreateScheduleSchema } from "@calcom/platform-libraries/schedules";
+import { createScheduleHandler } from "@calcom/platform-libraries/schedules";
 import { FindDetailedScheduleByIdReturnType } from "@calcom/platform-libraries/schedules";
 import { ApiResponse, UpdateAtomScheduleDto } from "@calcom/platform-types";
 
@@ -63,6 +72,22 @@ export class AtomsSchedulesController {
       data: schedule,
     };
   }
+
+  @Get("/schedules/all")
+  @Version(VERSION_NEUTRAL)
+  @UseGuards(ApiAuthGuard)
+  @Permissions([SCHEDULE_READ])
+  async getAllUserSchedules(
+    @GetUser() user: UserWithProfile
+  ): Promise<ApiResponse<Awaited<GetAvailabilityListHandlerReturn>>> {
+    const userSchedules = await getAvailabilityListHandler({ ctx: { user } });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: userSchedules,
+    };
+  }
+
   @Patch("schedules/:scheduleId")
   @Permissions([SCHEDULE_WRITE])
   @UseGuards(ApiAuthGuard)
@@ -83,4 +108,36 @@ export class AtomsSchedulesController {
       data: updatedSchedule,
     };
   }
+
+  @Post("schedules/create")
+  @Permissions([SCHEDULE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  @ApiOperation({ summary: "Create atom schedule" })
+  async createSchedule(
+    @GetUser() user: UserWithProfile,
+    @Body() bodySchedule: z.infer<typeof CreateScheduleSchema>
+  ): Promise<ApiResponse<CreateScheduleHandlerReturn>> {
+    const createdSchedule = await createScheduleHandler({ input: bodySchedule, ctx: { user } });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: createdSchedule,
+    };
+  }
+
+  @Post("schedules/:scheduleId/duplicate")
+  @Permissions([SCHEDULE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  @ApiOperation({ summary: "Duplicate existing schedule" })
+  async duplicateExistingSchedule(
+    @GetUser() user: UserWithProfile,
+    @Param("scheduleId", ParseIntPipe) scheduleId: number
+  ): Promise<ApiResponse<Awaited<DuplicateScheduleHandlerReturn>>> {
+    const duplicatedSchedule = await duplicateScheduleHandler({ ctx: { user }, input: { scheduleId } });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: duplicatedSchedule,
+    };
+  }
 }
diff --git a/apps/api/v2/src/modules/auth/guards/workflows/is-workflow-in-team.ts b/apps/api/v2/src/modules/auth/guards/workflows/is-event-type-workflow-in-team.ts
similarity index 82%
rename from apps/api/v2/src/modules/auth/guards/workflows/is-workflow-in-team.ts
rename to apps/api/v2/src/modules/auth/guards/workflows/is-event-type-workflow-in-team.ts
index 8c26a1ea7fd56d..a446a512003008 100644
--- a/apps/api/v2/src/modules/auth/guards/workflows/is-workflow-in-team.ts
+++ b/apps/api/v2/src/modules/auth/guards/workflows/is-event-type-workflow-in-team.ts
@@ -9,7 +9,7 @@ import {
 import { Request } from "express";
 
 @Injectable()
-export class IsWorkflowInTeam implements CanActivate {
+export class IsEventTypeWorkflowInTeam implements CanActivate {
   constructor(private workflowsRepository: WorkflowsRepository) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -41,10 +41,13 @@ export class IsWorkflowInTeam implements CanActivate {
     teamId: string,
     workflowId: string
   ): Promise<{ canAccess: boolean; workflow?: WorkflowType }> {
-    const workflow = await this.workflowsRepository.getTeamWorkflowById(Number(teamId), Number(workflowId));
+    const workflow = await this.workflowsRepository.getEventTypeTeamWorkflowById(
+      Number(teamId),
+      Number(workflowId)
+    );
 
     if (!workflow) {
-      throw new NotFoundException(`IsWorkflowInTeam - workflow (${workflowId}) not found.`);
+      throw new NotFoundException(`IsWorkflowInTeam - event-type workflow (${workflowId}) not found.`);
     }
 
     if (workflow.teamId === Number(teamId)) {
diff --git a/apps/api/v2/src/modules/auth/guards/workflows/is-routing-form-workflow-in-team.ts b/apps/api/v2/src/modules/auth/guards/workflows/is-routing-form-workflow-in-team.ts
new file mode 100644
index 00000000000000..2a86cde7421d7f
--- /dev/null
+++ b/apps/api/v2/src/modules/auth/guards/workflows/is-routing-form-workflow-in-team.ts
@@ -0,0 +1,59 @@
+import { WorkflowsRepository, WorkflowType } from "@/modules/workflows/workflows.repository";
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  ForbiddenException,
+  NotFoundException,
+} from "@nestjs/common";
+import { Request } from "express";
+
+@Injectable()
+export class IsRoutingFormWorkflowInTeam implements CanActivate {
+  constructor(private workflowsRepository: WorkflowsRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { workflow?: WorkflowType }>();
+    const teamId: string = request.params.teamId;
+    const workflowId: string = request.params.workflowId;
+
+    if (!workflowId) {
+      throw new ForbiddenException("IsWorkflowInTeam - No workflow found in request params.");
+    }
+
+    if (!teamId) {
+      throw new ForbiddenException("IsWorkflowInTeam - No team id found in request params.");
+    }
+
+    const { canAccess, workflow } = await this.checkIfWorkflowIsInTeam(teamId, workflowId);
+
+    if (!canAccess) {
+      throw new ForbiddenException(
+        `IsTeamInOrg - Workflow with id=${workflowId} is not part of the team with id=${teamId}.`
+      );
+    }
+
+    request.workflow = workflow;
+    return true;
+  }
+
+  async checkIfWorkflowIsInTeam(
+    teamId: string,
+    workflowId: string
+  ): Promise<{ canAccess: boolean; workflow?: WorkflowType }> {
+    const workflow = await this.workflowsRepository.getRoutingFormTeamWorkflowById(
+      Number(teamId),
+      Number(workflowId)
+    );
+
+    if (!workflow) {
+      throw new NotFoundException(`IsWorkflowInTeam - routing form workflow (${workflowId}) not found.`);
+    }
+
+    if (workflow.teamId === Number(teamId)) {
+      return { canAccess: true, workflow };
+    }
+
+    return { canAccess: false };
+  }
+}
diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
index 43edaf2530ec97..db232ff21f1d3b 100644
--- a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
+++ b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
@@ -355,6 +355,11 @@ describe("Organizations Event Types Endpoints", () => {
           darkThemeHex: "#292929",
           lightThemeHex: "#fafafa",
         },
+        emailSettings: {
+          disableEmailsToAttendees: true,
+          disableEmailsToHosts: true,
+        },
+        rescheduleWithSameRoundRobinHost: true,
       };
 
       return request(app.getHttpServer())
@@ -385,6 +390,7 @@ describe("Organizations Event Types Endpoints", () => {
           expect(data.lockTimeZoneToggleOnBookingPage).toEqual(body.lockTimeZoneToggleOnBookingPage);
           expect(data.color).toEqual(body.color);
           expect(data.successRedirectUrl).toEqual("https://masterchief.com/argentina/flan/video/1234");
+          expect(data.emailSettings).toEqual(body.emailSettings);
           collectiveEventType = responseBody.data;
         });
     });
@@ -600,6 +606,11 @@ describe("Organizations Event Types Endpoints", () => {
       const body: UpdateTeamEventTypeInput_2024_06_14 = {
         hosts: newHosts,
         successRedirectUrl: "https://new-url-success.com",
+        emailSettings: {
+          disableEmailsToAttendees: false,
+          disableEmailsToHosts: false,
+        },
+        rescheduleWithSameRoundRobinHost: false,
       };
 
       return request(app.getHttpServer())
@@ -614,6 +625,8 @@ describe("Organizations Event Types Endpoints", () => {
           expect(eventType.successRedirectUrl).toEqual("https://new-url-success.com");
           expect(eventType.title).toEqual(collectiveEventType.title);
           expect(eventType.hosts.length).toEqual(1);
+          expect(eventType.emailSettings).toEqual(body.emailSettings);
+          expect(eventType.rescheduleWithSameRoundRobinHost).toEqual(body.rescheduleWithSameRoundRobinHost);
           evaluateHost(eventType.hosts[0], newHosts[0]);
         });
     });
diff --git a/apps/api/v2/src/modules/organizations/event-types/services/input.service.ts b/apps/api/v2/src/modules/organizations/event-types/services/input.service.ts
index c5267015f4fbc4..0d6699a6fd6f58 100644
--- a/apps/api/v2/src/modules/organizations/event-types/services/input.service.ts
+++ b/apps/api/v2/src/modules/organizations/event-types/services/input.service.ts
@@ -8,10 +8,12 @@ import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
 
 import { SchedulingType } from "@calcom/platform-libraries";
+import { EventTypeMetadata } from "@calcom/platform-libraries/event-types";
 import {
   CreateTeamEventTypeInput_2024_06_14,
   UpdateTeamEventTypeInput_2024_06_14,
   HostPriority,
+  EmailSettings_2024_06_14,
 } from "@calcom/platform-types";
 
 export type TransformedCreateTeamEventTypeInput = Awaited<
@@ -49,14 +51,16 @@ export class InputOrganizationsEventTypesService {
       eventName: transformedBody.eventName,
     });
 
-    transformedBody.destinationCalendar &&
-      (await this.inputEventTypesService.validateInputDestinationCalendar(
+    if (transformedBody.destinationCalendar) {
+      await this.inputEventTypesService.validateInputDestinationCalendar(
         userId,
         transformedBody.destinationCalendar
-      ));
+      );
+    }
 
-    transformedBody.useEventTypeDestinationCalendarEmail &&
-      (await this.inputEventTypesService.validateInputUseDestinationCalendarEmail(userId));
+    if (transformedBody.useEventTypeDestinationCalendarEmail) {
+      await this.inputEventTypesService.validateInputUseDestinationCalendarEmail(userId);
+    }
 
     return transformedBody;
   }
@@ -83,14 +87,16 @@ export class InputOrganizationsEventTypesService {
       eventName: transformedBody.eventName,
     });
 
-    transformedBody.destinationCalendar &&
-      (await this.inputEventTypesService.validateInputDestinationCalendar(
+    if (transformedBody.destinationCalendar) {
+      await this.inputEventTypesService.validateInputDestinationCalendar(
         userId,
         transformedBody.destinationCalendar
-      ));
+      );
+    }
 
-    transformedBody.useEventTypeDestinationCalendarEmail &&
-      (await this.inputEventTypesService.validateInputUseDestinationCalendarEmail(userId));
+    if (transformedBody.useEventTypeDestinationCalendarEmail) {
+      await this.inputEventTypesService.validateInputUseDestinationCalendarEmail(userId);
+    }
 
     return transformedBody;
   }
@@ -110,7 +116,7 @@ export class InputOrganizationsEventTypesService {
     teamId: number,
     inputEventType: CreateTeamEventTypeInput_2024_06_14
   ) {
-    const { hosts, assignAllTeamMembers, locations, ...rest } = inputEventType;
+    const { hosts, assignAllTeamMembers, locations, emailSettings, ...rest } = inputEventType;
 
     const eventType = this.inputEventTypesService.transformInputCreateEventType(rest);
 
@@ -123,11 +129,15 @@ export class InputOrganizationsEventTypesService {
 
     const children = await this.getChildEventTypesForManagedEventTypeCreate(inputEventType, teamId);
 
-    const metadata =
+    let metadata =
       rest.schedulingType === "MANAGED"
         ? { managedEventConfig: {}, ...eventType.metadata }
         : eventType.metadata;
 
+    if (emailSettings) {
+      metadata = this.addEmailSettingsToMetadata(emailSettings, metadata);
+    }
+
     const teamEventType = {
       ...eventType,
       // note(Lauris): we don't populate hosts for managed event-types because they are handled by the children
@@ -145,12 +155,42 @@ export class InputOrganizationsEventTypesService {
     return teamEventType;
   }
 
+  private addEmailSettingsToMetadata(
+    emailSettings: EmailSettings_2024_06_14,
+    metadata: NonNullable<EventTypeMetadata>
+  ) {
+    if (
+      emailSettings?.disableEmailsToAttendees === undefined &&
+      emailSettings?.disableEmailsToHosts === undefined
+    ) {
+      return metadata;
+    }
+
+    const clonedMetadata = structuredClone(metadata);
+
+    if (!clonedMetadata.disableStandardEmails) {
+      clonedMetadata.disableStandardEmails = {};
+    }
+    if (!clonedMetadata.disableStandardEmails.all) {
+      clonedMetadata.disableStandardEmails.all = {};
+    }
+
+    if (emailSettings?.disableEmailsToAttendees !== undefined) {
+      clonedMetadata.disableStandardEmails.all.attendee = emailSettings.disableEmailsToAttendees;
+    }
+    if (emailSettings?.disableEmailsToHosts !== undefined) {
+      clonedMetadata.disableStandardEmails.all.host = emailSettings.disableEmailsToHosts;
+    }
+
+    return clonedMetadata;
+  }
+
   async transformInputUpdateTeamEventType(
     eventTypeId: number,
     teamId: number,
     inputEventType: UpdateTeamEventTypeInput_2024_06_14
   ) {
-    const { hosts, assignAllTeamMembers, locations, ...rest } = inputEventType;
+    const { hosts, assignAllTeamMembers, locations, emailSettings, ...rest } = inputEventType;
 
     const eventType = await this.inputEventTypesService.transformInputUpdateEventType(rest, eventTypeId);
     const dbEventType = await this.teamsEventTypesRepository.getTeamEventType(teamId, eventTypeId);
@@ -164,6 +204,12 @@ export class InputOrganizationsEventTypesService {
         ? await this.getChildEventTypesForManagedEventTypeUpdate(eventTypeId, inputEventType, teamId)
         : undefined;
 
+    let metadata = eventType.metadata;
+
+    if (emailSettings) {
+      metadata = this.addEmailSettingsToMetadata(emailSettings, metadata);
+    }
+
     const teamEventType = {
       ...eventType,
       // note(Lauris): we don't populate hosts for managed event-types because they are handled by the children
@@ -175,6 +221,7 @@ export class InputOrganizationsEventTypesService {
       assignAllTeamMembers,
       children,
       locations: locations ? this.transformInputTeamLocations(locations) : undefined,
+      metadata,
     };
 
     return teamEventType;
diff --git a/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts b/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts
index 67cf769e1eb2ef..06776e5e301ef1 100644
--- a/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts
+++ b/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts
@@ -4,6 +4,7 @@ import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
 import { SchedulingType } from "@calcom/platform-libraries";
+import { EventTypeMetadata } from "@calcom/platform-libraries/event-types";
 import type { HostPriority, TeamEventTypeResponseHost } from "@calcom/platform-types";
 import type {
   Team,
@@ -84,6 +85,9 @@ type Input = Pick<
   | "calVideoSettings"
   | "hidden"
   | "bookingRequiresAuthentication"
+  | "rescheduleWithSameRoundRobinHost"
+  | "maxActiveBookingPerBookerOfferReschedule"
+  | "maxActiveBookingsPerBooker"
 >;
 
 @Injectable()
@@ -95,7 +99,12 @@ export class OutputOrganizationsEventTypesService {
   ) {}
 
   async getResponseTeamEventType(databaseEventType: Input, isOrgTeamEvent: boolean) {
-    const { teamId, userId, parentId, assignAllTeamMembers } = databaseEventType;
+    const metadata = this.outputEventTypesService.transformMetadata(databaseEventType.metadata);
+
+    const emailSettings = this.transformEmailSettings(metadata);
+
+    const { teamId, userId, parentId, assignAllTeamMembers, rescheduleWithSameRoundRobinHost } =
+      databaseEventType;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { ownerId, users, ...rest } = this.outputEventTypesService.getResponseEventType(
       0,
@@ -117,6 +126,7 @@ export class OutputOrganizationsEventTypesService {
         ? this.getResponseSchedulingType(databaseEventType.schedulingType)
         : databaseEventType.schedulingType,
       assignAllTeamMembers: teamId ? assignAllTeamMembers : undefined,
+      emailSettings,
       team: {
         id: teamId,
         name: databaseEventType?.team?.name,
@@ -128,6 +138,7 @@ export class OutputOrganizationsEventTypesService {
         darkBrandColor: databaseEventType?.team?.darkBrandColor,
         theme: databaseEventType?.team?.theme,
       },
+      rescheduleWithSameRoundRobinHost,
     };
   }
 
@@ -194,6 +205,23 @@ export class OutputOrganizationsEventTypesService {
 
     return transformedHosts;
   }
+
+  private transformEmailSettings(metadata: EventTypeMetadata) {
+    if (!metadata?.disableStandardEmails?.all) {
+      return undefined;
+    }
+
+    const { attendee, host } = metadata.disableStandardEmails.all;
+
+    if (attendee !== undefined || host !== undefined) {
+      return {
+        disableEmailsToAttendees: attendee ?? false,
+        disableEmailsToHosts: host ?? false,
+      };
+    }
+
+    return undefined;
+  }
 }
 
 function getPriorityLabel(priority: number): keyof typeof HostPriority {
diff --git a/apps/api/v2/src/modules/organizations/organizations.module.ts b/apps/api/v2/src/modules/organizations/organizations.module.ts
index 86aa6eb5474a0d..4c725b7f417b9d 100644
--- a/apps/api/v2/src/modules/organizations/organizations.module.ts
+++ b/apps/api/v2/src/modules/organizations/organizations.module.ts
@@ -46,8 +46,8 @@ import { OrganizationsStripeService } from "@/modules/organizations/stripe/servi
 import { OrganizationsTeamsController } from "@/modules/organizations/teams/index/organizations-teams.controller";
 import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
 import { OrganizationsTeamsService } from "@/modules/organizations/teams/index/services/organizations-teams.service";
-import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.controller";
 import { OrganizationsTeamsInviteController } from "@/modules/organizations/teams/invite/organizations-teams-invite.controller";
+import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.controller";
 import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.repository";
 import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/teams/memberships/services/organizations-teams-memberships.service";
 import { OrganizationsTeamsRoutingFormsModule } from "@/modules/organizations/teams/routing-forms/organizations-teams-routing-forms.module";
@@ -76,7 +76,8 @@ import { UsersModule } from "@/modules/users/users.module";
 import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
 import { WebhooksService } from "@/modules/webhooks/services/webhooks.service";
 import { WebhooksRepository } from "@/modules/webhooks/webhooks.repository";
-import { TeamWorkflowsService } from "@/modules/workflows/services/team-workflows.service";
+import { TeamEventTypeWorkflowsService } from "@/modules/workflows/services/team-event-type-workflows.service";
+import { TeamRoutingFormWorkflowsService } from "@/modules/workflows/services/team-routing-form-workflows.service";
 import { WorkflowsInputService } from "@/modules/workflows/services/workflows.input.service";
 import { WorkflowsOutputService } from "@/modules/workflows/services/workflows.output.service";
 import { WorkflowsRepository } from "@/modules/workflows/workflows.repository";
@@ -145,7 +146,8 @@ import { Module } from "@nestjs/common";
     TokensRepository,
     TeamsVerifiedResourcesRepository,
     WorkflowsRepository,
-    TeamWorkflowsService,
+    TeamEventTypeWorkflowsService,
+    TeamRoutingFormWorkflowsService,
     WorkflowsInputService,
     WorkflowsOutputService,
     TeamsSchedulesService,
diff --git a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts
index 12d8fcab504e98..89744b284f9512 100644
--- a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts
+++ b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts
@@ -4,22 +4,44 @@ import { AppModule } from "@/app.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
-import { CreateWorkflowDto } from "@/modules/workflows/inputs/create-workflow.input";
+import {
+  CreateEventTypeWorkflowDto,
+  WorkflowActivationDto,
+} from "@/modules/workflows/inputs/create-event-type-workflow.input";
+import {
+  CreateFormWorkflowDto,
+  WorkflowFormActivationDto,
+} from "@/modules/workflows/inputs/create-form-workflow";
 import {
   ATTENDEE,
   REMINDER,
   PHONE_NUMBER,
   EMAIL,
   WorkflowEmailAttendeeStepDto,
+  WorkflowEmailAddressStepDto,
+  UpdateEmailAddressWorkflowStepDto,
+  UpdatePhoneWhatsAppNumberWorkflowStepDto,
 } from "@/modules/workflows/inputs/workflow-step.input";
 import {
+  AFTER_EVENT,
   BEFORE_EVENT,
   DAY,
+  FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   OnAfterEventTriggerDto,
   OnBeforeEventTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
+  OnFormSubmittedTriggerDto,
 } from "@/modules/workflows/inputs/workflow-trigger.input";
+import {
+  GetEventTypeWorkflowOutput,
+  GetEventTypeWorkflowsOutput,
+} from "@/modules/workflows/outputs/event-type-workflow.output";
 // Adjust path if needed
-import { GetWorkflowOutput, GetWorkflowsOutput } from "@/modules/workflows/outputs/workflow.output";
+import {
+  GetRoutingFormWorkflowOutput,
+  GetRoutingFormWorkflowsOutput,
+} from "@/modules/workflows/outputs/routing-form-workflow.output";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
@@ -51,14 +73,21 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
   let org: Team;
   let orgTeam: Team;
   let createdWorkflowId: number;
+  let createdFormWorkflowId: number;
   const authEmail = `org-teams-workflows-user-${randomString()}@example.com`;
   let user: User;
   let apiKeyString: string;
   let verifiedPhoneId: number;
+  let verifiedPhoneId2: number;
   let verifiedEmailId: number;
-  let createdWorkflow: GetWorkflowOutput["data"];
+  let verifiedEmailId2: number;
+  let createdWorkflow: GetEventTypeWorkflowOutput["data"];
+  let createdFormWorkflow: GetRoutingFormWorkflowOutput["data"];
 
-  let sampleCreateWorkflowDto: CreateWorkflowDto = {
+  const emailToVerify = `org-teams-workflows-team-${randomString()}@example.com`;
+  const phoneToVerify = `+37255556666`;
+
+  let sampleCreateEventTypeWorkflowDto = {
     name: `E2E Test Workflow ${randomString()}`,
     activation: {
       isActiveOnAllEventTypes: true,
@@ -72,6 +101,18 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
       },
     },
     steps: [],
+  } as unknown as CreateEventTypeWorkflowDto;
+
+  let sampleCreateWorkflowRoutingFormDto: CreateFormWorkflowDto = {
+    name: `E2E Test Workflow ${randomString()}`,
+    activation: {
+      activeOnRoutingFormIds: [],
+      isActiveOnAllRoutingForms: true,
+    },
+    trigger: {
+      type: FORM_SUBMITTED,
+    },
+    steps: [],
   };
 
   beforeAll(async () => {
@@ -149,15 +190,29 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
       phoneNumber: "+37255555555",
       team: { connect: { id: orgTeam.id } },
     });
+    const verifiedPhone2 = await verifiedResourcesRepositoryFixtures.createPhone({
+      user: { connect: { id: user.id } },
+      phoneNumber: phoneToVerify,
+      team: { connect: { id: orgTeam.id } },
+    });
     const verifiedEmail = await verifiedResourcesRepositoryFixtures.createEmail({
       user: { connect: { id: user.id } },
       email: authEmail,
       team: { connect: { id: orgTeam.id } },
     });
+
+    const verifiedEmail2 = await verifiedResourcesRepositoryFixtures.createEmail({
+      user: { connect: { id: user.id } },
+      email: emailToVerify,
+      team: { connect: { id: orgTeam.id } },
+    });
     verifiedEmailId = verifiedEmail.id;
+    verifiedEmailId2 = verifiedEmail2.id;
+
     verifiedPhoneId = verifiedPhone.id;
+    verifiedPhoneId2 = verifiedPhone2.id;
 
-    sampleCreateWorkflowDto = {
+    sampleCreateEventTypeWorkflowDto = {
       name: `E2E Test Workflow ${randomString()}`,
       activation: {
         isActiveOnAllEventTypes: true,
@@ -208,6 +263,43 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
             html: "<p>Reminder for your event {EVENT_NAME}.</p>",
           },
         },
+        {
+          stepNumber: 4,
+          action: "sms_attendee",
+          recipient: PHONE_NUMBER,
+          template: REMINDER,
+          phoneRequired: true,
+          sender: "CalcomE2EStep4",
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            text: "Reminder for your event {EVENT_NAME}.",
+          },
+        },
+      ],
+    };
+
+    sampleCreateWorkflowRoutingFormDto = {
+      name: `E2E Test Form Workflow ${randomString()}`,
+      activation: {
+        isActiveOnAllRoutingForms: true,
+        activeOnRoutingFormIds: [],
+      },
+      trigger: {
+        type: FORM_SUBMITTED,
+      },
+      steps: [
+        {
+          stepNumber: 1,
+          action: "email_attendee",
+          recipient: ATTENDEE,
+          template: REMINDER,
+          sender: "CalcomE2EStep1",
+          includeCalendarEvent: true,
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            html: "<p>Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
       ],
     };
     basePath = `/v2/organizations/${org.id}/teams/${orgTeam.id}/workflows`;
@@ -220,7 +312,9 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
     if (createdWorkflowId) {
       try {
         await workflowsRepositoryFixture.delete(createdWorkflowId);
-      } catch (error) {}
+      } catch {
+        /* empty */
+      }
     }
 
     await userRepositoryFixture.deleteByEmail(user.email);
@@ -235,18 +329,227 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
       return request(app.getHttpServer())
         .post(basePath)
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
-        .send(sampleCreateWorkflowDto)
+        .send(sampleCreateEventTypeWorkflowDto)
+        .expect(201)
+        .then((response) => {
+          const responseBody: GetEventTypeWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.activation).toBeDefined();
+
+          expect(responseBody.data.name).toEqual(sampleCreateEventTypeWorkflowDto.name);
+          if (responseBody.data.activation instanceof WorkflowActivationDto) {
+            expect(responseBody.data.activation.isActiveOnAllEventTypes).toEqual(
+              sampleCreateEventTypeWorkflowDto.activation.isActiveOnAllEventTypes
+            );
+          }
+          if (
+            responseBody.data.activation instanceof WorkflowFormActivationDto &&
+            sampleCreateEventTypeWorkflowDto.activation instanceof WorkflowFormActivationDto
+          ) {
+            expect(responseBody.data.activation.isActiveOnAllRoutingForms).toEqual(
+              sampleCreateEventTypeWorkflowDto.activation.isActiveOnAllRoutingForms
+            );
+          }
+
+          expect(responseBody.data.trigger.type).toEqual(sampleCreateEventTypeWorkflowDto.trigger.type);
+          expect(responseBody.data.steps).toHaveLength(sampleCreateEventTypeWorkflowDto.steps.length);
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 3)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 4)?.id).toBeDefined();
+
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
+            "CalcomE2EStep1"
+          );
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.includeCalendarEvent).toEqual(
+            true
+          );
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.sender).toEqual(
+            "CalcomE2EStep2"
+          );
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.phone).toEqual(
+            "+37255555555"
+          );
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 4)?.phoneRequired).toEqual(true);
+
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 3)?.email).toEqual(authEmail);
+          const trigger = sampleCreateEventTypeWorkflowDto.trigger as OnBeforeEventTriggerDto;
+          expect(responseBody.data.trigger?.offset?.value).toEqual(trigger.offset.value);
+          expect(responseBody.data.trigger?.offset?.unit).toEqual(trigger.offset.unit);
+
+          createdWorkflowId = responseBody.data.id;
+          createdWorkflow = responseBody.data;
+          expect(responseBody.data.type).toEqual("event-type");
+        });
+    });
+
+    it("should not create a new routing form workflow with trigger not FORM_SUBMITTED", async () => {
+      const invalidWorkflow = structuredClone(
+        sampleCreateWorkflowRoutingFormDto
+      ) as unknown as CreateEventTypeWorkflowDto;
+      invalidWorkflow.trigger.type = AFTER_EVENT;
+      return request(app.getHttpServer())
+        .post(`${basePath}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(invalidWorkflow)
+        .expect(400);
+    });
+
+    it("should not create a new routing form workflow with not allowed actions", async () => {
+      // force impossible step to test validation, should fail with 400
+      const invalidWorkflow = structuredClone(
+        sampleCreateWorkflowRoutingFormDto
+      ) as unknown as CreateEventTypeWorkflowDto;
+      invalidWorkflow.steps = [
+        {
+          stepNumber: 1,
+          action: "sms_number",
+          recipient: PHONE_NUMBER,
+          template: REMINDER,
+          verifiedPhoneId: verifiedPhoneId,
+          sender: "CalcomE2EStep2",
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            text: "Reminder for your event {EVENT_NAME}.",
+          },
+        } as unknown as WorkflowEmailAddressStepDto,
+      ];
+      return request(app.getHttpServer())
+        .post(`${basePath}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(invalidWorkflow)
+        .expect(400);
+    });
+
+    it("should create a new routing form workflow with  allowed actions", async () => {
+      const validWorkflow = structuredClone(
+        sampleCreateWorkflowRoutingFormDto
+      ) as unknown as CreateEventTypeWorkflowDto;
+      validWorkflow.steps = [
+        {
+          stepNumber: 1,
+          action: "email_attendee",
+          recipient: ATTENDEE,
+          template: REMINDER,
+          sender: "CalcomE2EStep1",
+          includeCalendarEvent: true,
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            html: "<p>Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
+      ];
+      return request(app.getHttpServer())
+        .post(`${basePath}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(validWorkflow)
+        .expect(201)
+        .then((response) => {
+          const responseBody: GetRoutingFormWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.name).toEqual(sampleCreateWorkflowRoutingFormDto.name);
+          expect(responseBody.data.type).toEqual("routing-form");
+
+          if (responseBody.data.activation instanceof WorkflowFormActivationDto) {
+            expect(responseBody.data.activation.isActiveOnAllRoutingForms).toEqual(
+              sampleCreateWorkflowRoutingFormDto.activation.isActiveOnAllRoutingForms
+            );
+          }
+
+          expect(responseBody.data.trigger.type).toEqual(sampleCreateWorkflowRoutingFormDto.trigger.type);
+          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowRoutingFormDto.steps.length);
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
+            "CalcomE2EStep1"
+          );
+
+          const trigger = sampleCreateWorkflowRoutingFormDto.trigger as OnFormSubmittedTriggerDto;
+          expect(responseBody.data.trigger?.type).toEqual(trigger.type);
+
+          createdFormWorkflowId = responseBody.data.id;
+          createdFormWorkflow = responseBody.data;
+        });
+    });
+
+    it("should create a new routing form workflow with  allowed actions and offset trigger", async () => {
+      const validWorkflow = structuredClone(
+        sampleCreateWorkflowRoutingFormDto
+      ) as unknown as CreateFormWorkflowDto;
+      validWorkflow.steps = [
+        {
+          stepNumber: 1,
+          action: "email_attendee",
+          recipient: ATTENDEE,
+          template: REMINDER,
+          sender: "CalcomE2EStep1",
+          includeCalendarEvent: true,
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            html: "<p>Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
+      ];
+
+      validWorkflow.trigger = {
+        type: FORM_SUBMITTED_NO_EVENT,
+        offset: {
+          value: 1,
+          unit: DAY,
+        },
+      };
+      return request(app.getHttpServer())
+        .post(`${basePath}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(validWorkflow)
         .expect(201)
         .then((response) => {
-          const responseBody: GetWorkflowOutput = response.body;
+          const responseBody: GetRoutingFormWorkflowOutput = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
-          expect(responseBody.data.name).toEqual(sampleCreateWorkflowDto.name);
-          expect(responseBody.data.activation.isActiveOnAllEventTypes).toEqual(
-            sampleCreateWorkflowDto.activation.isActiveOnAllEventTypes
+          expect(responseBody.data.name).toEqual(sampleCreateWorkflowRoutingFormDto.name);
+          expect(responseBody.data.type).toEqual("routing-form");
+
+          if (responseBody.data.activation instanceof WorkflowFormActivationDto) {
+            expect(responseBody.data.activation.isActiveOnAllRoutingForms).toEqual(
+              sampleCreateWorkflowRoutingFormDto.activation.isActiveOnAllRoutingForms
+            );
+          }
+
+          expect(responseBody.data.trigger.type).toEqual(validWorkflow.trigger.type);
+          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowRoutingFormDto.steps.length);
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
+            "CalcomE2EStep1"
           );
-          expect(responseBody.data.trigger.type).toEqual(sampleCreateWorkflowDto.trigger.type);
-          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowDto.steps.length);
+
+          const trigger = validWorkflow.trigger as OnFormSubmittedNoEventTriggerDto;
+          expect(responseBody.data.trigger?.type).toEqual(trigger.type);
+          expect(responseBody.data.trigger?.offset?.unit).toEqual(trigger.offset.unit);
+          expect(responseBody.data.trigger?.offset?.value).toEqual(trigger.offset.value);
+        });
+    });
+
+    it("should create a new workflow", async () => {
+      return request(app.getHttpServer())
+        .post(basePath)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({ ...sampleCreateEventTypeWorkflowDto, type: undefined })
+        .expect(201)
+        .then((response) => {
+          const responseBody: GetEventTypeWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.name).toEqual(sampleCreateEventTypeWorkflowDto.name);
+          if (responseBody.data.activation instanceof WorkflowActivationDto) {
+            expect(responseBody.data.activation.isActiveOnAllEventTypes).toEqual(
+              sampleCreateEventTypeWorkflowDto.activation.isActiveOnAllEventTypes
+            );
+          }
+
+          expect(responseBody.data.trigger.type).toEqual(sampleCreateEventTypeWorkflowDto.trigger.type);
+          expect(responseBody.data.steps).toHaveLength(sampleCreateEventTypeWorkflowDto.steps.length);
           expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
           expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.id).toBeDefined();
           expect(responseBody.data.steps.find((step) => step.stepNumber === 3)?.id).toBeDefined();
@@ -260,7 +563,7 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
             "+37255555555"
           );
           expect(responseBody.data.steps.find((step) => step.stepNumber === 3)?.email).toEqual(authEmail);
-          const trigger = sampleCreateWorkflowDto.trigger as OnBeforeEventTriggerDto;
+          const trigger = sampleCreateEventTypeWorkflowDto.trigger as OnBeforeEventTriggerDto;
           expect(responseBody.data.trigger?.offset?.value).toEqual(trigger.offset.value);
           expect(responseBody.data.trigger?.offset?.unit).toEqual(trigger.offset.unit);
 
@@ -269,12 +572,23 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         });
     });
 
+    it("should not create a new workflow", async () => {
+      return request(app.getHttpServer())
+        .post(basePath)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          ...sampleCreateEventTypeWorkflowDto,
+          trigger: { ...sampleCreateEventTypeWorkflowDto, type: "formSubmitted" },
+        })
+        .expect(400);
+    });
+
     it("should return 401 if not authenticated", async () => {
-      return request(app.getHttpServer()).post(basePath).send(sampleCreateWorkflowDto).expect(401);
+      return request(app.getHttpServer()).post(basePath).send(sampleCreateEventTypeWorkflowDto).expect(401);
     });
 
     it("should return 400 for invalid data (e.g. missing name)", async () => {
-      const invalidDto = { ...sampleCreateWorkflowDto, name: undefined };
+      const invalidDto = { ...sampleCreateEventTypeWorkflowDto, name: undefined };
       return request(app.getHttpServer())
         .post(basePath)
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
@@ -284,17 +598,33 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
   });
 
   describe(`GET ${basePath}`, () => {
-    it("should get a list of workflows for the team", async () => {
+    it("should get a list of event-type workflows for the team", async () => {
       return request(app.getHttpServer())
         .get(`${basePath}?skip=0&take=10`)
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
         .expect(200)
         .then((response) => {
-          const responseBody: GetWorkflowsOutput = response.body;
+          const responseBody: GetEventTypeWorkflowsOutput = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeInstanceOf(Array);
           expect(responseBody.data.length).toBeGreaterThanOrEqual(1);
           expect(responseBody.data.some((wf) => wf.id === createdWorkflowId)).toBe(true);
+          expect(responseBody.data.every((wf) => wf.type === "event-type")).toBe(true);
+        });
+    });
+
+    it("should get a list of routing-form workflows for the team", async () => {
+      return request(app.getHttpServer())
+        .get(`${basePath}/routing-form?skip=0&take=10`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetRoutingFormWorkflowsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeInstanceOf(Array);
+          expect(responseBody.data.length).toBeGreaterThanOrEqual(1);
+          expect(responseBody.data.some((wf) => wf.id === createdFormWorkflowId)).toBe(true);
+          expect(responseBody.data.every((wf) => wf.type === "routing-form")).toBe(true);
         });
     });
 
@@ -311,10 +641,26 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
         .expect(200)
         .then((response) => {
-          const responseBody: GetWorkflowOutput = response.body;
+          const responseBody: GetEventTypeWorkflowOutput = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(responseBody.data.id).toEqual(createdWorkflowId);
+          expect(responseBody.data.type).toEqual("event-type");
+        });
+    });
+
+    it("should get a specific routing-form workflow by ID", async () => {
+      expect(createdWorkflowId).toBeDefined();
+      return request(app.getHttpServer())
+        .get(`${basePath}/${createdFormWorkflowId}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetEventTypeWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.id).toEqual(createdFormWorkflowId);
+          expect(responseBody.data.type).toEqual("routing-form");
         });
     });
 
@@ -334,10 +680,12 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
   describe(`PATCH ${basePath}/:workflowId`, () => {
     const updatedName = `Updated Workflow Name ${randomString()}`;
 
-    it("should update an existing workflow, update the first step and discard other steps", async () => {
-      const step1 = createdWorkflow.steps.find((step) => step.stepNumber === 1);
-      expect(step1).toBeDefined();
-      const partialUpdateDto: Partial<CreateWorkflowDto> = {
+    it("should update an existing workflow, update the first and second step and discard other steps", async () => {
+      const step2 = createdWorkflow.steps.find((step) => step.stepNumber === 2);
+      expect(step2).toBeDefined();
+      const step3 = createdWorkflow.steps.find((step) => step.stepNumber === 3);
+      expect(step3).toBeDefined();
+      const partialUpdateDto: Partial<CreateEventTypeWorkflowDto> = {
         name: updatedName,
         trigger: {
           type: "afterEvent",
@@ -346,7 +694,38 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
             value: 10,
           },
         },
-        steps: step1 ? [{ ...step1, sender: "updatedSender" } as WorkflowEmailAttendeeStepDto] : [],
+        steps:
+          step3 && step2
+            ? [
+                {
+                  stepNumber: 1,
+                  id: step3.id,
+                  action: "email_address",
+                  recipient: EMAIL,
+                  template: REMINDER,
+                  verifiedEmailId: verifiedEmailId2,
+                  sender: "updatedSender",
+                  includeCalendarEvent: false,
+                  message: {
+                    subject: "Update Upcoming: {EVENT_NAME}",
+                    html: "<p>Update Reminder for your event {EVENT_NAME}.</p>",
+                  },
+                } as UpdateEmailAddressWorkflowStepDto,
+                {
+                  stepNumber: 2,
+                  id: step2.id,
+                  action: "whatsapp_number",
+                  recipient: PHONE_NUMBER,
+                  template: REMINDER,
+                  verifiedPhoneId: verifiedPhoneId2,
+                  sender: "updatedSender",
+                  message: {
+                    subject: "Update Upcoming: {EVENT_NAME}",
+                    text: "Update Reminder for your event {EVENT_NAME}.",
+                  },
+                } as UpdatePhoneWhatsAppNumberWorkflowStepDto,
+              ]
+            : [],
       };
       expect(createdWorkflowId).toBeDefined();
       expect(createdWorkflow).toBeDefined();
@@ -356,14 +735,32 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         .send(partialUpdateDto)
         .expect(200)
         .then((response) => {
-          const responseBody: GetWorkflowOutput = response.body;
+          const responseBody: GetEventTypeWorkflowOutput = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           expect(responseBody.data).toBeDefined();
           expect(responseBody.data.id).toEqual(createdWorkflowId);
           expect(responseBody.data.name).toEqual(updatedName);
-          step1 && expect(responseBody.data.steps[0].id).toEqual(step1.id);
-          expect(responseBody.data.steps[0].sender).toEqual("updatedSender");
-          expect(responseBody.data.steps[1]?.id).toBeUndefined();
+          if (step3) {
+            const newStep3 = responseBody.data.steps.find((step) => step.id === step3.id);
+            expect(newStep3).toBeDefined();
+            if (newStep3) {
+              expect(newStep3.sender).toEqual("updatedSender");
+              expect(newStep3.email).toEqual(emailToVerify);
+              expect(newStep3.includeCalendarEvent).toEqual(false);
+            }
+          }
+          if (step2) {
+            const newStep2 = responseBody.data.steps.find((step) => step.id === step2.id);
+            expect(newStep2).toBeDefined();
+            if (newStep2) {
+              expect(responseBody.data.steps[1].sender).toEqual("updatedSender");
+              expect(responseBody.data.steps[1].phone).toEqual(phoneToVerify);
+            }
+          }
+
+          // we updated 2 steps, third one should have been discarded
+          expect(responseBody.data.steps[2]?.id).toBeUndefined();
+
           const trigger = partialUpdateDto.trigger as OnAfterEventTriggerDto;
           expect(responseBody.data.trigger?.type).toEqual(trigger.type);
           expect(responseBody.data.trigger?.offset?.value).toEqual(trigger.offset.value);
@@ -371,8 +768,107 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         });
     });
 
+    it("should not update an existing event-type workflow, trying to use form workflow trigger", async () => {
+      const step2 = createdWorkflow.steps.find((step) => step.stepNumber === 2);
+      expect(step2).toBeDefined();
+      const step3 = createdWorkflow.steps.find((step) => step.stepNumber === 3);
+      expect(step3).toBeDefined();
+      const partialUpdateDto = {
+        name: updatedName,
+        trigger: {
+          type: "formSubmitted",
+          offset: {
+            unit: "minute",
+            value: 10,
+          },
+        },
+      };
+
+      expect(createdWorkflowId).toBeDefined();
+      expect(createdWorkflow).toBeDefined();
+      return request(app.getHttpServer())
+        .patch(`${basePath}/${createdWorkflowId}`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(partialUpdateDto)
+        .expect(400);
+    });
+
+    it("should not update an existing event-type workflow, trying to use routing-form workflow endpoint", async () => {
+      const partialUpdateDto = {
+        name: updatedName,
+      };
+
+      expect(createdWorkflowId).toBeDefined();
+      expect(createdWorkflow).toBeDefined();
+      return request(app.getHttpServer())
+        .patch(`${basePath}/${createdWorkflowId}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(partialUpdateDto)
+        .expect(404);
+    });
+
+    it("should update an existing routing form workflow, update the first step and discard any other steps", async () => {
+      const step1 = createdFormWorkflow.steps.find((step) => step.stepNumber === 1);
+      expect(step1).toBeDefined();
+
+      const partialUpdateDto: Partial<CreateFormWorkflowDto> = {
+        name: updatedName,
+        trigger: {
+          type: "formSubmitted",
+        },
+        steps: step1
+          ? [
+              {
+                stepNumber: 1,
+                id: step1.id,
+                action: "email_address",
+                recipient: EMAIL,
+                template: REMINDER,
+                verifiedEmailId: verifiedEmailId2,
+                sender: "updatedSender",
+                includeCalendarEvent: true,
+                message: {
+                  subject: "Update Upcoming: {EVENT_NAME}",
+                  html: "<p>Update Reminder for your event {EVENT_NAME}.</p>",
+                },
+              } as UpdateEmailAddressWorkflowStepDto,
+            ]
+          : [],
+      };
+      expect(createdFormWorkflowId).toBeDefined();
+      expect(createdFormWorkflow).toBeDefined();
+      return request(app.getHttpServer())
+        .patch(`${basePath}/${createdFormWorkflowId}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(partialUpdateDto)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetRoutingFormWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.id).toEqual(createdFormWorkflowId);
+          expect(responseBody.data.name).toEqual(updatedName);
+          expect(responseBody.data.activation).toBeDefined();
+          if (step1) {
+            const newStep1 = responseBody.data.steps.find((step) => step.id === step1.id);
+            expect(newStep1).toBeDefined();
+            if (newStep1) {
+              expect(newStep1.sender).toEqual("updatedSender");
+              expect(newStep1.email).toEqual(emailToVerify);
+              expect(newStep1.includeCalendarEvent).toEqual(true);
+            }
+          }
+
+          // we updated 1 steps, no more steps should be defined
+          expect(responseBody.data.steps[1]?.id).toBeUndefined();
+          const trigger = partialUpdateDto.trigger as OnFormSubmittedTriggerDto;
+          expect(responseBody.data.trigger?.type).toEqual(trigger.type);
+          expect(responseBody.data.type).toEqual("routing-form");
+        });
+    });
+
     it("should return 404 for updating a non-existent workflow ID", async () => {
-      const partialUpdateDto: Partial<CreateWorkflowDto> = {
+      const partialUpdateDto: Partial<CreateEventTypeWorkflowDto> = {
         name: updatedName,
         steps: [{ ...createdWorkflow.steps[0], sender: "updatedSender" } as WorkflowEmailAttendeeStepDto],
       };
@@ -384,7 +880,7 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
     });
 
     it("should return 401 if not authenticated", async () => {
-      const partialUpdateDto: Partial<CreateWorkflowDto> = {
+      const partialUpdateDto: Partial<CreateEventTypeWorkflowDto> = {
         name: updatedName,
         steps: [{ ...createdWorkflow.steps[0], sender: "updatedSender" } as WorkflowEmailAttendeeStepDto],
       };
@@ -403,11 +899,11 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
       const res = await request(app.getHttpServer())
         .post(basePath)
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
-        .send({ ...sampleCreateWorkflowDto, name: `Workflow To Delete ${randomString()}` });
+        .send({ ...sampleCreateEventTypeWorkflowDto, name: `Workflow To Delete ${randomString()}` });
       workflowToDeleteId = res.body.data.id;
     });
 
-    it("should delete an existing workflow", async () => {
+    it("should delete an existing event-type workflow", async () => {
       return request(app.getHttpServer())
         .delete(`${basePath}/${workflowToDeleteId}`)
         .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
@@ -417,6 +913,16 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         });
     });
 
+    it("should delete an existing routing-form workflow", async () => {
+      return request(app.getHttpServer())
+        .delete(`${basePath}/${createdFormWorkflowId}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .expect(200)
+        .then((response) => {
+          expect(response.body.status).toEqual(SUCCESS_STATUS);
+        });
+    });
+
     it("should return 404 when trying to delete a non-existent workflow ID", async () => {
       return request(app.getHttpServer())
         .delete(`${basePath}/999999`)
diff --git a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.ts b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.ts
index 7be286cf0c03e6..1716881b6f8f68 100644
--- a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.ts
+++ b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.ts
@@ -13,12 +13,23 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { IsWorkflowInTeam } from "@/modules/auth/guards/workflows/is-workflow-in-team";
+import { IsEventTypeWorkflowInTeam } from "@/modules/auth/guards/workflows/is-event-type-workflow-in-team";
+import { IsRoutingFormWorkflowInTeam } from "@/modules/auth/guards/workflows/is-routing-form-workflow-in-team";
 import { UserWithProfile } from "@/modules/users/users.repository";
-import { CreateWorkflowDto } from "@/modules/workflows/inputs/create-workflow.input";
-import { UpdateWorkflowDto } from "@/modules/workflows/inputs/update-workflow.input";
-import { GetWorkflowOutput, GetWorkflowsOutput } from "@/modules/workflows/outputs/workflow.output";
-import { TeamWorkflowsService } from "@/modules/workflows/services/team-workflows.service";
+import { CreateEventTypeWorkflowDto } from "@/modules/workflows/inputs/create-event-type-workflow.input";
+import { CreateFormWorkflowDto } from "@/modules/workflows/inputs/create-form-workflow";
+import { UpdateEventTypeWorkflowDto } from "@/modules/workflows/inputs/update-event-type-workflow.input";
+import { UpdateFormWorkflowDto } from "@/modules/workflows/inputs/update-form-workflow.input";
+import {
+  GetEventTypeWorkflowsOutput,
+  GetEventTypeWorkflowOutput,
+} from "@/modules/workflows/outputs/event-type-workflow.output";
+import {
+  GetRoutingFormWorkflowOutput,
+  GetRoutingFormWorkflowsOutput,
+} from "@/modules/workflows/outputs/routing-form-workflow.output";
+import { TeamEventTypeWorkflowsService } from "@/modules/workflows/services/team-event-type-workflows.service";
+import { TeamRoutingFormWorkflowsService } from "@/modules/workflows/services/team-routing-form-workflows.service";
 import {
   Controller,
   Get,
@@ -46,7 +57,10 @@ import { SkipTakePagination } from "@calcom/platform-types";
 @ApiHeader(OPTIONAL_X_CAL_SECRET_KEY_HEADER)
 @ApiHeader(OPTIONAL_API_KEY_HEADER)
 export class OrganizationTeamWorkflowsController {
-  constructor(private readonly workflowsService: TeamWorkflowsService) {}
+  constructor(
+    private readonly eventTypeWorkflowsService: TeamEventTypeWorkflowsService,
+    private readonly routingFormWorkflowsService: TeamRoutingFormWorkflowsService
+  ) {}
 
   @Get("/")
   @ApiOperation({ summary: "Get organization team workflows" })
@@ -56,43 +70,89 @@ export class OrganizationTeamWorkflowsController {
     @Param("orgId", ParseIntPipe) orgId: number,
     @Param("teamId", ParseIntPipe) teamId: number,
     @Query() queryParams: SkipTakePagination
-  ): Promise<GetWorkflowsOutput> {
+  ): Promise<GetEventTypeWorkflowsOutput> {
     const { skip, take } = queryParams;
 
-    const workflows = await this.workflowsService.getTeamWorkflows(teamId, skip, take);
+    const workflows = await this.eventTypeWorkflowsService.getEventTypeTeamWorkflows(teamId, skip, take);
+
+    return { data: workflows, status: SUCCESS_STATUS };
+  }
+
+  @Get("/routing-form")
+  @ApiOperation({ summary: "Get organization team workflows" })
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("SCALE")
+  async getRoutingFormWorkflows(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetRoutingFormWorkflowsOutput> {
+    const { skip, take } = queryParams;
+
+    const workflows = await this.routingFormWorkflowsService.getRoutingFormTeamWorkflows(teamId, skip, take);
 
     return { data: workflows, status: SUCCESS_STATUS };
   }
 
   @Get("/:workflowId")
-  @UseGuards(IsWorkflowInTeam)
+  @UseGuards(IsEventTypeWorkflowInTeam)
   @ApiOperation({ summary: "Get organization team workflow" })
   @Roles("TEAM_ADMIN")
   @PlatformPlan("SCALE")
   async getWorkflowById(
     @Param("teamId", ParseIntPipe) teamId: number,
     @Param("workflowId", ParseIntPipe) workflowId: number
-  ): Promise<GetWorkflowOutput> {
-    const workflow = await this.workflowsService.getTeamWorkflowById(teamId, workflowId);
+  ): Promise<GetEventTypeWorkflowOutput> {
+    const workflow = await this.eventTypeWorkflowsService.getEventTypeTeamWorkflowById(teamId, workflowId);
+
+    return { data: workflow, status: SUCCESS_STATUS };
+  }
+
+  @Get("/:workflowId/routing-form")
+  @UseGuards(IsRoutingFormWorkflowInTeam)
+  @ApiOperation({ summary: "Get organization team workflow" })
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("SCALE")
+  async getRoutingFormWorkflowById(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("workflowId", ParseIntPipe) workflowId: number
+  ): Promise<GetRoutingFormWorkflowOutput> {
+    const workflow = await this.routingFormWorkflowsService.getRoutingFormTeamWorkflowById(
+      teamId,
+      workflowId
+    );
 
     return { data: workflow, status: SUCCESS_STATUS };
   }
 
   @Post("/")
-  @ApiOperation({ summary: "Create organization team workflow" })
+  @ApiOperation({ summary: "Create organization team workflow for event-types" })
   @Roles("TEAM_ADMIN")
   @PlatformPlan("SCALE")
-  async createWorkflow(
+  async createEventTypeWorkflow(
     @GetUser() user: UserWithProfile,
     @Param("teamId", ParseIntPipe) teamId: number,
-    @Body() data: CreateWorkflowDto
-  ): Promise<GetWorkflowOutput> {
-    const workflow = await this.workflowsService.createTeamWorkflow(user, teamId, data);
+    @Body() data: CreateEventTypeWorkflowDto
+  ): Promise<GetEventTypeWorkflowOutput> {
+    const workflow = await this.eventTypeWorkflowsService.createEventTypeTeamWorkflow(user, teamId, data);
+    return { data: workflow, status: SUCCESS_STATUS };
+  }
+
+  @Post("/routing-form")
+  @ApiOperation({ summary: "Create organization team workflow for routing-forms" })
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("SCALE")
+  async createFormWorkflow(
+    @GetUser() user: UserWithProfile,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Body() data: CreateFormWorkflowDto
+  ): Promise<GetRoutingFormWorkflowOutput> {
+    const workflow = await this.routingFormWorkflowsService.createFormTeamWorkflow(user, teamId, data);
     return { data: workflow, status: SUCCESS_STATUS };
   }
 
   @Patch("/:workflowId")
-  @UseGuards(IsWorkflowInTeam)
+  @UseGuards(IsEventTypeWorkflowInTeam)
   @ApiOperation({ summary: "Update organization team workflow" })
   @Roles("TEAM_ADMIN")
   @PlatformPlan("SCALE")
@@ -100,14 +160,39 @@ export class OrganizationTeamWorkflowsController {
     @Param("teamId", ParseIntPipe) teamId: number,
     @Param("workflowId", ParseIntPipe) workflowId: number,
     @GetUser() user: UserWithProfile,
-    @Body() data: UpdateWorkflowDto
-  ): Promise<GetWorkflowOutput> {
-    const workflow = await this.workflowsService.updateTeamWorkflow(user, teamId, workflowId, data);
+    @Body() data: UpdateEventTypeWorkflowDto
+  ): Promise<GetEventTypeWorkflowOutput> {
+    const workflow = await this.eventTypeWorkflowsService.updateEventTypeTeamWorkflow(
+      user,
+      teamId,
+      workflowId,
+      data
+    );
+    return { data: workflow, status: SUCCESS_STATUS };
+  }
+
+  @Patch("/:workflowId/routing-form")
+  @UseGuards(IsRoutingFormWorkflowInTeam)
+  @ApiOperation({ summary: "Update organization routing form team workflow" })
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("SCALE")
+  async updateRoutingFormWorkflow(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("workflowId", ParseIntPipe) workflowId: number,
+    @GetUser() user: UserWithProfile,
+    @Body() data: UpdateFormWorkflowDto
+  ): Promise<GetRoutingFormWorkflowOutput> {
+    const workflow = await this.routingFormWorkflowsService.updateFormTeamWorkflow(
+      user,
+      teamId,
+      workflowId,
+      data
+    );
     return { data: workflow, status: SUCCESS_STATUS };
   }
 
   @Delete("/:workflowId")
-  @UseGuards(IsWorkflowInTeam)
+  @UseGuards(IsEventTypeWorkflowInTeam)
   @ApiOperation({ summary: "Delete organization team workflow" })
   @Roles("TEAM_ADMIN")
   @PlatformPlan("SCALE")
@@ -115,7 +200,20 @@ export class OrganizationTeamWorkflowsController {
     @Param("teamId", ParseIntPipe) teamId: number,
     @Param("workflowId") workflowId: number
   ): Promise<{ status: typeof SUCCESS_STATUS }> {
-    await this.workflowsService.deleteTeamWorkflow(teamId, workflowId);
+    await this.eventTypeWorkflowsService.deleteTeamEventTypeWorkflow(teamId, workflowId);
+    return { status: SUCCESS_STATUS };
+  }
+
+  @Delete("/:workflowId/routing-form")
+  @UseGuards(IsRoutingFormWorkflowInTeam)
+  @ApiOperation({ summary: "Delete organization team routing-form workflow" })
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("SCALE")
+  async deleteRoutingFormWorkflow(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("workflowId") workflowId: number
+  ): Promise<{ status: typeof SUCCESS_STATUS }> {
+    await this.routingFormWorkflowsService.deleteTeamRoutingFormWorkflow(teamId, workflowId);
     return { status: SUCCESS_STATUS };
   }
 }
diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts
index 27c4e0b4e75d32..fba616befd544d 100644
--- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts
+++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts
@@ -25,7 +25,12 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { randomString } from "test/utils/randomString";
 
-import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants";
+import {
+  CAL_API_VERSION_HEADER,
+  SUCCESS_STATUS,
+  VERSION_2024_09_04,
+  ERROR_STATUS,
+} from "@calcom/platform-constants";
 import type {
   CreateScheduleInput_2024_06_11,
   ReserveSlotOutput_2024_09_04 as ReserveSlotOutputData_2024_09_04,
@@ -48,6 +53,7 @@ describe("Slots 2024-09-04 Endpoints", () => {
     const teammateEmailOne = `slots-2024-09-04-user-1-team-slots-${randomString()}`;
     let teammateApiKeyString: string;
     const teammateEmailTwo = `slots-2024-09-04-user-2-team-slots-${randomString()}`;
+    let teammateTwoApiKeyString: string;
 
     const outsiderEmail = `slots-2024-09-04-unrelated-team-slots-${randomString()}`;
     let outsider: User;
@@ -61,6 +67,8 @@ describe("Slots 2024-09-04 Endpoints", () => {
     let collectiveEventTypeSlug: string;
     let collectiveEventTypeWithoutHostsId: number;
     let roundRobinEventTypeId: number;
+    let roundRobinEventTypeWithoutFixedHostsId: number;
+    let roundRobinEventTypeWithFixedAndNonFixedHostsId: number;
     let collectiveBookingId: number;
     let roundRobinBookingId: number;
     let fullyBookedRoundRobinBookingIdOne: number;
@@ -115,6 +123,12 @@ describe("Slots 2024-09-04 Endpoints", () => {
       const { keyString } = await apiKeysRepositoryFixture.createApiKey(teammateOne.id, null);
       teammateApiKeyString = keyString;
 
+      const { keyString: keyStringForTeammateTwo } = await apiKeysRepositoryFixture.createApiKey(
+        teammateTwo.id,
+        null
+      );
+      teammateTwoApiKeyString = keyStringForTeammateTwo;
+
       const { keyString: unrelatedUserKeyString } = await apiKeysRepositoryFixture.createApiKey(
         outsider.id,
         null
@@ -217,6 +231,67 @@ describe("Slots 2024-09-04 Endpoints", () => {
       });
       roundRobinEventTypeId = roundRobinEventType.id;
 
+      const roundRobinEventTypeWithoutFixedHosts = await eventTypesRepositoryFixture.createTeamEventType({
+        schedulingType: "ROUND_ROBIN",
+        team: {
+          connect: { id: team.id },
+        },
+        title: "RR Event Type Without Fixed Hosts",
+        slug: `slots-2024-09-04-round-robin-event-type-${randomString()}`,
+        length: 60,
+        assignAllTeamMembers: true,
+        bookingFields: [],
+        locations: [],
+        users: {
+          connect: [{ id: teammateOne.id }, { id: teammateTwo.id }],
+        },
+        hosts: {
+          create: [
+            {
+              userId: teammateOne.id,
+              isFixed: false,
+            },
+            {
+              userId: teammateTwo.id,
+              isFixed: false,
+            },
+          ],
+        },
+      });
+
+      roundRobinEventTypeWithoutFixedHostsId = roundRobinEventTypeWithoutFixedHosts.id;
+
+      const roundRobinEventTypeWithFixedAndNonFixedHosts =
+        await eventTypesRepositoryFixture.createTeamEventType({
+          schedulingType: "ROUND_ROBIN",
+          team: {
+            connect: { id: team.id },
+          },
+          title: "RR Event Type With Fixed and Non-Fixed Hosts",
+          slug: `slots-2024-09-04-round-robin-event-type-${randomString()}`,
+          length: 60,
+          assignAllTeamMembers: true,
+          bookingFields: [],
+          locations: [],
+          users: {
+            connect: [{ id: teammateOne.id }, { id: teammateTwo.id }],
+          },
+          hosts: {
+            create: [
+              {
+                userId: teammateOne.id,
+                isFixed: true,
+              },
+              {
+                userId: teammateTwo.id,
+                isFixed: false,
+              },
+            ],
+          },
+        });
+
+      roundRobinEventTypeWithFixedAndNonFixedHostsId = roundRobinEventTypeWithFixedAndNonFixedHosts.id;
+
       const userSchedule: CreateScheduleInput_2024_06_11 = {
         name: "working time",
         timeZone: "Europe/Rome",
@@ -541,6 +616,135 @@ describe("Slots 2024-09-04 Endpoints", () => {
       bookingsRepositoryFixture.deleteById(bookingTwo.id);
     });
 
+    it("should reserve all available slots for round robin event type with non-fixed hosts", async () => {
+      const now = "2049-09-05T12:00:00.000Z";
+      const newDate = DateTime.fromISO(now, { zone: "UTC" }).toJSDate();
+      advanceTo(newDate);
+
+      const slotStartTime = "2050-09-05T10:00:00.000Z";
+
+      const reserveResponseOne = await request(app.getHttpServer())
+        .post(`/v2/slots/reservations`)
+        .set({ Authorization: `Bearer cal_test_${teammateApiKeyString}` })
+        .send({
+          eventTypeId: roundRobinEventTypeWithoutFixedHostsId,
+          slotStart: slotStartTime,
+          reservationDuration: 10,
+        })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_09_04)
+        .expect(201);
+
+      const reserveResponseOneBody: ReserveSlotOutputResponse_2024_09_04 = reserveResponseOne.body;
+      expect(reserveResponseOneBody.status).toEqual(SUCCESS_STATUS);
+      const responseReservedSlotOne: ReserveSlotOutputData_2024_09_04 = reserveResponseOneBody.data;
+      expect(responseReservedSlotOne.reservationUid).toBeDefined();
+      if (!responseReservedSlotOne.reservationUid) {
+        throw new Error("Reserved slot one uid is undefined");
+      }
+
+      const dbSlotOne = await selectedSlotRepositoryFixture.getByUid(responseReservedSlotOne.reservationUid);
+      expect(dbSlotOne).toBeDefined();
+      if (dbSlotOne) {
+        const dbReleaseAt = DateTime.fromJSDate(dbSlotOne.releaseAt, { zone: "UTC" }).toISO();
+        const expectedReleaseAt = DateTime.fromISO(now, { zone: "UTC" }).plus({ minutes: 10 }).toISO();
+        expect(dbReleaseAt).toEqual(expectedReleaseAt);
+      }
+
+      const reserveResponseTwo = await request(app.getHttpServer())
+        .post(`/v2/slots/reservations`)
+        .set({ Authorization: `Bearer cal_test_${teammateTwoApiKeyString}` })
+        .send({
+          eventTypeId: roundRobinEventTypeWithoutFixedHostsId,
+          slotStart: slotStartTime,
+          reservationDuration: 10,
+        })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_09_04)
+        .expect(201);
+
+      const reserveResponseTwoBody: ReserveSlotOutputResponse_2024_09_04 = reserveResponseTwo.body;
+      expect(reserveResponseTwoBody.status).toEqual(SUCCESS_STATUS);
+      const responseReservedSlotTwo: ReserveSlotOutputData_2024_09_04 = reserveResponseTwoBody.data;
+      expect(responseReservedSlotTwo.reservationUid).toBeDefined();
+      if (!responseReservedSlotTwo.reservationUid) {
+        throw new Error("Reserved slot two uid is undefined");
+      }
+
+      const dbSlotTwo = await selectedSlotRepositoryFixture.getByUid(responseReservedSlotTwo.reservationUid);
+      expect(dbSlotTwo).toBeDefined();
+      if (dbSlotTwo) {
+        const dbReleaseAt = DateTime.fromJSDate(dbSlotTwo.releaseAt, { zone: "UTC" }).toISO();
+        const expectedReleaseAt = DateTime.fromISO(now, { zone: "UTC" }).plus({ minutes: 10 }).toISO();
+        expect(dbReleaseAt).toEqual(expectedReleaseAt);
+      }
+
+      const reserveResponseThree = await request(app.getHttpServer())
+        .post(`/v2/slots/reservations`)
+        .set({ Authorization: `Bearer cal_test_${outsiderApiKeyString}` })
+        .send({
+          eventTypeId: roundRobinEventTypeWithoutFixedHostsId,
+          slotStart: slotStartTime,
+          reservationDuration: 10,
+        })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_09_04);
+
+      expect(reserveResponseThree.status).toEqual(403);
+      expect(reserveResponseThree.body.status).toEqual(ERROR_STATUS);
+
+      await selectedSlotRepositoryFixture.deleteByUId(responseReservedSlotOne.reservationUid);
+      await selectedSlotRepositoryFixture.deleteByUId(responseReservedSlotTwo.reservationUid);
+      clear();
+    });
+
+    it("should reserve available slot for round robin event type with fixed and non-fixed hosts and should not be able to reserve another slot", async () => {
+      const now = "2049-09-05T12:00:00.000Z";
+      const newDate = DateTime.fromISO(now, { zone: "UTC" }).toJSDate();
+      advanceTo(newDate);
+
+      const slotStartTime = "2050-09-05T10:00:00.000Z";
+
+      const reserveResponseOne = await request(app.getHttpServer())
+        .post(`/v2/slots/reservations`)
+        .set({ Authorization: `Bearer cal_test_${teammateApiKeyString}` })
+        .send({
+          eventTypeId: roundRobinEventTypeWithFixedAndNonFixedHostsId,
+          slotStart: slotStartTime,
+          reservationDuration: 10,
+        })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_09_04)
+        .expect(201);
+
+      const reserveResponseBodyOne: ReserveSlotOutputResponse_2024_09_04 = reserveResponseOne.body;
+      expect(reserveResponseBodyOne.status).toEqual(SUCCESS_STATUS);
+      const responseReservedSlotOne: ReserveSlotOutputData_2024_09_04 = reserveResponseBodyOne.data;
+      expect(responseReservedSlotOne.reservationUid).toBeDefined();
+      if (!responseReservedSlotOne.reservationUid) {
+        throw new Error("Reserved slot uid is undefined");
+      }
+
+      const dbSlotOne = await selectedSlotRepositoryFixture.getByUid(responseReservedSlotOne.reservationUid);
+      expect(dbSlotOne).toBeDefined();
+      if (dbSlotOne) {
+        const dbReleaseAt = DateTime.fromJSDate(dbSlotOne.releaseAt, { zone: "UTC" }).toISO();
+        const expectedReleaseAt = DateTime.fromISO(now, { zone: "UTC" }).plus({ minutes: 10 }).toISO();
+        expect(dbReleaseAt).toEqual(expectedReleaseAt);
+      }
+
+      const reserveResponseTwo = await request(app.getHttpServer())
+        .post(`/v2/slots/reservations`)
+        .send({
+          eventTypeId: roundRobinEventTypeWithFixedAndNonFixedHostsId,
+          slotStart: slotStartTime,
+        })
+        .set({ Authorization: `Bearer cal_test_${teammateTwoApiKeyString}` })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_09_04);
+
+      expect(reserveResponseTwo.status).toEqual(422);
+      expect(reserveResponseTwo.body.status).toEqual(ERROR_STATUS);
+
+      await selectedSlotRepositoryFixture.deleteByUId(responseReservedSlotOne.reservationUid);
+      clear();
+    });
+
     afterAll(async () => {
       await userRepositoryFixture.deleteByEmail(teammateOne.email);
       await userRepositoryFixture.deleteByEmail(teammateTwo.email);
diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts
index ae160e1dc865e5..d46a7d2124abe4 100644
--- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts
+++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts
@@ -48,7 +48,7 @@ import { ApiResponse } from "@calcom/platform-types";
 @DocsTags("Slots")
 @ApiHeader({
   name: "cal-api-version",
-  description: `Must be set to ${VERSION_2024_09_04}`,
+  description: `Must be set to ${VERSION_2024_09_04}. If not set to this value, the endpoint will default to an older version.`,
   example: VERSION_2024_09_04,
   required: true,
   schema: {
@@ -86,6 +86,8 @@ export class SlotsController_2024_09_04 {
       - duration: Only use for event types that allow multiple durations or for dynamic event types. If not passed for multiple duration event types defaults to default duration. For dynamic event types defaults to 30 aka each returned slot is 30 minutes long. So duration=60 means that returned slots will be each 60 minutes long.
       - format: Format of the slots. By default return is an object where each key is date and value is array of slots as string. If you want to get start and end of each slot use "range" as value.
       - bookingUidToReschedule: When rescheduling an existing booking, provide the booking's unique identifier to exclude its time slot from busy time calculations. This ensures the original booking time appears as available for rescheduling.
+
+       <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>
       `,
   })
   @ApiQuery({
@@ -256,7 +258,10 @@ export class SlotsController_2024_09_04 {
   @ApiOperation({
     summary: "Reserve a slot",
     description: `Make a slot not available for others to book for a certain period of time. If you authenticate using oAuth credentials, api key or access token
-    then you can also specify custom duration for how long the slot should be reserved for (defaults to 5 minutes).`,
+    then you can also specify custom duration for how long the slot should be reserved for (defaults to 5 minutes).
+    
+    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>    
+    `,
   })
   @ApiHeader(OPTIONAL_X_CAL_CLIENT_ID_HEADER)
   @ApiHeader(OPTIONAL_X_CAL_CLIENT_ID_HEADER)
@@ -278,6 +283,7 @@ export class SlotsController_2024_09_04 {
   @Get("/reservations/:uid")
   @ApiOperation({
     summary: "Get reserved slot",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
   })
   async getReservedSlot(@Param("uid") uid: string): Promise<GetReservedSlotOutput_2024_09_04> {
     const reservedSlot = await this.slotsService.getReservedSlot(uid);
@@ -293,6 +299,7 @@ export class SlotsController_2024_09_04 {
   @Patch("/reservations/:uid")
   @ApiOperation({
     summary: "Update a reserved slot",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
   })
   @HttpCode(HttpStatus.OK)
   async updateReservedSlot(
@@ -312,6 +319,7 @@ export class SlotsController_2024_09_04 {
   @Delete("/reservations/:uid")
   @ApiOperation({
     summary: "Delete a reserved slot",
+    description: `<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>`,
   })
   @HttpCode(HttpStatus.OK)
   @DocsResponse({
diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/services/slots.service.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/services/slots.service.ts
index 6e34882a19e3b1..4b1dcad021defa 100644
--- a/apps/api/v2/src/modules/slots/slots-2024-09-04/services/slots.service.ts
+++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/services/slots.service.ts
@@ -23,6 +23,8 @@ import { DateTime } from "luxon";
 import { z } from "zod";
 
 import { SlotFormat } from "@calcom/platform-enums";
+import { SchedulingType } from "@calcom/platform-libraries";
+import { validateRoundRobinSlotAvailability } from "@calcom/platform-libraries/slots";
 import type {
   GetSlotsInput_2024_09_04,
   GetSlotsInputWithRouting_2024_09_04,
@@ -147,13 +149,26 @@ export class SlotsService_2024_09_04 {
     }
 
     const nonSeatedEventAlreadyBooked = !eventType.seatsPerTimeSlot && booking;
-    if (nonSeatedEventAlreadyBooked) {
+    const isRoundRobinEvent = eventType.schedulingType === SchedulingType.ROUND_ROBIN;
+
+    if (nonSeatedEventAlreadyBooked && !isRoundRobinEvent) {
       throw new UnprocessableEntityException(`Can't reserve a slot if the event is already booked.`);
     }
 
-    const reservationDuration = input.reservationDuration ?? DEFAULT_RESERVATION_DURATION;
+    if (isRoundRobinEvent) {
+      try {
+        await validateRoundRobinSlotAvailability(input.eventTypeId, startDate, endDate, eventType.hosts);
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new UnprocessableEntityException(error?.message);
+        }
+        throw error;
+      }
+    } else {
+      await this.checkSlotOverlap(input.eventTypeId, startDate.toISO(), endDate.toISO());
+    }
 
-    await this.checkSlotOverlap(input.eventTypeId, startDate.toISO(), endDate.toISO());
+    const reservationDuration = input.reservationDuration ?? DEFAULT_RESERVATION_DURATION;
 
     if (eventType.userId) {
       const slot = await this.slotsRepository.createSlot(
diff --git a/apps/api/v2/src/modules/teams/memberships/inputs/get-team-memberships.input.ts b/apps/api/v2/src/modules/teams/memberships/inputs/get-team-memberships.input.ts
index 2b2c08cb30b2b5..b817f2134a0b4d 100644
--- a/apps/api/v2/src/modules/teams/memberships/inputs/get-team-memberships.input.ts
+++ b/apps/api/v2/src/modules/teams/memberships/inputs/get-team-memberships.input.ts
@@ -1,9 +1,10 @@
-import { GetUsersInput } from "@/modules/users/inputs/get-users.input";
 import { ApiPropertyOptional } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
 import { ArrayMaxSize, ArrayNotEmpty, IsEmail, IsOptional } from "class-validator";
 
-export class GetTeamMembershipsInput extends GetUsersInput {
+import { SkipTakePagination } from "@calcom/platform-types";
+
+export class GetTeamMembershipsInput extends SkipTakePagination {
   @IsOptional()
   @Transform(({ value }) => {
     if (value == null) return undefined;
diff --git a/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts b/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
index 829a10be139bba..0c726a297aa4c4 100644
--- a/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
+++ b/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
@@ -1,8 +1,8 @@
 import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { Transform } from "class-transformer";
-import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject } from "class-validator";
+import { Transform, Type } from "class-transformer";
+import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject, IsNumber } from "class-validator";
 
 import { ValidateMetadata } from "@calcom/platform-types";
 
@@ -17,6 +17,8 @@ export class CreateManagedUserInput {
   @ApiProperty({ example: "Alice Smith", description: "Managed user's name is used in emails" })
   name!: string;
 
+  @Type(() => Number)
+  @IsNumber()
   @IsOptional()
   @IsIn([12, 24], { message: "timeFormat must be a number either 12 or 24" })
   @ApiPropertyOptional({ example: 12, enum: [12, 24], description: "Must be a number 12 or 24" })
diff --git a/apps/api/v2/src/modules/users/inputs/update-managed-user.input.ts b/apps/api/v2/src/modules/users/inputs/update-managed-user.input.ts
index e1cb0fc064a9bc..42f9417730b52e 100644
--- a/apps/api/v2/src/modules/users/inputs/update-managed-user.input.ts
+++ b/apps/api/v2/src/modules/users/inputs/update-managed-user.input.ts
@@ -2,6 +2,7 @@ import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { TimeFormat, WeekDay } from "@/modules/users/inputs/create-managed-user.input";
 import { ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform, Type } from "class-transformer";
 import { IsEnum, IsIn, IsNumber, IsObject, IsOptional, IsString, IsTimeZone, IsUrl } from "class-validator";
 
 import { ValidateMetadata } from "@calcom/platform-types";
@@ -17,6 +18,8 @@ export class UpdateManagedUserInput {
   @ApiPropertyOptional()
   name?: string;
 
+  @Type(() => Number)
+  @IsNumber()
   @IsOptional()
   @IsIn([12, 24])
   @ApiPropertyOptional({ example: 12, enum: [12, 24], description: "Must be 12 or 24" })
diff --git a/apps/api/v2/src/modules/workflows/inputs/create-workflow.input.ts b/apps/api/v2/src/modules/workflows/inputs/create-event-type-workflow.input.ts
similarity index 86%
rename from apps/api/v2/src/modules/workflows/inputs/create-workflow.input.ts
rename to apps/api/v2/src/modules/workflows/inputs/create-event-type-workflow.input.ts
index 9c0fcd22dbd700..3d21a13a48533f 100644
--- a/apps/api/v2/src/modules/workflows/inputs/create-workflow.input.ts
+++ b/apps/api/v2/src/modules/workflows/inputs/create-event-type-workflow.input.ts
@@ -17,6 +17,7 @@ import {
   EMAIL_HOST,
   SMS_ATTENDEE,
   SMS_NUMBER,
+  STEP_ACTIONS,
   WHATSAPP_ATTENDEE,
   WHATSAPP_NUMBER,
   WorkflowEmailAddressStepDto,
@@ -31,7 +32,7 @@ import {
   AFTER_EVENT,
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
-  BaseWorkflowTriggerDto,
+  EventTypeWorkflowTriggerDto,
   BEFORE_EVENT,
   BOOKING_NO_SHOW_UPDATED,
   BOOKING_PAID,
@@ -39,6 +40,7 @@ import {
   BOOKING_REJECTED,
   BOOKING_REQUESTED,
   EVENT_CANCELLED,
+  EVENT_TYPE_WORKFLOW_TRIGGER_TYPES,
   NEW_EVENT,
   OnAfterCalVideoGuestsNoShowTriggerDto,
   OnAfterCalVideoHostsNoShowTriggerDto,
@@ -70,26 +72,12 @@ export class WorkflowActivationDto {
     example: [698191],
     type: [Number],
   })
-  @ValidateIf((o) => !Boolean(o.isActiveOnAllEventTypes))
+  @ValidateIf((o) => !o.isActiveOnAllEventTypes)
   @IsOptional()
   @IsNumber({}, { each: true })
   activeOnEventTypeIds: number[] = [];
 }
 
-export type TriggerDtoType =
-  | OnAfterEventTriggerDto
-  | OnBeforeEventTriggerDto
-  | OnCreationTriggerDto
-  | OnRescheduleTriggerDto
-  | OnCancelTriggerDto
-  | OnAfterCalVideoGuestsNoShowTriggerDto
-  | OnRejectedTriggerDto
-  | OnRequestedTriggerDto
-  | OnPaymentInitiatedTriggerDto
-  | OnPaidTriggerDto
-  | OnNoShowUpdateTriggerDto
-  | OnAfterCalVideoHostsNoShowTriggerDto;
-
 @ApiExtraModels(
   OnBeforeEventTriggerDto,
   OnAfterEventTriggerDto,
@@ -110,20 +98,24 @@ export type TriggerDtoType =
   WorkflowPhoneWhatsAppNumberStepDto,
   WorkflowPhoneNumberStepDto,
   WorkflowPhoneAttendeeStepDto,
-  BaseWorkflowTriggerDto
+  EventTypeWorkflowTriggerDto,
+  WorkflowActivationDto
 )
-export class CreateWorkflowDto {
+export class CreateEventTypeWorkflowDto {
   @ApiProperty({ description: "Name of the workflow", example: "Platform Test Workflow" })
   @IsString()
   name!: string;
 
-  @ApiProperty({ description: "Activation settings for the workflow", type: WorkflowActivationDto })
+  @ApiProperty({
+    description: "Activation settings for the workflow",
+    type: WorkflowActivationDto,
+  })
   @ValidateNested()
   @Type(() => WorkflowActivationDto)
   activation!: WorkflowActivationDto;
 
   @ApiProperty({
-    description: "Trigger configuration for the workflow",
+    description: `Trigger configuration for the event-type workflow, allowed triggers are ${EVENT_TYPE_WORKFLOW_TRIGGER_TYPES.toString()}`,
     oneOf: [
       { $ref: getSchemaPath(OnBeforeEventTriggerDto) },
       { $ref: getSchemaPath(OnAfterEventTriggerDto) },
@@ -140,7 +132,8 @@ export class CreateWorkflowDto {
     ],
   })
   @ValidateNested()
-  @Type(() => BaseWorkflowTriggerDto, {
+  @Type(() => EventTypeWorkflowTriggerDto, {
+    keepDiscriminatorProperty: true,
     discriminator: {
       property: "type",
       subTypes: [
@@ -170,11 +163,10 @@ export class CreateWorkflowDto {
     | OnPaidTriggerDto
     | OnPaymentInitiatedTriggerDto
     | OnNoShowUpdateTriggerDto
-    | OnAfterCalVideoGuestsNoShowTriggerDto
-    | OnAfterCalVideoHostsNoShowTriggerDto;
+    | OnAfterCalVideoGuestsNoShowTriggerDto;
 
   @ApiProperty({
-    description: "Steps to execute as part of the workflow",
+    description: `Steps to execute as part of the event-type workflow, allowed steps are ${STEP_ACTIONS.toString()}`,
     oneOf: [
       { $ref: getSchemaPath(WorkflowEmailAddressStepDto) },
       { $ref: getSchemaPath(WorkflowEmailAttendeeStepDto) },
@@ -187,8 +179,11 @@ export class CreateWorkflowDto {
     type: "array",
   })
   @ValidateNested({ each: true })
-  @ArrayMinSize(1, { message: "Your workflow must contain at least one step." })
+  @ArrayMinSize(1, {
+    message: `Your workflow must contain at least one allowed step. allowed steps are ${STEP_ACTIONS.toString()}`,
+  })
   @Type(() => BaseWorkflowStepDto, {
+    keepDiscriminatorProperty: true,
     discriminator: {
       property: "action",
       subTypes: [
diff --git a/apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts b/apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts
new file mode 100644
index 00000000000000..7ec8ee909cbf88
--- /dev/null
+++ b/apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts
@@ -0,0 +1,106 @@
+import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsBoolean, ArrayMinSize, IsOptional, IsString, ValidateNested, ValidateIf } from "class-validator";
+
+import {
+  BaseFormWorkflowStepDto,
+  EMAIL_ADDRESS,
+  EMAIL_ATTENDEE,
+  FORM_ALLOWED_STEP_ACTIONS,
+  WorkflowEmailAddressStepDto,
+  WorkflowEmailAttendeeStepDto,
+} from "./workflow-step.input";
+import {
+  RoutingFormWorkflowTriggerDto,
+  FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
+  FORM_WORKFLOW_TRIGGER_TYPES,
+  OnFormSubmittedNoEventTriggerDto,
+  OnFormSubmittedTriggerDto,
+} from "./workflow-trigger.input";
+
+export class WorkflowFormActivationDto {
+  @ApiProperty({
+    description: "Whether the workflow is active for all the routing forms",
+    example: false,
+    type: Boolean,
+  })
+  @IsBoolean()
+  isActiveOnAllRoutingForms = false;
+
+  @ApiPropertyOptional({
+    description: "List of routing form IDs the workflow applies to",
+    example: ["abd1-123edf-a213d-123dfwf"],
+    type: [Number],
+  })
+  @ValidateIf((o) => !o.isActiveOnAllEventTypes)
+  @IsOptional()
+  @IsString({ each: true })
+  activeOnRoutingFormIds: string[] = [];
+}
+
+@ApiExtraModels(
+  OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
+  WorkflowEmailAddressStepDto,
+  WorkflowEmailAttendeeStepDto,
+  RoutingFormWorkflowTriggerDto,
+  WorkflowFormActivationDto
+)
+export class CreateFormWorkflowDto {
+  @ApiProperty({ description: "Name of the workflow", example: "Platform Test Workflow" })
+  @IsString()
+  name!: string;
+
+  @ApiProperty({
+    description: "Activation settings for the workflow",
+    type: WorkflowFormActivationDto,
+  })
+  @ValidateNested()
+  @Type(() => WorkflowFormActivationDto)
+  activation!: WorkflowFormActivationDto;
+
+  @ApiProperty({
+    description: `Trigger configuration for the routing-form workflow, allowed triggers are ${FORM_WORKFLOW_TRIGGER_TYPES.toString()}`,
+    oneOf: [
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedNoEventTriggerDto) },
+    ],
+  })
+  @ValidateNested()
+  @Type(() => RoutingFormWorkflowTriggerDto, {
+    keepDiscriminatorProperty: true,
+    discriminator: {
+      property: "type",
+      subTypes: [
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
+        { value: OnFormSubmittedNoEventTriggerDto, name: FORM_SUBMITTED_NO_EVENT },
+      ],
+    },
+  })
+  trigger!: OnFormSubmittedTriggerDto | OnFormSubmittedNoEventTriggerDto;
+
+  @ApiProperty({
+    description: `Steps to execute as part of the routing-form workflow, allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
+    oneOf: [
+      { $ref: getSchemaPath(WorkflowEmailAddressStepDto) },
+      { $ref: getSchemaPath(WorkflowEmailAttendeeStepDto) },
+    ],
+    type: "array",
+  })
+  @ValidateNested({ each: true })
+  @ArrayMinSize(1, {
+    message: `Your workflow must contain at least one allowed step. allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
+  })
+  @Type(() => BaseFormWorkflowStepDto, {
+    keepDiscriminatorProperty: true,
+    discriminator: {
+      property: "action",
+      subTypes: [
+        { value: WorkflowEmailAddressStepDto, name: EMAIL_ADDRESS },
+        { value: WorkflowEmailAttendeeStepDto, name: EMAIL_ATTENDEE },
+      ],
+    },
+  })
+  steps!: (WorkflowEmailAddressStepDto | WorkflowEmailAttendeeStepDto)[];
+}
diff --git a/apps/api/v2/src/modules/workflows/inputs/update-workflow.input.ts b/apps/api/v2/src/modules/workflows/inputs/update-event-type-workflow.input.ts
similarity index 64%
rename from apps/api/v2/src/modules/workflows/inputs/update-workflow.input.ts
rename to apps/api/v2/src/modules/workflows/inputs/update-event-type-workflow.input.ts
index 124861bae8aa4c..bb3ae3eafb134c 100644
--- a/apps/api/v2/src/modules/workflows/inputs/update-workflow.input.ts
+++ b/apps/api/v2/src/modules/workflows/inputs/update-event-type-workflow.input.ts
@@ -1,16 +1,9 @@
 import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsNumber, IsString, IsOptional, ValidateNested, ArrayMinSize } from "class-validator";
+import { IsString, IsOptional, ValidateNested, ArrayMinSize } from "class-validator";
 
-import { WorkflowActivationDto } from "./create-workflow.input";
+import { WorkflowActivationDto } from "./create-event-type-workflow.input";
 import {
-  WorkflowEmailAttendeeStepDto,
-  WorkflowEmailAddressStepDto,
-  WorkflowEmailHostStepDto,
-  WorkflowPhoneWhatsAppNumberStepDto,
-  WorkflowPhoneAttendeeStepDto,
-  WorkflowPhoneNumberStepDto,
-  WorkflowPhoneWhatsAppAttendeeStepDto,
   BaseWorkflowStepDto,
   EMAIL_ADDRESS,
   EMAIL_ATTENDEE,
@@ -19,9 +12,17 @@ import {
   WHATSAPP_NUMBER,
   SMS_NUMBER,
   SMS_ATTENDEE,
+  UpdateEmailAddressWorkflowStepDto,
+  UpdateEmailAttendeeWorkflowStepDto,
+  UpdateEmailHostWorkflowStepDto,
+  UpdatePhoneAttendeeWorkflowStepDto,
+  UpdatePhoneNumberWorkflowStepDto,
+  UpdatePhoneWhatsAppNumberWorkflowStepDto,
+  UpdateWhatsAppAttendeePhoneWorkflowStepDto,
+  STEP_ACTIONS,
 } from "./workflow-step.input";
 import {
-  BaseWorkflowTriggerDto,
+  EventTypeWorkflowTriggerDto,
   OnBeforeEventTriggerDto,
   BEFORE_EVENT,
   OnAfterEventTriggerDto,
@@ -46,83 +47,9 @@ import {
   BOOKING_PAYMENT_INITIATED,
   BOOKING_PAID,
   BOOKING_NO_SHOW_UPDATED,
+  EVENT_TYPE_WORKFLOW_TRIGGER_TYPES,
 } from "./workflow-trigger.input";
 
-export type UpdateWorkflowStepDto =
-  | UpdateEmailAttendeeWorkflowStepDto
-  | UpdateEmailAddressWorkflowStepDto
-  | UpdateEmailHostWorkflowStepDto
-  | UpdateWhatsAppAttendeePhoneWorkflowStepDto
-  | UpdatePhoneWhatsAppNumberWorkflowStepDto
-  | UpdatePhoneAttendeeWorkflowStepDto
-  | UpdatePhoneNumberWorkflowStepDto;
-export class UpdateEmailAttendeeWorkflowStepDto extends WorkflowEmailAttendeeStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-
-export class UpdateEmailAddressWorkflowStepDto extends WorkflowEmailAddressStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-
-export class UpdateEmailHostWorkflowStepDto extends WorkflowEmailHostStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-
-export class UpdatePhoneWhatsAppNumberWorkflowStepDto extends WorkflowPhoneWhatsAppNumberStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-export class UpdatePhoneAttendeeWorkflowStepDto extends WorkflowPhoneAttendeeStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-export class UpdatePhoneNumberWorkflowStepDto extends WorkflowPhoneNumberStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-export class UpdateWhatsAppAttendeePhoneWorkflowStepDto extends WorkflowPhoneWhatsAppAttendeeStepDto {
-  @ApiProperty({
-    description:
-      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
-    example: 67244,
-  })
-  @IsNumber()
-  id?: number;
-}
-
 @ApiExtraModels(
   OnBeforeEventTriggerDto,
   OnAfterEventTriggerDto,
@@ -143,16 +70,17 @@ export class UpdateWhatsAppAttendeePhoneWorkflowStepDto extends WorkflowPhoneWha
   UpdatePhoneWhatsAppNumberWorkflowStepDto,
   UpdateWhatsAppAttendeePhoneWorkflowStepDto,
   UpdatePhoneNumberWorkflowStepDto,
-  BaseWorkflowTriggerDto
+  EventTypeWorkflowTriggerDto,
+  WorkflowActivationDto
 )
-export class UpdateWorkflowDto {
+export class UpdateEventTypeWorkflowDto {
   @ApiPropertyOptional({ description: "Name of the workflow", example: "Platform Test Workflow" })
   @IsString()
   @IsOptional()
   name?: string;
 
-  @ApiPropertyOptional({
-    description: "Activation settings for the workflow, the action that will trigger the workflow.",
+  @ApiProperty({
+    description: "Activation settings for the workflow",
     type: WorkflowActivationDto,
   })
   @ValidateNested()
@@ -161,7 +89,7 @@ export class UpdateWorkflowDto {
   activation?: WorkflowActivationDto;
 
   @ApiPropertyOptional({
-    description: "Trigger configuration for the workflow",
+    description: `Trigger configuration for the event-type workflow, allowed triggers are ${EVENT_TYPE_WORKFLOW_TRIGGER_TYPES.toString()}`,
     oneOf: [
       { $ref: getSchemaPath(OnBeforeEventTriggerDto) },
       { $ref: getSchemaPath(OnAfterEventTriggerDto) },
@@ -179,7 +107,8 @@ export class UpdateWorkflowDto {
   })
   @IsOptional()
   @ValidateNested()
-  @Type(() => BaseWorkflowTriggerDto, {
+  @Type(() => EventTypeWorkflowTriggerDto, {
+    keepDiscriminatorProperty: true,
     discriminator: {
       property: "type",
       subTypes: [
@@ -213,7 +142,7 @@ export class UpdateWorkflowDto {
     | OnAfterCalVideoHostsNoShowTriggerDto;
 
   @ApiPropertyOptional({
-    description: "Steps to execute as part of the workflow",
+    description: `Steps to execute as part of the event-type workflow, allowed steps are ${STEP_ACTIONS.toString()}`,
     oneOf: [
       { $ref: getSchemaPath(UpdateEmailAddressWorkflowStepDto) },
       { $ref: getSchemaPath(UpdateEmailAttendeeWorkflowStepDto) },
@@ -226,9 +155,12 @@ export class UpdateWorkflowDto {
     type: "array",
   })
   @ValidateNested({ each: true })
-  @ArrayMinSize(1, { message: "Your workflow must contain at least one step." })
+  @ArrayMinSize(1, {
+    message: `Your workflow must contain at least one allowed step. allowed steps are ${STEP_ACTIONS.toString()}`,
+  })
   @IsOptional()
   @Type(() => BaseWorkflowStepDto, {
+    keepDiscriminatorProperty: true,
     discriminator: {
       property: "action",
       subTypes: [
diff --git a/apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts b/apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts
new file mode 100644
index 00000000000000..d25295917e8e19
--- /dev/null
+++ b/apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts
@@ -0,0 +1,97 @@
+import { WorkflowFormActivationDto } from "@/modules/workflows/inputs/create-form-workflow";
+import { ApiExtraModels, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsString, IsOptional, ValidateNested, ArrayMinSize } from "class-validator";
+
+import {
+  BaseFormWorkflowStepDto,
+  EMAIL_ADDRESS,
+  EMAIL_ATTENDEE,
+  FORM_ALLOWED_STEP_ACTIONS,
+  UpdateEmailAddressWorkflowStepDto,
+  UpdateEmailAttendeeWorkflowStepDto,
+  UpdateEmailHostWorkflowStepDto,
+  UpdatePhoneAttendeeWorkflowStepDto,
+  UpdatePhoneNumberWorkflowStepDto,
+  UpdatePhoneWhatsAppNumberWorkflowStepDto,
+  UpdateWhatsAppAttendeePhoneWorkflowStepDto,
+} from "./workflow-step.input";
+import {
+  OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
+  FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
+  FORM_WORKFLOW_TRIGGER_TYPES,
+  RoutingFormWorkflowTriggerDto,
+} from "./workflow-trigger.input";
+
+@ApiExtraModels(
+  OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
+  UpdateEmailAddressWorkflowStepDto,
+  UpdateEmailAttendeeWorkflowStepDto,
+  UpdateEmailHostWorkflowStepDto,
+  UpdatePhoneAttendeeWorkflowStepDto,
+  UpdatePhoneWhatsAppNumberWorkflowStepDto,
+  UpdateWhatsAppAttendeePhoneWorkflowStepDto,
+  UpdatePhoneNumberWorkflowStepDto,
+  RoutingFormWorkflowTriggerDto,
+  WorkflowFormActivationDto
+)
+export class UpdateFormWorkflowDto {
+  @ApiPropertyOptional({ description: "Name of the workflow", example: "Rounting-form Test Workflow" })
+  @IsString()
+  @IsOptional()
+  name?: string;
+
+  @ValidateNested()
+  @Type(() => WorkflowFormActivationDto)
+  @IsOptional()
+  activation?: WorkflowFormActivationDto;
+
+  @ApiPropertyOptional({
+    description: `Trigger configuration for the routing-form workflow, allowed triggers are ${FORM_WORKFLOW_TRIGGER_TYPES}`,
+    oneOf: [
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedNoEventTriggerDto) },
+    ],
+  })
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => RoutingFormWorkflowTriggerDto, {
+    keepDiscriminatorProperty: true,
+    discriminator: {
+      property: "type",
+      subTypes: [
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
+        { value: OnFormSubmittedNoEventTriggerDto, name: FORM_SUBMITTED_NO_EVENT },
+      ],
+    },
+  })
+  trigger?: OnFormSubmittedTriggerDto | OnFormSubmittedNoEventTriggerDto;
+
+  @ApiPropertyOptional({
+    description: `Steps to execute as part of the routing-form workflow, allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
+    oneOf: [
+      { $ref: getSchemaPath(UpdateEmailAddressWorkflowStepDto) },
+      { $ref: getSchemaPath(UpdateEmailAttendeeWorkflowStepDto) },
+    ],
+    type: "array",
+  })
+  @ValidateNested({ each: true })
+  @ArrayMinSize(1, {
+    message: `Your workflow must contain at least one allowed step. allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
+  })
+  @IsOptional()
+  @Type(() => BaseFormWorkflowStepDto, {
+    keepDiscriminatorProperty: true,
+    discriminator: {
+      property: "action",
+      subTypes: [
+        { value: UpdateEmailAddressWorkflowStepDto, name: EMAIL_ADDRESS },
+        { value: UpdateEmailAttendeeWorkflowStepDto, name: EMAIL_ATTENDEE },
+      ],
+    },
+  })
+  steps?: (UpdateEmailAddressWorkflowStepDto | UpdateEmailAttendeeWorkflowStepDto)[];
+}
diff --git a/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts b/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts
index 1fa00c191e3e0d..ac9a51971576b1 100644
--- a/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts
+++ b/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts
@@ -1,6 +1,6 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsNumber, IsBoolean, IsString, ValidateNested, IsIn } from "class-validator";
+import { IsNumber, IsBoolean, IsString, ValidateNested, IsIn, IsOptional } from "class-validator";
 
 import { WorkflowActions, WorkflowTemplates } from "@calcom/platform-libraries";
 
@@ -24,6 +24,8 @@ export const STEP_ACTIONS = [
   CAL_AI_PHONE_CALL,
 ] as const;
 
+export const FORM_ALLOWED_STEP_ACTIONS = [EMAIL_ATTENDEE, EMAIL_ADDRESS] as const;
+
 export const STEP_ACTIONS_TO_ENUM = {
   [EMAIL_HOST]: WorkflowActions.EMAIL_HOST,
   [EMAIL_ATTENDEE]: WorkflowActions.EMAIL_ATTENDEE,
@@ -47,7 +49,7 @@ export const ENUM_TO_STEP_ACTIONS = {
 } as const;
 
 export type StepAction = (typeof STEP_ACTIONS)[number];
-export type StepActionsType = (typeof STEP_ACTIONS)[number];
+export type FormAllowedStepAction = (typeof FORM_ALLOWED_STEP_ACTIONS)[number];
 
 export const REMINDER = "reminder";
 export const CUSTOM = "custom";
@@ -134,6 +136,13 @@ export class BaseWorkflowStepDto {
   sender!: string;
 }
 
+export class BaseFormWorkflowStepDto extends BaseWorkflowStepDto {
+  @ApiProperty({ description: "Action to perform", example: EMAIL_HOST, enum: STEP_ACTIONS })
+  @IsString()
+  @IsIn(FORM_ALLOWED_STEP_ACTIONS)
+  action!: FormAllowedStepAction;
+}
+
 export class WorkflowEmailHostStepDto extends BaseWorkflowStepDto {
   @ApiProperty({
     description: "Action to perform, send an email to the host of the event",
@@ -260,6 +269,15 @@ export class WorkflowPhoneAttendeeStepDto extends BaseWorkflowStepDto {
   @ValidateNested()
   @Type(() => TextWorkflowMessageDto)
   message!: TextWorkflowMessageDto;
+
+  @ApiPropertyOptional({
+    description: "whether or not the attendees are required to provide their phone numbers when booking",
+    example: true,
+    default: false,
+  })
+  @IsBoolean()
+  @IsOptional()
+  phoneRequired: boolean = false;
 }
 
 export class WorkflowPhoneNumberStepDto extends BaseWorkflowStepDto {
@@ -302,4 +320,88 @@ export class WorkflowPhoneWhatsAppAttendeeStepDto extends BaseWorkflowStepDto {
   @ValidateNested()
   @Type(() => TextWorkflowMessageDto)
   message!: TextWorkflowMessageDto;
+
+  @ApiPropertyOptional({
+    description: "whether or not the attendees are required to provide their phone numbers when booking",
+    example: true,
+    default: false,
+  })
+  @IsBoolean()
+  @IsOptional()
+  phoneRequired: boolean = false;
+}
+
+export type UpdateWorkflowStepDto =
+  | UpdateEmailAttendeeWorkflowStepDto
+  | UpdateEmailAddressWorkflowStepDto
+  | UpdateEmailHostWorkflowStepDto
+  | UpdateWhatsAppAttendeePhoneWorkflowStepDto
+  | UpdatePhoneWhatsAppNumberWorkflowStepDto
+  | UpdatePhoneAttendeeWorkflowStepDto
+  | UpdatePhoneNumberWorkflowStepDto;
+export class UpdateEmailAttendeeWorkflowStepDto extends WorkflowEmailAttendeeStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+
+export class UpdateEmailAddressWorkflowStepDto extends WorkflowEmailAddressStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+
+export class UpdateEmailHostWorkflowStepDto extends WorkflowEmailHostStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+
+export class UpdatePhoneWhatsAppNumberWorkflowStepDto extends WorkflowPhoneWhatsAppNumberStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+export class UpdatePhoneAttendeeWorkflowStepDto extends WorkflowPhoneAttendeeStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+export class UpdatePhoneNumberWorkflowStepDto extends WorkflowPhoneNumberStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
+}
+export class UpdateWhatsAppAttendeePhoneWorkflowStepDto extends WorkflowPhoneWhatsAppAttendeeStepDto {
+  @ApiProperty({
+    description:
+      "Unique identifier of the step you want to update, if adding a new step do not provide this id",
+    example: 67244,
+  })
+  @IsNumber()
+  id?: number;
 }
diff --git a/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts b/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts
index 061cba1cd3974d..5c1b970641cb81 100644
--- a/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts
+++ b/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts
@@ -11,11 +11,31 @@ export const AFTER_EVENT = "afterEvent";
 export const RESCHEDULE_EVENT = "rescheduleEvent";
 export const AFTER_HOSTS_CAL_VIDEO_NO_SHOW = "afterHostsCalVideoNoShow";
 export const AFTER_GUESTS_CAL_VIDEO_NO_SHOW = "afterGuestsCalVideoNoShow";
+export const FORM_SUBMITTED = "formSubmitted";
+export const FORM_SUBMITTED_NO_EVENT = "formSubmittedNoEvent";
 export const BOOKING_REJECTED = "bookingRejected";
 export const BOOKING_REQUESTED = "bookingRequested";
 export const BOOKING_PAYMENT_INITIATED = "bookingPaymentInitiated";
 export const BOOKING_PAID = "bookingPaid";
 export const BOOKING_NO_SHOW_UPDATED = "bookingNoShowUpdated";
+
+export const FORM_WORKFLOW_TRIGGER_TYPES = [FORM_SUBMITTED, FORM_SUBMITTED_NO_EVENT] as const;
+
+export const EVENT_TYPE_WORKFLOW_TRIGGER_TYPES = [
+  BEFORE_EVENT,
+  EVENT_CANCELLED,
+  NEW_EVENT,
+  AFTER_EVENT,
+  RESCHEDULE_EVENT,
+  AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
+  AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  BOOKING_REJECTED,
+  BOOKING_REQUESTED,
+  BOOKING_PAYMENT_INITIATED,
+  BOOKING_PAID,
+  BOOKING_NO_SHOW_UPDATED,
+] as const;
+
 export const WORKFLOW_TRIGGER_TYPES = [
   BEFORE_EVENT,
   EVENT_CANCELLED,
@@ -24,6 +44,8 @@ export const WORKFLOW_TRIGGER_TYPES = [
   RESCHEDULE_EVENT,
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   BOOKING_REJECTED,
   BOOKING_REQUESTED,
   BOOKING_PAYMENT_INITIATED,
@@ -39,6 +61,8 @@ export const WORKFLOW_TRIGGER_TO_ENUM = {
   [RESCHEDULE_EVENT]: WorkflowTriggerEvents.RESCHEDULE_EVENT,
   [AFTER_HOSTS_CAL_VIDEO_NO_SHOW]: WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   [AFTER_GUESTS_CAL_VIDEO_NO_SHOW]: WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  [FORM_SUBMITTED]: WorkflowTriggerEvents.FORM_SUBMITTED,
+  [FORM_SUBMITTED_NO_EVENT]: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
   [BOOKING_REJECTED]: WorkflowTriggerEvents.BOOKING_REJECTED,
   [BOOKING_REQUESTED]: WorkflowTriggerEvents.BOOKING_REQUESTED,
   [BOOKING_PAYMENT_INITIATED]: WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED,
@@ -46,6 +70,19 @@ export const WORKFLOW_TRIGGER_TO_ENUM = {
   [BOOKING_PAID]: WorkflowTriggerEvents.BOOKING_PAID,
 } as const;
 
+export const ENUM_ROUTING_FORM_WORFLOW_TRIGGERS = [
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED_NO_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED],
+];
+
+export const ENUM_OFFSET_WORFLOW_TRIGGERS = [
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED_NO_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[BEFORE_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_GUESTS_CAL_VIDEO_NO_SHOW],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_HOSTS_CAL_VIDEO_NO_SHOW],
+];
+
 export const ENUM_TO_WORKFLOW_TRIGGER = {
   [WorkflowTriggerEvents.BEFORE_EVENT]: BEFORE_EVENT,
   [WorkflowTriggerEvents.EVENT_CANCELLED]: EVENT_CANCELLED,
@@ -54,6 +91,8 @@ export const ENUM_TO_WORKFLOW_TRIGGER = {
   [WorkflowTriggerEvents.RESCHEDULE_EVENT]: RESCHEDULE_EVENT,
   [WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW]: AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   [WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW]: AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  [WorkflowTriggerEvents.FORM_SUBMITTED]: FORM_SUBMITTED,
+  [WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT]: FORM_SUBMITTED_NO_EVENT,
   [WorkflowTriggerEvents.BOOKING_REJECTED]: BOOKING_REJECTED,
   [WorkflowTriggerEvents.BOOKING_REQUESTED]: BOOKING_REQUESTED,
   [WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED]: BOOKING_PAYMENT_INITIATED,
@@ -61,6 +100,10 @@ export const ENUM_TO_WORKFLOW_TRIGGER = {
   [WorkflowTriggerEvents.BOOKING_NO_SHOW_UPDATED]: BOOKING_NO_SHOW_UPDATED,
 } as const;
 
+export const ENUM_TO_ROUNTING_FORM_WORKFLOW_TRIGGER = {
+  [WorkflowTriggerEvents.FORM_SUBMITTED]: FORM_SUBMITTED,
+} as const;
+
 export const HOUR = "hour";
 export const MINUTE = "minute";
 export const DAY = "day";
@@ -82,6 +125,8 @@ export const ENUM_TO_TIME_UNIT = {
 } as const;
 
 export type WorkflowTriggerType = (typeof WORKFLOW_TRIGGER_TYPES)[number];
+export type WorkflowEventTypeTriggerType = (typeof EVENT_TYPE_WORKFLOW_TRIGGER_TYPES)[number];
+export type WorkflowFormTriggerType = (typeof FORM_WORKFLOW_TRIGGER_TYPES)[number];
 
 export class WorkflowTriggerOffsetDto {
   @ApiProperty({ description: "Time value for offset before/after event trigger", example: 24, type: Number })
@@ -94,13 +139,24 @@ export class WorkflowTriggerOffsetDto {
   unit!: TimeUnitType;
 }
 
-export class BaseWorkflowTriggerDto {
+export class EventTypeWorkflowTriggerDto {
   @ApiProperty({
-    description: "Trigger type for the workflow",
+    description: "Trigger type for the event-type workflow",
+    example: "beforeEvent",
+  })
+  @IsString()
+  @IsIn(EVENT_TYPE_WORKFLOW_TRIGGER_TYPES)
+  type!: WorkflowEventTypeTriggerType;
+}
+
+export class RoutingFormWorkflowTriggerDto {
+  @ApiProperty({
+    description: "Trigger type for the routing-form workflow",
+    example: "formSubmitted",
   })
   @IsString()
-  @IsIn([WORKFLOW_TRIGGER_TYPES])
-  type!: WorkflowTriggerType;
+  @IsIn(FORM_WORKFLOW_TRIGGER_TYPES)
+  type!: WorkflowFormTriggerType;
 }
 
 export class OnCreationTriggerDto {
@@ -166,7 +222,8 @@ export class OnNoShowUpdateTriggerDto {
 
 export class TriggerOffsetDTO {
   @ApiProperty({
-    description: "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+    description:
+      "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
     type: WorkflowTriggerOffsetDto,
   })
   @ValidateNested()
@@ -213,3 +270,31 @@ export class OnAfterCalVideoHostsNoShowTriggerDto extends TriggerOffsetDTO {
   @IsIn([AFTER_HOSTS_CAL_VIDEO_NO_SHOW])
   type: typeof AFTER_HOSTS_CAL_VIDEO_NO_SHOW = AFTER_HOSTS_CAL_VIDEO_NO_SHOW;
 }
+export class OnFormSubmittedTriggerDto {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: FORM_SUBMITTED,
+  })
+  @IsString()
+  @IsIn([FORM_SUBMITTED])
+  type: typeof FORM_SUBMITTED = FORM_SUBMITTED;
+}
+
+export class OnFormSubmittedNoEventTriggerDto extends TriggerOffsetDTO {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: FORM_SUBMITTED_NO_EVENT,
+  })
+  @IsString()
+  @IsIn([FORM_SUBMITTED_NO_EVENT])
+  type: typeof FORM_SUBMITTED_NO_EVENT = FORM_SUBMITTED_NO_EVENT;
+}
+
+export const OffsetTriggerDTOInstances = [
+  OnFormSubmittedNoEventTriggerDto,
+  OnBeforeEventTriggerDto,
+  OnAfterEventTriggerDto,
+  OnAfterCalVideoGuestsNoShowTriggerDto,
+  OnAfterEventTriggerDto,
+];
+export type OffsetTriggerDTOInstancesType = InstanceType<(typeof OffsetTriggerDTOInstances)[number]>;
diff --git a/apps/api/v2/src/modules/workflows/outputs/workflow.output.ts b/apps/api/v2/src/modules/workflows/outputs/base-workflow.output.ts
similarity index 50%
rename from apps/api/v2/src/modules/workflows/outputs/workflow.output.ts
rename to apps/api/v2/src/modules/workflows/outputs/base-workflow.output.ts
index 5a58d92a9be4d8..67332defb20339 100644
--- a/apps/api/v2/src/modules/workflows/outputs/workflow.output.ts
+++ b/apps/api/v2/src/modules/workflows/outputs/base-workflow.output.ts
@@ -1,28 +1,15 @@
-import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { Expose, Type } from "class-transformer";
-import { IsArray, IsEnum, ValidateNested } from "class-validator";
-
-import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
-
 import {
-  EMAIL_HOST,
   HOST,
   RECIPIENT_TYPES,
   RecipientType,
   REMINDER,
-  STEP_ACTIONS,
-  StepAction,
   TEMPLATES,
   TemplateType,
-} from "../inputs/workflow-step.input";
-import {
-  BEFORE_EVENT,
-  HOUR,
-  TIME_UNITS,
-  TimeUnitType,
-  WORKFLOW_TRIGGER_TYPES,
-  WorkflowTriggerType,
-} from "../inputs/workflow-trigger.input";
+} from "@/modules/workflows/inputs/workflow-step.input";
+import { HOUR, TIME_UNITS, TimeUnitType } from "@/modules/workflows/inputs/workflow-trigger.input";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsBoolean, IsOptional, ValidateNested } from "class-validator";
 
 export class WorkflowMessageOutputDto {
   @ApiProperty({
@@ -47,7 +34,7 @@ export class WorkflowMessageOutputDto {
   text?: string;
 }
 
-export class WorkflowStepOutputDto {
+export class BaseWorkflowStepOutputDto {
   @ApiProperty({ description: "Unique identifier of the step", example: 67244 })
   @Expose()
   id!: number;
@@ -56,10 +43,6 @@ export class WorkflowStepOutputDto {
   @Expose()
   stepNumber!: number;
 
-  @ApiProperty({ description: "Action to perform", example: EMAIL_HOST, enum: STEP_ACTIONS })
-  @Expose()
-  action!: StepAction;
-
   @ApiProperty({ description: "Intended recipient type", example: HOST, enum: RECIPIENT_TYPES })
   @Expose()
   recipient!: RecipientType;
@@ -74,6 +57,16 @@ export class WorkflowStepOutputDto {
   @Expose()
   phone?: string;
 
+  @ApiPropertyOptional({
+    description: "whether or not the attendees are required to provide their phone numbers when booking",
+    example: true,
+    default: false,
+  })
+  @IsBoolean()
+  @Expose()
+  @IsOptional()
+  phoneRequired?: boolean;
+
   @ApiProperty({ description: "Template type used", example: REMINDER, enum: TEMPLATES })
   @Expose()
   template!: TemplateType;
@@ -110,45 +103,7 @@ export class WorkflowTriggerOffsetOutputDto {
   unit!: TimeUnitType;
 }
 
-export class WorkflowTriggerOutputDto {
-  @ApiProperty({
-    description: "Trigger type for the workflow",
-    example: BEFORE_EVENT,
-    enum: WORKFLOW_TRIGGER_TYPES,
-  })
-  @Expose()
-  type!: WorkflowTriggerType;
-
-  @ApiPropertyOptional({
-    description: "Offset details (present for BEFORE_EVENT/AFTER_EVENT)",
-    type: WorkflowTriggerOffsetOutputDto,
-  })
-  @Expose()
-  @ValidateNested()
-  @Type(() => WorkflowTriggerOffsetOutputDto)
-  offset?: WorkflowTriggerOffsetOutputDto;
-}
-
-export class WorkflowActivationOutputDto {
-  @ApiProperty({
-    description: "Whether the workflow is active for all event types associated with the team/user",
-    example: false,
-  })
-  @Expose()
-  isActiveOnAllEventTypes?: boolean = false;
-
-  @ApiPropertyOptional({
-    description: "List of Event Type IDs the workflow is specifically active on (if not active on all)",
-    example: [698191, 698192],
-  })
-  @Expose()
-  @IsArray()
-  activeOnEventTypeIds?: number[];
-}
-
-// --- Main Workflow Output DTO ---
-
-export class WorkflowOutput {
+export class BaseWorkflowOutput {
   @ApiProperty({ description: "Unique identifier of the workflow", example: 101 })
   @Expose()
   id!: number;
@@ -168,25 +123,6 @@ export class WorkflowOutput {
   @Expose()
   teamId?: number;
 
-  @ApiProperty({ description: "Activation settings (scope)", type: WorkflowActivationOutputDto })
-  @Expose()
-  @ValidateNested()
-  @Type(() => WorkflowActivationOutputDto)
-  activation!: WorkflowActivationOutputDto;
-
-  @ApiProperty({ description: "Trigger configuration", type: WorkflowTriggerOutputDto })
-  @Expose()
-  @ValidateNested()
-  @Type(() => WorkflowTriggerOutputDto)
-  trigger!: WorkflowTriggerOutputDto;
-
-  @ApiProperty({ description: "Steps comprising the workflow", type: [WorkflowStepOutputDto] })
-  @Expose()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => WorkflowStepOutputDto)
-  steps!: WorkflowStepOutputDto[];
-
   @ApiPropertyOptional({ description: "Timestamp of creation", example: "2024-05-12T10:00:00.000Z" })
   @Expose()
   createdAt?: Date | string;
@@ -195,47 +131,3 @@ export class WorkflowOutput {
   @Expose()
   updatedAt?: Date | string;
 }
-
-// --- List Response Output DTO ---
-
-export class GetWorkflowsOutput {
-  @ApiProperty({
-    description: "Indicates the status of the response",
-    example: SUCCESS_STATUS,
-    enum: [SUCCESS_STATUS, ERROR_STATUS],
-  })
-  @Expose()
-  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
-  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
-
-  @ApiProperty({
-    description: "List of workflows",
-    type: [WorkflowOutput],
-  })
-  @Expose()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => WorkflowOutput)
-  data!: WorkflowOutput[];
-}
-
-export class GetWorkflowOutput {
-  @ApiProperty({
-    description: "Indicates the status of the response",
-    example: SUCCESS_STATUS,
-    enum: [SUCCESS_STATUS, ERROR_STATUS],
-  })
-  @Expose()
-  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
-  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
-
-  @ApiProperty({
-    description: "workflow",
-    type: [WorkflowOutput],
-  })
-  @Expose()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => WorkflowOutput)
-  data!: WorkflowOutput;
-}
diff --git a/apps/api/v2/src/modules/workflows/outputs/event-type-workflow.output.ts b/apps/api/v2/src/modules/workflows/outputs/event-type-workflow.output.ts
new file mode 100644
index 00000000000000..b52e3c219064ad
--- /dev/null
+++ b/apps/api/v2/src/modules/workflows/outputs/event-type-workflow.output.ts
@@ -0,0 +1,140 @@
+import {
+  BaseWorkflowStepOutputDto,
+  WorkflowTriggerOffsetOutputDto,
+  BaseWorkflowOutput,
+} from "@/modules/workflows/outputs/base-workflow.output";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsArray, IsEnum, IsIn, IsString, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+import { EMAIL_HOST, STEP_ACTIONS, StepAction } from "../inputs/workflow-step.input";
+import {
+  BEFORE_EVENT,
+  EVENT_TYPE_WORKFLOW_TRIGGER_TYPES,
+  WorkflowEventTypeTriggerType,
+} from "../inputs/workflow-trigger.input";
+
+export const WORKFLOW_TYPE_FORM = "routing-form";
+export const WORKFLOW_TYPE_EVENT_TYPE = "event-type";
+
+export class EventTypeWorkflowStepOutputDto extends BaseWorkflowStepOutputDto {
+  @ApiProperty({ description: "Action to perform", example: EMAIL_HOST, enum: STEP_ACTIONS })
+  @Expose()
+  action!: StepAction;
+}
+
+export class EventTypeWorkflowTriggerOutputDto {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: BEFORE_EVENT,
+    enum: EVENT_TYPE_WORKFLOW_TRIGGER_TYPES,
+  })
+  @Expose()
+  type!: WorkflowEventTypeTriggerType;
+
+  @ApiPropertyOptional({
+    description: "Offset details (present for BEFORE_EVENT/AFTER_EVENT)",
+    type: WorkflowTriggerOffsetOutputDto,
+  })
+  @Expose()
+  @ValidateNested()
+  @Type(() => WorkflowTriggerOffsetOutputDto)
+  offset?: WorkflowTriggerOffsetOutputDto;
+}
+
+export class EventTypeWorkflowActivationOutputDto {
+  @ApiProperty({
+    description: "Whether the workflow is active for all event types associated with the team/user",
+    example: false,
+  })
+  @Expose()
+  isActiveOnAllEventTypes?: boolean = false;
+
+  @ApiPropertyOptional({
+    description: "List of Event Type IDs the workflow is specifically active on (if not active on all)",
+    example: [698191, 698192],
+  })
+  @Expose()
+  @IsArray()
+  activeOnEventTypeIds?: number[];
+}
+
+// --- Main Workflow Output DTO ---
+
+export class EventTypeWorkflowOutput extends BaseWorkflowOutput {
+  @ApiProperty({
+    description: "type of the workflow",
+    example: WORKFLOW_TYPE_EVENT_TYPE,
+    default: WORKFLOW_TYPE_EVENT_TYPE,
+  })
+  @IsString()
+  @IsIn([WORKFLOW_TYPE_EVENT_TYPE])
+  type!: typeof WORKFLOW_TYPE_EVENT_TYPE;
+
+  @ApiProperty({
+    description: "Activation settings for the workflow",
+  })
+  @Expose()
+  @ValidateNested()
+  @Type(() => EventTypeWorkflowActivationOutputDto)
+  activation!: EventTypeWorkflowActivationOutputDto;
+
+  @ApiProperty({ description: "Trigger configuration", type: EventTypeWorkflowTriggerOutputDto })
+  @Expose()
+  @ValidateNested()
+  @Type(() => EventTypeWorkflowTriggerOutputDto)
+  trigger!: EventTypeWorkflowTriggerOutputDto;
+
+  @ApiProperty({ description: "Steps comprising the workflow", type: [EventTypeWorkflowStepOutputDto] })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => EventTypeWorkflowStepOutputDto)
+  steps!: EventTypeWorkflowStepOutputDto[];
+}
+
+// --- List Response Output DTO ---
+
+export class GetEventTypeWorkflowsOutput {
+  @ApiProperty({
+    description: "Indicates the status of the response",
+    example: SUCCESS_STATUS,
+    enum: [SUCCESS_STATUS, ERROR_STATUS],
+  })
+  @Expose()
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    description: "List of workflows",
+    type: [EventTypeWorkflowOutput],
+  })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => EventTypeWorkflowOutput)
+  data!: EventTypeWorkflowOutput[];
+}
+
+export class GetEventTypeWorkflowOutput {
+  @ApiProperty({
+    description: "Indicates the status of the response",
+    example: SUCCESS_STATUS,
+    enum: [SUCCESS_STATUS, ERROR_STATUS],
+  })
+  @Expose()
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    description: "workflow",
+    type: [EventTypeWorkflowOutput],
+  })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => EventTypeWorkflowOutput)
+  data!: EventTypeWorkflowOutput;
+}
diff --git a/apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts b/apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts
new file mode 100644
index 00000000000000..d44184ae05c6a2
--- /dev/null
+++ b/apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts
@@ -0,0 +1,138 @@
+import {
+  BaseWorkflowOutput,
+  BaseWorkflowStepOutputDto,
+  WorkflowTriggerOffsetOutputDto,
+} from "@/modules/workflows/outputs/base-workflow.output";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsArray, IsEnum, IsIn, IsString, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+import { EMAIL_HOST, FORM_ALLOWED_STEP_ACTIONS, FormAllowedStepAction } from "../inputs/workflow-step.input";
+import {
+  FORM_SUBMITTED,
+  FORM_WORKFLOW_TRIGGER_TYPES,
+  WorkflowFormTriggerType,
+} from "../inputs/workflow-trigger.input";
+
+export const WORKFLOW_TYPE_FORM = "routing-form";
+export const WORKFLOW_TYPE_EVENT_TYPE = "event-type";
+
+export class RoutingFormWorkflowStepOutputDto extends BaseWorkflowStepOutputDto {
+  @ApiProperty({ description: "Action to perform", example: EMAIL_HOST, enum: FORM_ALLOWED_STEP_ACTIONS })
+  @Expose()
+  action!: FormAllowedStepAction;
+}
+
+export class RoutingFormWorkflowTriggerOutputDto {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: FORM_SUBMITTED,
+    enum: FORM_WORKFLOW_TRIGGER_TYPES,
+  })
+  @Expose()
+  type!: WorkflowFormTriggerType;
+
+  @ApiPropertyOptional({
+    description: "Offset details (present for BEFORE_EVENT/AFTER_EVENT/FORM_SUBMITTED_NO_EVENT)",
+    type: WorkflowTriggerOffsetOutputDto,
+  })
+  @Expose()
+  @ValidateNested()
+  @Type(() => WorkflowTriggerOffsetOutputDto)
+  offset?: WorkflowTriggerOffsetOutputDto;
+}
+
+export class RoutingFormWorkflowActivationOutputDto {
+  @ApiProperty({
+    description: "Whether the workflow is active for all routing forms associated with the team/user",
+    example: false,
+  })
+  @Expose()
+  isActiveOnAllRoutingForms?: boolean = false;
+
+  @ApiPropertyOptional({
+    description: "List of Event Type IDs the workflow is specifically active on (if not active on all)",
+    example: ["5cacdec7-1234-6e1b-78d9-7bcda8a1b332"],
+  })
+  @Expose()
+  @IsArray()
+  activeOnRoutingFormIds?: string[];
+}
+
+// --- Main Workflow Output DTO ---
+
+export class RoutingFormWorkflowOutput extends BaseWorkflowOutput {
+  @ApiProperty({
+    description: "type of the workflow",
+    example: WORKFLOW_TYPE_FORM,
+    default: WORKFLOW_TYPE_FORM,
+  })
+  @IsString()
+  @IsIn([WORKFLOW_TYPE_FORM])
+  type!: typeof WORKFLOW_TYPE_FORM;
+
+  @ApiProperty({
+    description: "Activation settings for the workflow",
+  })
+  @Expose()
+  @Type(() => RoutingFormWorkflowActivationOutputDto)
+  @ValidateNested()
+  activation!: RoutingFormWorkflowActivationOutputDto;
+
+  @ApiProperty({ description: "Trigger configuration", type: RoutingFormWorkflowTriggerOutputDto })
+  @Expose()
+  @ValidateNested()
+  @Type(() => RoutingFormWorkflowTriggerOutputDto)
+  trigger!: RoutingFormWorkflowTriggerOutputDto;
+
+  @ApiProperty({ description: "Steps comprising the workflow", type: [RoutingFormWorkflowStepOutputDto] })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => RoutingFormWorkflowStepOutputDto)
+  steps!: RoutingFormWorkflowStepOutputDto[];
+}
+
+export class GetRoutingFormWorkflowsOutput {
+  @ApiProperty({
+    description: "Indicates the status of the response",
+    example: SUCCESS_STATUS,
+    enum: [SUCCESS_STATUS, ERROR_STATUS],
+  })
+  @Expose()
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    description: "List of workflows",
+    type: [RoutingFormWorkflowOutput],
+  })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => RoutingFormWorkflowOutput)
+  data!: RoutingFormWorkflowOutput[];
+}
+
+export class GetRoutingFormWorkflowOutput {
+  @ApiProperty({
+    description: "Indicates the status of the response",
+    example: SUCCESS_STATUS,
+    enum: [SUCCESS_STATUS, ERROR_STATUS],
+  })
+  @Expose()
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    description: "workflow",
+    type: [RoutingFormWorkflowOutput],
+  })
+  @Expose()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => RoutingFormWorkflowOutput)
+  data!: RoutingFormWorkflowOutput;
+}
diff --git a/apps/api/v2/src/modules/workflows/services/team-event-type-workflows.service.ts b/apps/api/v2/src/modules/workflows/services/team-event-type-workflows.service.ts
new file mode 100644
index 00000000000000..3d2dffff0fe982
--- /dev/null
+++ b/apps/api/v2/src/modules/workflows/services/team-event-type-workflows.service.ts
@@ -0,0 +1,113 @@
+import { UserWithProfile } from "@/modules/users/users.repository";
+import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
+import { CreateEventTypeWorkflowDto } from "@/modules/workflows/inputs/create-event-type-workflow.input";
+import { UpdateEventTypeWorkflowDto } from "@/modules/workflows/inputs/update-event-type-workflow.input";
+import { WorkflowsInputService } from "@/modules/workflows/services/workflows.input.service";
+import { WorkflowsOutputService } from "@/modules/workflows/services/workflows.output.service";
+import { WorkflowsRepository } from "@/modules/workflows/workflows.repository";
+import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
+
+@Injectable()
+export class TeamEventTypeWorkflowsService {
+  constructor(
+    private readonly workflowsRepository: WorkflowsRepository,
+    private readonly teamsVerifiedResourcesRepository: TeamsVerifiedResourcesRepository,
+    private readonly workflowInputService: WorkflowsInputService,
+    private readonly workflowOutputService: WorkflowsOutputService
+  ) {}
+
+  async getEventTypeTeamWorkflows(teamId: number, skip: number, take: number) {
+    const workflows = await this.workflowsRepository.getEventTypeTeamWorkflows(teamId, skip, take);
+
+    return workflows.map((workflow) => {
+      const output = this.workflowOutputService.toEventTypeOutputDto(workflow);
+
+      if (!output) {
+        throw new BadRequestException(`Could not format workflow for response.`);
+      }
+      return output;
+    });
+  }
+
+  async getEventTypeTeamWorkflowById(teamId: number, workflowId: number) {
+    const workflow = await this.workflowsRepository.getEventTypeTeamWorkflowById(teamId, workflowId);
+
+    if (!workflow) {
+      throw new NotFoundException(`Workflow with ID ${workflowId} not found for team ${teamId}`);
+    }
+
+    const output = this.workflowOutputService.toEventTypeOutputDto(workflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
+  }
+
+  async createEventTypeTeamWorkflow(user: UserWithProfile, teamId: number, data: CreateEventTypeWorkflowDto) {
+    const workflowHusk = await this.workflowsRepository.createTeamWorkflowHusk(teamId);
+    const mappedData = await this.workflowInputService.mapEventTypeUpdateDtoToZodSchema(
+      data,
+      workflowHusk.id,
+      teamId,
+      workflowHusk
+    );
+
+    const createdWorkflow = await this.workflowsRepository.updateEventTypeTeamWorkflow(
+      user,
+      teamId,
+      workflowHusk.id,
+      mappedData
+    );
+    if (!createdWorkflow) {
+      throw new BadRequestException(`Could not create Workflow in team ${teamId}`);
+    }
+
+    const output = this.workflowOutputService.toEventTypeOutputDto(createdWorkflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
+  }
+
+  async updateEventTypeTeamWorkflow(
+    user: UserWithProfile,
+    teamId: number,
+    workflowId: number,
+    data: UpdateEventTypeWorkflowDto
+  ) {
+    const currentWorkflow = await this.workflowsRepository.getEventTypeTeamWorkflowById(teamId, workflowId);
+
+    if (!currentWorkflow) {
+      throw new NotFoundException(`Workflow with ID ${workflowId} not found for team ${teamId}`);
+    }
+    const mappedData = await this.workflowInputService.mapEventTypeUpdateDtoToZodSchema(
+      data,
+      workflowId,
+      teamId,
+      currentWorkflow
+    );
+
+    const updatedWorkflow = await this.workflowsRepository.updateEventTypeTeamWorkflow(
+      user,
+      teamId,
+      workflowId,
+      mappedData
+    );
+
+    if (!updatedWorkflow) {
+      throw new BadRequestException(`Could not update Workflow with ID ${workflowId} in team ${teamId}`);
+    }
+    const output = this.workflowOutputService.toEventTypeOutputDto(updatedWorkflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
+  }
+
+  async deleteTeamEventTypeWorkflow(teamId: number, workflowId: number) {
+    return await this.workflowsRepository.deleteTeamWorkflowById(teamId, workflowId);
+  }
+}
diff --git a/apps/api/v2/src/modules/workflows/services/team-workflows.service.ts b/apps/api/v2/src/modules/workflows/services/team-routing-form-workflows.service.ts
similarity index 50%
rename from apps/api/v2/src/modules/workflows/services/team-workflows.service.ts
rename to apps/api/v2/src/modules/workflows/services/team-routing-form-workflows.service.ts
index 1cbcd1f01af55f..3de1cd0b38922d 100644
--- a/apps/api/v2/src/modules/workflows/services/team-workflows.service.ts
+++ b/apps/api/v2/src/modules/workflows/services/team-routing-form-workflows.service.ts
@@ -1,14 +1,14 @@
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
-import { CreateWorkflowDto } from "@/modules/workflows/inputs/create-workflow.input";
-import { UpdateWorkflowDto } from "@/modules/workflows/inputs/update-workflow.input";
+import { CreateFormWorkflowDto } from "@/modules/workflows/inputs/create-form-workflow";
+import { UpdateFormWorkflowDto } from "@/modules/workflows/inputs/update-form-workflow.input";
 import { WorkflowsInputService } from "@/modules/workflows/services/workflows.input.service";
 import { WorkflowsOutputService } from "@/modules/workflows/services/workflows.output.service";
 import { WorkflowsRepository } from "@/modules/workflows/workflows.repository";
 import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
 
 @Injectable()
-export class TeamWorkflowsService {
+export class TeamRoutingFormWorkflowsService {
   constructor(
     private readonly workflowsRepository: WorkflowsRepository,
     private readonly teamsVerifiedResourcesRepository: TeamsVerifiedResourcesRepository,
@@ -16,32 +16,44 @@ export class TeamWorkflowsService {
     private readonly workflowOutputService: WorkflowsOutputService
   ) {}
 
-  async getTeamWorkflows(teamId: number, skip: number, take: number) {
-    const workflows = await this.workflowsRepository.getTeamWorkflows(teamId, skip, take);
+  async getRoutingFormTeamWorkflows(teamId: number, skip: number, take: number) {
+    const workflows = await this.workflowsRepository.getRoutingFormTeamWorkflows(teamId, skip, take);
 
-    return workflows.map((workflow) => this.workflowOutputService.toOutputDto(workflow));
+    return workflows.map((workflow) => {
+      const output = this.workflowOutputService.toRoutingFormOutputDto(workflow);
+
+      if (!output) {
+        throw new BadRequestException(`Could not format workflow for response.`);
+      }
+      return output;
+    });
   }
 
-  async getTeamWorkflowById(teamId: number, workflowId: number) {
-    const workflow = await this.workflowsRepository.getTeamWorkflowById(teamId, workflowId);
+  async getRoutingFormTeamWorkflowById(teamId: number, workflowId: number) {
+    const workflow = await this.workflowsRepository.getRoutingFormTeamWorkflowById(teamId, workflowId);
 
     if (!workflow) {
       throw new NotFoundException(`Workflow with ID ${workflowId} not found for team ${teamId}`);
     }
 
-    return this.workflowOutputService.toOutputDto(workflow);
+    const output = this.workflowOutputService.toRoutingFormOutputDto(workflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
   }
 
-  async createTeamWorkflow(user: UserWithProfile, teamId: number, data: CreateWorkflowDto) {
+  async createFormTeamWorkflow(user: UserWithProfile, teamId: number, data: CreateFormWorkflowDto) {
     const workflowHusk = await this.workflowsRepository.createTeamWorkflowHusk(teamId);
-    const mappedData = await this.workflowInputService.mapUpdateDtoToZodUpdateSchema(
+    const mappedData = await this.workflowInputService.mapFormUpdateDtoToZodSchema(
       data,
       workflowHusk.id,
       teamId,
       workflowHusk
     );
 
-    const createdWorkflow = await this.workflowsRepository.updateTeamWorkflow(
+    const createdWorkflow = await this.workflowsRepository.updateRoutingFormTeamWorkflow(
       user,
       teamId,
       workflowHusk.id,
@@ -51,28 +63,33 @@ export class TeamWorkflowsService {
       throw new BadRequestException(`Could not create Workflow in team ${teamId}`);
     }
 
-    return this.workflowOutputService.toOutputDto(createdWorkflow);
+    const output = this.workflowOutputService.toRoutingFormOutputDto(createdWorkflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
   }
 
-  async updateTeamWorkflow(
+  async updateFormTeamWorkflow(
     user: UserWithProfile,
     teamId: number,
     workflowId: number,
-    data: UpdateWorkflowDto
+    data: UpdateFormWorkflowDto
   ) {
-    const currentWorkflow = await this.workflowsRepository.getTeamWorkflowById(teamId, workflowId);
+    const currentWorkflow = await this.workflowsRepository.getRoutingFormTeamWorkflowById(teamId, workflowId);
 
     if (!currentWorkflow) {
       throw new NotFoundException(`Workflow with ID ${workflowId} not found for team ${teamId}`);
     }
-    const mappedData = await this.workflowInputService.mapUpdateDtoToZodUpdateSchema(
+    const mappedData = await this.workflowInputService.mapFormUpdateDtoToZodSchema(
       data,
       workflowId,
       teamId,
       currentWorkflow
     );
 
-    const updatedWorkflow = await this.workflowsRepository.updateTeamWorkflow(
+    const updatedWorkflow = await this.workflowsRepository.updateRoutingFormTeamWorkflow(
       user,
       teamId,
       workflowId,
@@ -83,10 +100,15 @@ export class TeamWorkflowsService {
       throw new BadRequestException(`Could not update Workflow with ID ${workflowId} in team ${teamId}`);
     }
 
-    return this.workflowOutputService.toOutputDto(updatedWorkflow);
+    const output = this.workflowOutputService.toRoutingFormOutputDto(updatedWorkflow);
+
+    if (!output) {
+      throw new BadRequestException(`Could not format workflow for response.`);
+    }
+    return output;
   }
 
-  async deleteTeamWorkflow(teamId: number, workflowId: number) {
+  async deleteTeamRoutingFormWorkflow(teamId: number, workflowId: number) {
     return await this.workflowsRepository.deleteTeamWorkflowById(teamId, workflowId);
   }
 }
diff --git a/apps/api/v2/src/modules/workflows/services/workflows.input.service.ts b/apps/api/v2/src/modules/workflows/services/workflows.input.service.ts
index 64acd8081482d0..3d67bd0699656c 100644
--- a/apps/api/v2/src/modules/workflows/services/workflows.input.service.ts
+++ b/apps/api/v2/src/modules/workflows/services/workflows.input.service.ts
@@ -1,11 +1,6 @@
 import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
-import {
-  UpdateWorkflowDto,
-  UpdateWorkflowStepDto,
-  UpdateEmailAttendeeWorkflowStepDto,
-  UpdateEmailAddressWorkflowStepDto,
-  UpdateEmailHostWorkflowStepDto,
-} from "@/modules/workflows/inputs/update-workflow.input";
+import { UpdateEventTypeWorkflowDto } from "@/modules/workflows/inputs/update-event-type-workflow.input";
+import { UpdateFormWorkflowDto } from "@/modules/workflows/inputs/update-form-workflow.input";
 import { WorkflowType } from "@/modules/workflows/workflows.repository";
 import { BadRequestException, Injectable } from "@nestjs/common";
 
@@ -21,14 +16,13 @@ import {
   STEP_ACTIONS_TO_ENUM,
   TemplateType,
   TextWorkflowMessageDto,
+  UpdateWorkflowStepDto,
   WHATSAPP_ATTENDEE,
   WHATSAPP_NUMBER,
-  WorkflowPhoneNumberStepDto,
-  WorkflowPhoneWhatsAppNumberStepDto,
 } from "../inputs/workflow-step.input";
 import {
-  OnAfterEventTriggerDto,
-  OnBeforeEventTriggerDto,
+  OffsetTriggerDTOInstances,
+  OffsetTriggerDTOInstancesType,
   TIME_UNIT_TO_ENUM,
   WORKFLOW_TRIGGER_TO_ENUM,
 } from "../inputs/workflow-trigger.input";
@@ -37,6 +31,37 @@ import {
 export class WorkflowsInputService {
   constructor(private readonly teamsVerifiedResourcesRepository: TeamsVerifiedResourcesRepository) {}
 
+  private _isOffsetTrigger(
+    trigger: UpdateEventTypeWorkflowDto["trigger"] | UpdateFormWorkflowDto["trigger"]
+  ): trigger is OffsetTriggerDTOInstancesType {
+    return OffsetTriggerDTOInstances.some((Instance) => trigger instanceof Instance);
+  }
+
+  private async _getTeamPhoneNumberFromVerifiedId(teamId: number, verifiedPhoneId: number) {
+    const phoneResource = await this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumberById(
+      verifiedPhoneId,
+      teamId
+    );
+
+    if (!phoneResource?.phoneNumber) {
+      throw new BadRequestException("Invalid Verified Phone Id.");
+    }
+
+    return phoneResource.phoneNumber;
+  }
+
+  private async _getTeamEmailFromVerifiedId(teamId: number, verifiedEmailId: number) {
+    const emailResource = await this.teamsVerifiedResourcesRepository.getTeamVerifiedEmailById(
+      verifiedEmailId,
+      teamId
+    );
+    if (!emailResource?.email) {
+      throw new BadRequestException("Invalid Verified Email Id.");
+    }
+
+    return emailResource.email;
+  }
+
   private async mapUpdateWorkflowStepToZodUpdateSchema(
     stepDto: UpdateWorkflowStepDto,
     index: number,
@@ -45,61 +70,42 @@ export class WorkflowsInputService {
   ) {
     let reminderBody: string | null = null;
     let sendTo: string | null = null;
+    let phoneRequired: boolean | null = null;
     const html = stepDto.message instanceof HtmlWorkflowMessageDto ? stepDto.message.html : null;
     const text = stepDto.message instanceof TextWorkflowMessageDto ? stepDto.message.text : null;
-    const includeCalendarEvent =
-      stepDto instanceof UpdateEmailAddressWorkflowStepDto ||
-      stepDto instanceof UpdateEmailAttendeeWorkflowStepDto ||
-      stepDto instanceof UpdateEmailHostWorkflowStepDto
-        ? stepDto.includeCalendarEvent
-        : false;
+    let includeCalendarEvent = false;
 
     switch (stepDto.action) {
       case EMAIL_HOST:
       case EMAIL_ATTENDEE:
       case EMAIL_ADDRESS:
         reminderBody = html ?? null;
+        includeCalendarEvent = stepDto.includeCalendarEvent;
         break;
       case SMS_ATTENDEE:
+        phoneRequired = stepDto.phoneRequired ?? false;
+        break;
       case SMS_NUMBER:
+        break;
       case WHATSAPP_ATTENDEE:
+        phoneRequired = stepDto.phoneRequired ?? false;
+        break;
       case WHATSAPP_NUMBER:
         reminderBody = text ?? null;
         break;
     }
     if (stepDto.action === EMAIL_ADDRESS) {
       if (stepDto.verifiedEmailId) {
-        const emailResource = await this.teamsVerifiedResourcesRepository.getTeamVerifiedEmailById(
-          stepDto.verifiedEmailId,
-          teamId
-        );
-        if (!emailResource?.email) {
-          throw new BadRequestException("Invalid Verified Email Id.");
-        }
-        sendTo = emailResource.email;
+        sendTo = await this._getTeamEmailFromVerifiedId(teamId, stepDto.verifiedEmailId);
       }
     } else if (stepDto.action === SMS_NUMBER || stepDto.action === WHATSAPP_NUMBER) {
-      if (
-        stepDto instanceof WorkflowPhoneNumberStepDto ||
-        stepDto instanceof WorkflowPhoneWhatsAppNumberStepDto
-      ) {
-        if (stepDto.verifiedPhoneId) {
-          const phoneResource = await this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumberById(
-            stepDto.verifiedPhoneId,
-            teamId
-          );
-
-          if (!phoneResource?.phoneNumber) {
-            throw new BadRequestException("Invalid Verified Phone Id.");
-          }
-
-          sendTo = phoneResource.phoneNumber;
-        }
+      if (stepDto.verifiedPhoneId) {
+        sendTo = await this._getTeamPhoneNumberFromVerifiedId(teamId, stepDto.verifiedPhoneId);
       }
     }
 
     const actionForZod = STEP_ACTIONS_TO_ENUM[stepDto.action];
-    const templateForZod = stepDto.template as unknown as Uppercase<TemplateType>;
+    const templateForZod = stepDto?.template?.toUpperCase() as unknown as Uppercase<TemplateType>;
 
     return {
       id: stepDto.id ?? -(index + 1),
@@ -110,19 +116,19 @@ export class WorkflowsInputService {
       reminderBody: reminderBody,
       emailSubject: stepDto.message.subject ?? null,
       template: templateForZod,
-      numberRequired: null,
+      numberRequired: phoneRequired,
       sender: stepDto.sender ?? null,
       senderName: stepDto.sender ?? null,
       includeCalendarEvent: includeCalendarEvent,
     };
   }
 
-  async mapUpdateDtoToZodUpdateSchema(
-    updateDto: UpdateWorkflowDto,
-    workflowIdToUse: number,
+  private async _mapCommonWorkflowProperties(
+    updateDto: UpdateEventTypeWorkflowDto | UpdateFormWorkflowDto,
+    currentData: WorkflowType,
     teamId: number,
-    currentData: WorkflowType
-  ): Promise<TUpdateInputSchema> {
+    workflowIdToUse: number
+  ) {
     const mappedSteps = updateDto?.steps
       ? await Promise.all(
           updateDto.steps.map(async (stepDto: UpdateWorkflowStepDto, index: number) =>
@@ -134,28 +140,85 @@ export class WorkflowsInputService {
     const triggerForZod = updateDto?.trigger?.type
       ? WORKFLOW_TRIGGER_TO_ENUM[updateDto?.trigger?.type]
       : currentData.trigger;
-    const timeUnitForZod =
-      updateDto.trigger instanceof OnBeforeEventTriggerDto ||
-      updateDto.trigger instanceof OnAfterEventTriggerDto
-        ? updateDto?.trigger?.offset?.unit ?? currentData.timeUnit ?? null
-        : undefined;
+
+    const timeUnitForZod = this._isOffsetTrigger(updateDto.trigger)
+      ? updateDto?.trigger?.offset?.unit ?? currentData.timeUnit ?? null
+      : undefined;
+
+    const time = this._isOffsetTrigger(updateDto.trigger)
+      ? updateDto?.trigger?.offset?.value ?? currentData?.time ?? null
+      : null;
+
+    const timeUnit = timeUnitForZod ? TIME_UNIT_TO_ENUM[timeUnitForZod] : null;
+
+    return { mappedSteps, triggerForZod, time, timeUnit };
+  }
+
+  async mapEventTypeUpdateDtoToZodSchema(
+    updateDto: UpdateEventTypeWorkflowDto,
+    workflowIdToUse: number,
+    teamId: number,
+    currentData: WorkflowType
+  ): Promise<TUpdateInputSchema> {
+    const { mappedSteps, triggerForZod, time, timeUnit } = await this._mapCommonWorkflowProperties(
+      updateDto,
+      currentData,
+      teamId,
+      workflowIdToUse
+    );
 
     const updateData: TUpdateInputSchema = {
       id: workflowIdToUse,
       name: updateDto.name ?? currentData.name,
-      activeOn:
+      steps: mappedSteps,
+      trigger: triggerForZod,
+      time: time,
+      timeUnit: timeUnit,
+
+      // Event-type specific logic
+      activeOnEventTypeIds:
         updateDto?.activation?.activeOnEventTypeIds ??
         currentData?.activeOn.map((active) => active.eventTypeId) ??
         [],
+      isActiveOnAll: updateDto?.activation?.isActiveOnAllEventTypes ?? currentData.isActiveOnAll ?? false,
+
+      // Explicitly set form-related fields to their default/empty state
+      activeOnRoutingFormIds: [],
+    } as const satisfies TUpdateInputSchema;
+
+    return updateData;
+  }
+
+  async mapFormUpdateDtoToZodSchema(
+    updateDto: UpdateFormWorkflowDto,
+    workflowIdToUse: number,
+    teamId: number,
+    currentData: WorkflowType
+  ): Promise<TUpdateInputSchema> {
+    const { mappedSteps, triggerForZod, time, timeUnit } = await this._mapCommonWorkflowProperties(
+      updateDto,
+      currentData,
+      teamId,
+      workflowIdToUse
+    );
+
+    const updateData: TUpdateInputSchema = {
+      id: workflowIdToUse,
+      name: updateDto.name ?? currentData.name,
       steps: mappedSteps,
       trigger: triggerForZod,
-      time:
-        updateDto.trigger instanceof OnBeforeEventTriggerDto ||
-        updateDto.trigger instanceof OnAfterEventTriggerDto
-          ? updateDto?.trigger?.offset?.value ?? currentData?.time ?? null
-          : null,
-      timeUnit: timeUnitForZod ? TIME_UNIT_TO_ENUM[timeUnitForZod] : null,
-      isActiveOnAll: updateDto?.activation?.isActiveOnAllEventTypes ?? currentData.isActiveOnAll ?? false,
+      time: time,
+      timeUnit: timeUnit,
+
+      // Form-specific logic
+      activeOnRoutingFormIds:
+        updateDto?.activation?.activeOnRoutingFormIds ??
+        currentData?.activeOnRoutingForms.map((active) => active.routingFormId) ??
+        [],
+      isActiveOnAll: updateDto?.activation?.isActiveOnAllRoutingForms ?? currentData.isActiveOnAll ?? false,
+
+      // Explicitly set event-type-related fields to their default/empty state
+      activeOnEventTypeIds: [],
     } as const satisfies TUpdateInputSchema;
 
     return updateData;
diff --git a/apps/api/v2/src/modules/workflows/services/workflows.output.service.ts b/apps/api/v2/src/modules/workflows/services/workflows.output.service.ts
index 312dd70adffc03..f810662a8b4127 100644
--- a/apps/api/v2/src/modules/workflows/services/workflows.output.service.ts
+++ b/apps/api/v2/src/modules/workflows/services/workflows.output.service.ts
@@ -1,48 +1,223 @@
-import { WorkflowActivationDto, TriggerDtoType } from "@/modules/workflows/inputs/create-workflow.input";
-import { WorkflowOutput, WorkflowStepOutputDto } from "@/modules/workflows/outputs/workflow.output";
+import { WorkflowActivationDto } from "@/modules/workflows/inputs/create-event-type-workflow.input";
+import { WorkflowFormActivationDto } from "@/modules/workflows/inputs/create-form-workflow";
+import {
+  EventTypeWorkflowStepOutputDto,
+  EventTypeWorkflowOutput,
+} from "@/modules/workflows/outputs/event-type-workflow.output";
+import {
+  RoutingFormWorkflowOutput,
+  RoutingFormWorkflowStepOutputDto,
+} from "@/modules/workflows/outputs/routing-form-workflow.output";
 import { WorkflowType } from "@/modules/workflows/workflows.repository";
 import { Injectable } from "@nestjs/common";
 
 import {
   ATTENDEE,
+  CAL_AI_PHONE_CALL,
   EMAIL,
   EMAIL_ADDRESS,
   EMAIL_ATTENDEE,
   EMAIL_HOST,
   ENUM_TO_STEP_ACTIONS,
   ENUM_TO_TEMPLATES,
+  FORM_ALLOWED_STEP_ACTIONS,
+  FormAllowedStepAction,
   HOST,
   PHONE_NUMBER,
   RecipientType,
   SMS_ATTENDEE,
   SMS_NUMBER,
+  StepAction,
   WHATSAPP_ATTENDEE,
   WHATSAPP_NUMBER,
 } from "../inputs/workflow-step.input";
 import {
-  AFTER_EVENT,
-  AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
-  AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
-  BEFORE_EVENT,
   ENUM_TO_TIME_UNIT,
   ENUM_TO_WORKFLOW_TRIGGER,
   HOUR,
+  OnAfterCalVideoGuestsNoShowTriggerDto,
+  OnAfterCalVideoHostsNoShowTriggerDto,
+  OnAfterEventTriggerDto,
+  OnBeforeEventTriggerDto,
+  OnCancelTriggerDto,
+  OnCreationTriggerDto,
+  OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
+  OnNoShowUpdateTriggerDto,
+  OnPaidTriggerDto,
+  OnPaymentInitiatedTriggerDto,
+  OnRejectedTriggerDto,
+  OnRequestedTriggerDto,
+  OnRescheduleTriggerDto,
   WORKFLOW_TRIGGER_TO_ENUM,
+  FORM_WORKFLOW_TRIGGER_TYPES,
+  ENUM_ROUTING_FORM_WORFLOW_TRIGGERS,
+  ENUM_OFFSET_WORFLOW_TRIGGERS,
 } from "../inputs/workflow-trigger.input";
 
+export type TriggerDtoType =
+  | OnAfterEventTriggerDto
+  | OnBeforeEventTriggerDto
+  | OnCreationTriggerDto
+  | OnRescheduleTriggerDto
+  | OnCancelTriggerDto
+  | OnAfterCalVideoGuestsNoShowTriggerDto
+  | OnFormSubmittedTriggerDto
+  | OnFormSubmittedNoEventTriggerDto
+  | OnRejectedTriggerDto
+  | OnRequestedTriggerDto
+  | OnPaymentInitiatedTriggerDto
+  | OnPaidTriggerDto
+  | OnNoShowUpdateTriggerDto
+  | OnAfterCalVideoHostsNoShowTriggerDto;
+
+export type TriggerEventTypeDtoType =
+  | OnAfterEventTriggerDto
+  | OnBeforeEventTriggerDto
+  | OnCreationTriggerDto
+  | OnRescheduleTriggerDto
+  | OnCancelTriggerDto
+  | OnAfterCalVideoGuestsNoShowTriggerDto
+  | OnRejectedTriggerDto
+  | OnRequestedTriggerDto
+  | OnPaymentInitiatedTriggerDto
+  | OnPaidTriggerDto
+  | OnNoShowUpdateTriggerDto
+  | OnAfterCalVideoHostsNoShowTriggerDto;
+
+type StepConfig = {
+  recipient: RecipientType;
+  messageKey: "html" | "text";
+  setsCustomRecipient: boolean;
+  requiresPhone: boolean;
+};
+
+const ACTION_CONFIG_MAP = {
+  [EMAIL_HOST]: {
+    recipient: HOST,
+    messageKey: "html",
+    setsCustomRecipient: false,
+    requiresPhone: false,
+  } satisfies StepConfig,
+  [EMAIL_ATTENDEE]: {
+    recipient: ATTENDEE,
+    messageKey: "html",
+    setsCustomRecipient: false,
+    requiresPhone: false,
+  },
+  [SMS_ATTENDEE]: {
+    recipient: ATTENDEE,
+    messageKey: "text",
+    setsCustomRecipient: false,
+    requiresPhone: true,
+  },
+  [WHATSAPP_ATTENDEE]: {
+    recipient: ATTENDEE,
+    messageKey: "text",
+    setsCustomRecipient: false,
+    requiresPhone: true,
+  },
+  [EMAIL_ADDRESS]: { recipient: EMAIL, messageKey: "html", setsCustomRecipient: true, requiresPhone: false },
+  [SMS_NUMBER]: {
+    recipient: PHONE_NUMBER,
+    messageKey: "text",
+    setsCustomRecipient: true,
+    requiresPhone: false,
+  },
+  [WHATSAPP_NUMBER]: {
+    recipient: PHONE_NUMBER,
+    messageKey: "text",
+    setsCustomRecipient: true,
+    requiresPhone: false,
+  },
+  [CAL_AI_PHONE_CALL]: {
+    recipient: PHONE_NUMBER,
+    messageKey: "text",
+    setsCustomRecipient: true,
+    requiresPhone: false,
+  },
+} satisfies Record<StepAction, StepConfig>;
+
 @Injectable()
 export class WorkflowsOutputService {
-  toOutputDto(workflow: WorkflowType): WorkflowOutput {
-    const activation: WorkflowActivationDto = {
-      isActiveOnAllEventTypes: workflow.isActiveOnAll,
-      activeOnEventTypeIds: workflow.activeOn?.map((relation) => relation.eventTypeId) ?? [],
+  _isFormAllowedStepAction(action: StepAction): action is FormAllowedStepAction {
+    return FORM_ALLOWED_STEP_ACTIONS.some((formAction) => formAction === action);
+  }
+  _isFormAllowedTrigger(
+    trigger: WorkflowType["trigger"]
+  ): trigger is (typeof ENUM_ROUTING_FORM_WORFLOW_TRIGGERS)[number] {
+    return FORM_WORKFLOW_TRIGGER_TYPES.some(
+      (formTrigger) => WORKFLOW_TRIGGER_TO_ENUM[formTrigger] === trigger
+    );
+  }
+
+  private _isOffsetTrigger(
+    trigger: WorkflowType["trigger"]
+  ): trigger is (typeof ENUM_OFFSET_WORFLOW_TRIGGERS)[number] {
+    return ENUM_OFFSET_WORFLOW_TRIGGERS.some((offsetTrigger) => offsetTrigger === trigger);
+  }
+
+  /**
+   * Maps a single workflow step from the database entity to its DTO representation.
+   * @param step The workflow step object from the database.
+   * @returns An EventTypeWorkflowStepOutputDto.
+   */
+  mapStep(step: WorkflowType["steps"][number], _discriminator: "event-type"): EventTypeWorkflowStepOutputDto;
+  mapStep(
+    step: WorkflowType["steps"][number],
+    _discriminator: "routing-form"
+  ): RoutingFormWorkflowStepOutputDto;
+  mapStep(
+    step: WorkflowType["steps"][number],
+    _discriminator: "event-type" | "routing-form"
+  ): EventTypeWorkflowStepOutputDto | RoutingFormWorkflowStepOutputDto {
+    const action = ENUM_TO_STEP_ACTIONS[step.action];
+    const config = ACTION_CONFIG_MAP[action] || {
+      recipient: ATTENDEE,
+      setsCustomRecipient: false,
+      requiresPhone: false,
+    };
+
+    const customRecipient = step.sendTo ?? "";
+    const reminderBody = step.reminderBody ?? "";
+
+    const baseAction = {
+      id: step.id,
+      stepNumber: step.stepNumber,
+      template: ENUM_TO_TEMPLATES[step.template],
+      recipient: config.recipient,
+      sender: step.sender ?? "Default Sender",
+      includeCalendarEvent: step.includeCalendarEvent,
+      phoneRequired: config.requiresPhone ? step.numberRequired ?? false : undefined,
+      email: config.recipient === EMAIL ? customRecipient : "",
+      phone: config.recipient === PHONE_NUMBER ? customRecipient : "",
+      message: {
+        subject: step.emailSubject ?? "",
+        html: config.messageKey === "html" ? reminderBody : undefined,
+        text: config.messageKey === "text" ? reminderBody : undefined,
+      },
     };
 
-    const trigger: TriggerDtoType =
-      workflow.trigger === WORKFLOW_TRIGGER_TO_ENUM[BEFORE_EVENT] ||
-      workflow.trigger === WORKFLOW_TRIGGER_TO_ENUM[AFTER_EVENT] ||
-      workflow.trigger === WORKFLOW_TRIGGER_TO_ENUM[AFTER_GUESTS_CAL_VIDEO_NO_SHOW] ||
-      workflow.trigger === WORKFLOW_TRIGGER_TO_ENUM[AFTER_HOSTS_CAL_VIDEO_NO_SHOW]
+    return this._isFormAllowedStepAction(action)
+      ? ({
+          ...baseAction,
+          action: action,
+        } satisfies RoutingFormWorkflowStepOutputDto)
+      : ({
+          ...baseAction,
+          action: action,
+        } satisfies EventTypeWorkflowStepOutputDto);
+  }
+
+  toRoutingFormOutputDto(workflow: WorkflowType): RoutingFormWorkflowOutput | void {
+    if (workflow.type === "ROUTING_FORM" && this._isFormAllowedTrigger(workflow.trigger)) {
+      const activation: WorkflowFormActivationDto = {
+        isActiveOnAllRoutingForms: workflow.isActiveOnAll,
+        activeOnRoutingFormIds:
+          workflow.activeOnRoutingForms?.map((relation) => relation.routingFormId) ?? [],
+      };
+
+      const trigger: TriggerDtoType = this._isOffsetTrigger(workflow.trigger)
         ? {
             type: ENUM_TO_WORKFLOW_TRIGGER[workflow.trigger],
             offset: {
@@ -52,68 +227,50 @@ export class WorkflowsOutputService {
           }
         : { type: ENUM_TO_WORKFLOW_TRIGGER[workflow.trigger] };
 
-    const steps: WorkflowStepOutputDto[] = workflow.steps.map((step) => {
-      let recipient: RecipientType;
-      let email = "";
-      let phone = "";
-      let text;
-      let html;
-      switch (ENUM_TO_STEP_ACTIONS[step.action]) {
-        case EMAIL_HOST:
-          recipient = HOST;
-          html = step.reminderBody ?? "";
-          break;
-        case EMAIL_ATTENDEE:
-          html = step.reminderBody ?? "";
-          recipient = ATTENDEE;
-          break;
-        case SMS_ATTENDEE:
-          text = step.reminderBody ?? "";
-          recipient = ATTENDEE;
-          break;
-        case WHATSAPP_ATTENDEE:
-          text = step.reminderBody ?? "";
-          recipient = ATTENDEE;
-          break;
-        case EMAIL_ADDRESS:
-          html = step.reminderBody ?? "";
-          recipient = EMAIL;
-          email = step.sendTo ?? "";
-          break;
-        case SMS_NUMBER:
-        case WHATSAPP_NUMBER:
-          text = step.reminderBody ?? "";
-          recipient = PHONE_NUMBER;
-          phone = step.sendTo ?? "";
-          break;
-        default:
-          recipient = ATTENDEE;
-      }
+      const steps: RoutingFormWorkflowStepOutputDto[] = workflow.steps.map((step) => {
+        return this.mapStep(step, "routing-form");
+      });
 
       return {
-        id: step.id,
-        stepNumber: step.stepNumber,
-        action: ENUM_TO_STEP_ACTIONS[step.action],
-        recipient: recipient,
-        email,
-        phone,
-        template: ENUM_TO_TEMPLATES[step.template],
-        includeCalendarEvent: step.includeCalendarEvent,
-        sender: step.sender ?? "Default Sender",
-        message: {
-          subject: step.emailSubject ?? "",
-          text,
-          html,
-        },
+        id: workflow.id,
+        name: workflow.name,
+        activation: activation,
+        trigger: trigger,
+        steps: steps.sort((stepA, stepB) => stepA.stepNumber - stepB.stepNumber),
+        type: "routing-form",
       };
-    });
-
-    return {
-      id: workflow.id,
-      name: workflow.name,
-      activation: activation,
-      trigger: trigger,
-      steps: steps.sort((stepA, stepB) => stepA.stepNumber - stepB.stepNumber),
-    };
+    }
+  }
+
+  toEventTypeOutputDto(workflow: WorkflowType): EventTypeWorkflowOutput | void {
+    if (workflow.type === "EVENT_TYPE" && !this._isFormAllowedTrigger(workflow.trigger)) {
+      const activation: WorkflowActivationDto = {
+        isActiveOnAllEventTypes: workflow.isActiveOnAll,
+        activeOnEventTypeIds: workflow.activeOn?.map((relation) => relation.eventTypeId) ?? [],
+      };
+
+      const trigger: TriggerEventTypeDtoType = this._isOffsetTrigger(workflow.trigger)
+        ? {
+            type: ENUM_TO_WORKFLOW_TRIGGER[workflow.trigger],
+            offset: {
+              value: workflow.time ?? 1,
+              unit: workflow.timeUnit ? ENUM_TO_TIME_UNIT[workflow.timeUnit] : HOUR,
+            },
+          }
+        : { type: ENUM_TO_WORKFLOW_TRIGGER[workflow.trigger] };
+
+      const steps: EventTypeWorkflowStepOutputDto[] = workflow.steps.map((step) => {
+        return this.mapStep(step, "event-type");
+      });
+
+      return {
+        id: workflow.id,
+        name: workflow.name,
+        activation: activation,
+        trigger: trigger,
+        steps: steps.sort((stepA, stepB) => stepA.stepNumber - stepB.stepNumber),
+        type: "event-type",
+      };
+    }
   }
 }
diff --git a/apps/api/v2/src/modules/workflows/workflows.repository.ts b/apps/api/v2/src/modules/workflows/workflows.repository.ts
index e06066a5ba8391..f8be74f9dfd349 100644
--- a/apps/api/v2/src/modules/workflows/workflows.repository.ts
+++ b/apps/api/v2/src/modules/workflows/workflows.repository.ts
@@ -9,7 +9,11 @@ import { updateWorkflow } from "@calcom/platform-libraries/workflows";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Workflow, WorkflowStep } from "@calcom/prisma/client";
 
-export type WorkflowType = Workflow & { activeOn: { eventTypeId: number }[]; steps: WorkflowStep[] };
+export type WorkflowType = Workflow & {
+  activeOn: { eventTypeId: number }[];
+  steps: WorkflowStep[];
+  activeOnRoutingForms: { routingFormId: string }[];
+};
 
 @Injectable()
 export class WorkflowsRepository {
@@ -19,29 +23,68 @@ export class WorkflowsRepository {
     return await this.dbWrite.prisma.workflow.delete({ where: { id: workflowId, teamId } });
   }
 
-  async getTeamWorkflowById(teamId: number, id: number): Promise<WorkflowType | null> {
+  async getEventTypeTeamWorkflowById(teamId: number, id: number): Promise<WorkflowType | null> {
     const workflow = await this.dbRead.prisma.workflow.findUnique({
       where: {
         id: id,
         teamId: teamId,
+        type: "EVENT_TYPE",
       },
       include: {
         steps: true,
         activeOn: { select: { eventTypeId: true } },
+        activeOnRoutingForms: { select: { routingFormId: true } },
       },
     });
 
     return workflow;
   }
 
-  async getTeamWorkflows(teamId: number, skip: number, take: number): Promise<WorkflowType[]> {
+  async getRoutingFormTeamWorkflowById(teamId: number, id: number): Promise<WorkflowType | null> {
+    const workflow = await this.dbRead.prisma.workflow.findUnique({
+      where: {
+        id: id,
+        teamId: teamId,
+        type: "ROUTING_FORM",
+      },
+      include: {
+        steps: true,
+        activeOn: { select: { eventTypeId: true } },
+        activeOnRoutingForms: { select: { routingFormId: true } },
+      },
+    });
+
+    return workflow;
+  }
+
+  async getEventTypeTeamWorkflows(teamId: number, skip: number, take: number): Promise<WorkflowType[]> {
     const workflows = await this.dbRead.prisma.workflow.findMany({
       where: {
         teamId: teamId,
+        type: "EVENT_TYPE",
       },
       include: {
         steps: true,
         activeOn: { select: { eventTypeId: true } },
+        activeOnRoutingForms: { select: { routingFormId: true } },
+      },
+      skip,
+      take,
+    });
+
+    return workflows;
+  }
+
+  async getRoutingFormTeamWorkflows(teamId: number, skip: number, take: number): Promise<WorkflowType[]> {
+    const workflows = await this.dbRead.prisma.workflow.findMany({
+      where: {
+        teamId: teamId,
+        type: "ROUTING_FORM",
+      },
+      include: {
+        steps: true,
+        activeOn: { select: { eventTypeId: true } },
+        activeOnRoutingForms: { select: { routingFormId: true } },
       },
       skip,
       take,
@@ -59,11 +102,29 @@ export class WorkflowsRepository {
         timeUnit: TimeUnit.HOUR,
         teamId,
       },
-      include: { activeOn: true, steps: true },
+      include: { activeOn: true, steps: true, activeOnRoutingForms: true },
+    });
+  }
+
+  async updateRoutingFormTeamWorkflow(
+    user: UserWithProfile,
+    teamId: number,
+    workflowId: number,
+    data: TUpdateInputSchema
+  ) {
+    await updateWorkflow({
+      ctx: {
+        user: { ...user, locale: user?.locale ?? "en" },
+        prisma: this.dbWrite.prisma as unknown as PrismaClient,
+      },
+      input: data,
     });
+
+    const workflow = await this.getRoutingFormTeamWorkflowById(teamId, workflowId);
+    return workflow;
   }
 
-  async updateTeamWorkflow(
+  async updateEventTypeTeamWorkflow(
     user: UserWithProfile,
     teamId: number,
     workflowId: number,
@@ -77,7 +138,7 @@ export class WorkflowsRepository {
       input: data,
     });
 
-    const workflow = await this.getTeamWorkflowById(teamId, workflowId);
+    const workflow = await this.getEventTypeTeamWorkflowById(teamId, workflowId);
     return workflow;
   }
 }
diff --git a/apps/web/app/(booking-page-wrapper)/booking-successful/[uid]/page.tsx b/apps/web/app/(booking-page-wrapper)/booking-successful/[uid]/page.tsx
new file mode 100644
index 00000000000000..357918cb63b0fc
--- /dev/null
+++ b/apps/web/app/(booking-page-wrapper)/booking-successful/[uid]/page.tsx
@@ -0,0 +1,50 @@
+"use client";
+
+import { useParams } from "next/navigation";
+
+import dayjs from "@calcom/dayjs";
+import { DecoyBookingSuccessCard } from "@calcom/features/bookings/Booker/components/DecoyBookingSuccessCard";
+import { useDecoyBooking } from "@calcom/features/bookings/Booker/components/hooks/useDecoyBooking";
+
+export default function BookingSuccessful() {
+  const params = useParams();
+
+  const uid = params?.uid as string;
+  const bookingData = useDecoyBooking(uid);
+
+  if (!bookingData) {
+    return null;
+  }
+
+  const { booking } = bookingData;
+
+  // Format the data for the BookingSuccessCard
+  const startTime = booking.startTime ? dayjs(booking.startTime) : null;
+  const endTime = booking.endTime ? dayjs(booking.endTime) : null;
+  const timeZone = booking.booker?.timeZone || booking.host?.timeZone || dayjs.tz.guess();
+
+  const formattedDate = startTime ? startTime.tz(timeZone).format("dddd, MMMM D, YYYY") : "";
+  const formattedTime = startTime ? startTime.tz(timeZone).format("h:mm A") : "";
+  const formattedEndTime = endTime ? endTime.tz(timeZone).format("h:mm A") : "";
+  const formattedTimeZone = timeZone;
+
+  const hostName = booking.host?.name || null;
+  const hostEmail = null; // Email not stored for spam decoy bookings
+  const attendeeName = booking.booker?.name || null;
+  const attendeeEmail = booking.booker?.email || null;
+
+  return (
+    <DecoyBookingSuccessCard
+      title={booking.title || "Booking"}
+      formattedDate={formattedDate}
+      formattedTime={formattedTime}
+      endTime={formattedEndTime}
+      formattedTimeZone={formattedTimeZone}
+      hostName={hostName}
+      hostEmail={hostEmail}
+      attendeeName={attendeeName}
+      attendeeEmail={attendeeEmail}
+      location={booking.location || null}
+    />
+  );
+}
diff --git a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/pageWithCachedData.tsx b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/pageWithCachedData.tsx
index 1594ec72f7ebd7..73655d5c830232 100644
--- a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/pageWithCachedData.tsx
+++ b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/pageWithCachedData.tsx
@@ -10,7 +10,7 @@ import { getBookingForReschedule, type GetBookingType } from "@calcom/features/b
 import { getOrgFullOrigin, orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { getOrganizationSEOSettings } from "@calcom/features/ee/organizations/lib/orgSettings";
 import type { TeamData } from "@calcom/features/ee/teams/lib/getTeamData";
-import { shouldHideBrandingForTeamEvent } from "@calcom/lib/hideBranding";
+import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
 import { loadTranslations } from "@calcom/lib/server/i18n";
 import slugify from "@calcom/lib/slugify";
 import { BookingStatus, RedirectType } from "@calcom/prisma/enums";
diff --git a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts
index 759b76de20a8d8..fb608f3867d440 100644
--- a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts
+++ b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts
@@ -13,8 +13,8 @@ import { getTeamEventType } from "@calcom/features/eventtypes/lib/getTeamEventTy
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { SchedulingType } from "@calcom/prisma/enums";
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
index 3e2045682002e2..e9ae0e7de08f17 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx
@@ -6,9 +6,10 @@ import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { getScheduleListItemData } from "@calcom/lib/schedules/transformers/getScheduleListItemData";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router";
 
@@ -56,15 +57,7 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => {
   // This is because the data is cached and as a result the data is converted to a string
   const availabilities = {
     ...cachedAvailabilities,
-    schedules: cachedAvailabilities.schedules.map((schedule) => ({
-      ...schedule,
-      availability: schedule.availability.map((avail) => ({
-        ...avail,
-        startTime: new Date(avail.startTime),
-        endTime: new Date(avail.endTime),
-        date: avail.date ? new Date(avail.date) : null,
-      })),
-    })),
+    schedules: cachedAvailabilities.schedules.map((schedule) => getScheduleListItemData(schedule)),
   };
 
   const organizationId = session?.user?.profile?.organizationId ?? session?.user.org?.id;
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx
index 21379a8a6f07a6..dfb17af3eeb75b 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx
@@ -12,7 +12,7 @@ import { MembershipRole } from "@calcom/prisma/enums";
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
 import { validStatuses } from "~/bookings/lib/validStatuses";
-import BookingsList from "~/bookings/views/bookings-listing-view";
+import BookingsList from "~/bookings/views/bookings-view";
 
 const querySchema = z.object({
   status: z.enum(validStatuses),
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
index d17fa76c1ff60f..bca38f4981d2d8 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx
@@ -4,8 +4,8 @@ import { unstable_cache } from "next/cache";
 
 import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/apps/web/app/(use-page-wrapper)/apps/(homepage)/page.tsx b/apps/web/app/(use-page-wrapper)/apps/(homepage)/page.tsx
index bd18bbbdbb06b2..4eaa198fb4ab53 100644
--- a/apps/web/app/(use-page-wrapper)/apps/(homepage)/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/apps/(homepage)/page.tsx
@@ -3,7 +3,7 @@ import { cookies, headers } from "next/headers";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { AppCategories } from "@calcom/prisma/enums";
 
diff --git a/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx b/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx
index 8f00834918d63a..24667ec84398a7 100644
--- a/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx
@@ -6,7 +6,7 @@ import { redirect } from "next/navigation";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { APP_NAME } from "@calcom/lib/constants";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";
 
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
index b8c4ee8a0578f3..fb9f4cd6c93192 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
@@ -5,7 +5,7 @@ import { z } from "zod";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
 const orgIdSchema = z.object({ id: z.coerce.number() });
 
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
index 4114e904cfda7f..b28763d847b2ed 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
@@ -5,7 +5,7 @@ import { z } from "zod";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { UsersEditView } from "@calcom/features/ee/users/pages/users-edit-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 const userIdSchema = z.object({ id: z.coerce.number() });
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
index 792ec1f01bd1a7..43190417291565 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
@@ -98,7 +98,7 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
             ]
           : []),
         {
-          name: "privacy",
+          name: "privacy_and_security",
           href: "/settings/organizations/privacy",
         },
 
@@ -170,7 +170,14 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
 // The following keys are assigned to admin only
 const adminRequiredKeys = ["admin"];
 const organizationRequiredKeys = ["organization"];
-const organizationAdminKeys = ["privacy", "OAuth Clients", "SSO", "directory_sync", "delegation_credential"];
+const organizationAdminKeys = [
+  "privacy",
+  "privacy_and_security",
+  "OAuth Clients",
+  "SSO",
+  "directory_sync",
+  "delegation_credential",
+];
 
 export interface SettingsPermissions {
   canViewRoles?: boolean;
@@ -221,8 +228,7 @@ const useTabs = ({
           });
         }
 
-        // Add pbac menu item only if feature flag is enabled AND user has permission to view roles
-        // This prevents showing the menu item when user has no organization permissions
+        // Add pbac menu item - show opt-in page if not enabled, regular page if enabled
         if (isPbacEnabled) {
           if (permissions?.canViewRoles) {
             newArray.push({
@@ -244,6 +250,14 @@ const useTabs = ({
               href: "/settings/organizations/billing",
             });
           }
+          // Show roles page (modal will appear if PBAC not enabled)
+          if (permissions?.canUpdateOrganization) {
+            newArray.push({
+              name: "roles",
+              href: "/settings/organizations/roles",
+              isBadged: true, // Show "New" badge
+            });
+          }
         }
 
         return {
@@ -604,17 +618,23 @@ const SettingsSidebarContainer = ({
                   </div>
                   <div className="my-3 space-y-px">
                     {tab.children?.map((child, index) => (
-                      <VerticalTabItem
-                        key={child.href}
-                        name={t(child.name)}
-                        isExternalLink={child.isExternalLink}
-                        href={child.href || "/"}
-                        textClassNames="text-emphasis font-medium text-sm"
-                        className={`me-5 h-7 w-auto !px-2 ${
-                          tab.children && index === tab.children?.length - 1 && "!mb-3"
-                        }`}
-                        disableChevron
-                      />
+                      <div key={child.href} className="flex items-start gap-2">
+                        <VerticalTabItem
+                          name={t(child.name)}
+                          isExternalLink={child.isExternalLink}
+                          href={child.href || "/"}
+                          textClassNames="text-emphasis font-medium text-sm"
+                          className={`h-7 w-fit !px-2 ${
+                            tab.children && index === tab.children?.length - 1 && "!mb-3"
+                          }`}
+                          disableChevron
+                        />
+                        {child.isBadged && (
+                          <Badge variant="blue" className="mt-0.5 text-xs">
+                            New
+                          </Badge>
+                        )}
+                      </div>
                     ))}
                   </div>
                 </React.Fragment>
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
index 173de93ab2ea6e..c161793e881fc6 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
@@ -4,7 +4,7 @@ import { getTranslate, _generateMetadata } from "app/_utils";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view";
 import { APP_NAME } from "@calcom/lib/constants";
-import { WebhookRepository } from "@calcom/lib/server/repository/webhook";
+import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";
 
 export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
   await _generateMetadata(
@@ -20,7 +20,8 @@ const Page = async ({ params: _params }: PageProps) => {
   const params = await _params;
   const id = typeof params?.id === "string" ? params.id : undefined;
 
-  const webhook = await WebhookRepository.findByWebhookId(id);
+  const webhookRepository = WebhookRepository.getInstance();
+  const webhook = await webhookRepository.findByWebhookId(id);
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
index 87496b1e5a8c63..b106939634a862 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
@@ -53,16 +53,23 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
   // For now we only grab organization features but it would be nice to fetch these on the server side for specific team feature flags
   if (orgId) {
     const isOrgAdminOrOwner = checkAdminOrOwner(session.user.org?.role);
-    const [features, rolePermissions, organizationPermissions] = await Promise.all([
-      getTeamFeatures(orgId),
-      getCachedResourcePermissions(userId, orgId, Resource.Role),
-      getCachedResourcePermissions(userId, orgId, Resource.Organization),
-    ]);
+    const features = await getTeamFeatures(orgId);
 
     if (features) {
       teamFeatures = {
         [orgId]: features,
       };
+    }
+
+    // Check if PBAC feature is enabled
+    const isPbacEnabled = features?.pbac === true;
+
+    if (isPbacEnabled) {
+      // Only fetch and apply PBAC permissions if the feature is enabled
+      const [rolePermissions, organizationPermissions] = await Promise.all([
+        getCachedResourcePermissions(userId, orgId, Resource.Role),
+        getCachedResourcePermissions(userId, orgId, Resource.Organization),
+      ]);
 
       // Check if user has permission to read roles
       const roleActions = PermissionMapper.toActionMap(rolePermissions, Resource.Role);
@@ -71,7 +78,8 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
       canViewOrganizationBilling = orgActions[CustomAction.ManageBilling] ?? isOrgAdminOrOwner;
       canUpdateOrganization = orgActions[CrudAction.Update] ?? isOrgAdminOrOwner;
     } else {
-      canViewRoles = false;
+      // Fall back to legacy permissions when PBAC is not enabled or features not loaded
+      canViewRoles = features ? isOrgAdminOrOwner : false;
       canViewOrganizationBilling = isOrgAdminOrOwner;
       canUpdateOrganization = isOrgAdminOrOwner;
     }
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
index 8200641230a743..641e9be469d2b1 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx
@@ -11,7 +11,7 @@ import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
-    (t) => t("privacy"),
+    (t) => t("privacy_and_security"),
     (t) => t("privacy_organization_description"),
     undefined,
     undefined,
@@ -19,9 +19,8 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const t = await getTranslate();
-
   const session = await validateUserHasOrg();
+  const t = await getTranslate();
 
   if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {
     return redirect("/settings/profile");
@@ -42,13 +41,31 @@ const Page = async () => {
     },
   });
 
+  const watchlistPermissions = await getResourcePermissions({
+    userId: session.user.id,
+    teamId: session.user.profile.organizationId,
+    resource: Resource.Watchlist,
+    userRole: session.user.org.role,
+    fallbackRoles: {
+      read: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+      create: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+      delete: {
+        roles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      },
+    },
+  });
+
   if (!canRead) {
     return redirect("/settings/profile");
   }
 
   return (
-    <SettingsHeader title={t("privacy")} description={t("privacy_organization_description")}>
-      <PrivacyView permissions={{ canRead, canEdit }} />
+    <SettingsHeader title={t("privacy_and_security")} description={t("privacy_organization_description")}>
+      <PrivacyView permissions={{ canRead, canEdit }} watchlistPermissions={watchlistPermissions} />
     </SettingsHeader>
   );
 };
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/FingerprintAnimation.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/FingerprintAnimation.tsx
new file mode 100644
index 00000000000000..da28eb661f9d74
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/FingerprintAnimation.tsx
@@ -0,0 +1,63 @@
+"use client";
+
+import { motion } from "framer-motion";
+
+interface FingerprintAnimationProps {
+  isHovered: boolean;
+}
+
+export function FingerprintAnimation({ isHovered }: FingerprintAnimationProps) {
+  return (
+    <div className="size-32 relative mx-auto flex aspect-square rounded-full border before:absolute before:-inset-2 before:rounded-full before:border dark:border-white/10 dark:before:border-white/5">
+      <svg className="m-auto h-fit w-24" viewBox="0 0 212 143" fill="none" xmlns="http://www.w3.org/2000/svg">
+        {/*Fingerprint*/}
+        <path
+          className="text-subtle"
+          d="M44.0209 55.3542C43.1945 54.7639 42.6916 54.0272 42.5121 53.1442C42.3327 52.2611 42.5995 51.345 43.3125 50.3958C50.632 40.3611 59.812 32.5694 70.8525 27.0208C81.8931 21.4722 93.668 18.6979 106.177 18.6979C118.691 18.6979 130.497 21.3849 141.594 26.7587C152.691 32.1326 161.958 39.8936 169.396 50.0417C170.222 51.1042 170.489 52.0486 170.196 52.875C169.904 53.7014 169.401 54.4097 168.688 55C167.979 55.5903 167.153 55.8571 166.208 55.8004C165.264 55.7437 164.438 55.2408 163.729 54.2917C157.236 45.0833 148.885 38.0307 138.675 33.1337C128.466 28.2368 117.633 25.786 106.177 25.7812C94.7257 25.7812 83.9827 28.2321 73.948 33.1337C63.9132 38.0354 55.5903 45.0881 48.9792 54.2917C48.2709 55.3542 47.4445 55.9444 46.5 56.0625C45.5556 56.1806 44.7292 55.9444 44.0209 55.3542ZM126.188 142.656C113.91 139.587 103.875 133.476 96.0834 124.325C88.2917 115.173 84.3959 103.988 84.3959 90.7708C84.3959 84.8681 86.5209 79.9097 90.7709 75.8958C95.0209 71.8819 100.156 69.875 106.177 69.875C112.198 69.875 117.333 71.8819 121.583 75.8958C125.833 79.9097 127.958 84.8681 127.958 90.7708C127.958 94.6667 129.434 97.9439 132.385 100.602C135.337 103.261 138.819 104.588 142.833 104.583C146.847 104.583 150.271 103.256 153.104 100.602C155.938 97.9486 157.354 94.6714 157.354 90.7708C157.354 77.0764 152.337 65.566 142.302 56.2396C132.267 46.9132 120.285 42.25 106.354 42.25C92.4237 42.25 80.441 46.9132 70.4063 56.2396C60.3716 65.566 55.3542 77.0174 55.3542 90.5937C55.3542 93.4271 55.621 96.9687 56.1546 101.219C56.6882 105.469 57.9562 110.427 59.9584 116.094C60.3125 117.156 60.2842 118.101 59.8734 118.927C59.4625 119.753 58.7825 120.344 57.8334 120.698C56.8889 121.052 55.9752 121.024 55.0921 120.613C54.2091 120.202 53.5881 119.522 53.2292 118.573C51.4584 113.969 50.1905 109.395 49.4255 104.853C48.6605 100.31 48.2756 95.6158 48.2709 90.7708C48.2709 75.0694 53.9682 61.9062 65.363 51.2812C76.7577 40.6562 90.3624 35.3437 106.177 35.3437C122.115 35.3437 135.809 40.6562 147.26 51.2812C158.712 61.9062 164.438 75.0694 164.438 90.7708C164.438 96.6736 162.343 101.601 158.155 105.554C153.966 109.506 148.859 111.485 142.833 111.49C136.813 111.49 131.649 109.513 127.342 105.561C123.035 101.608 120.88 96.6783 120.875 90.7708C120.875 86.875 119.43 83.5978 116.54 80.9392C113.65 78.2805 110.196 76.9536 106.177 76.9583C102.163 76.9583 98.7089 78.2876 95.8142 80.9462C92.9195 83.6049 91.4745 86.8797 91.4792 90.7708C91.4792 102.222 94.8745 111.785 101.665 119.458C108.456 127.132 117.22 132.503 127.958 135.573C129.021 135.927 129.729 136.517 130.083 137.344C130.438 138.17 130.497 139.056 130.26 140C130.024 140.826 129.552 141.535 128.844 142.125C128.135 142.715 127.25 142.892 126.188 142.656ZM67.0417 18.3437C66.0973 18.934 65.1528 19.0828 64.2084 18.79C63.2639 18.4972 62.5556 17.8762 62.0834 16.9271C61.6112 15.9826 61.4931 15.1279 61.7292 14.3629C61.9653 13.5979 62.5556 12.9179 63.5 12.3229C70.1112 8.78125 77.0174 6.06597 84.2188 4.17708C91.4202 2.28819 98.7396 1.34375 106.177 1.34375C113.733 1.34375 121.111 2.25986 128.313 4.09208C135.514 5.92431 142.479 8.54986 149.208 11.9687C150.271 12.559 150.892 13.2674 151.071 14.0937C151.251 14.9201 151.161 15.7465 150.802 16.5729C150.448 17.3993 149.858 18.0486 149.031 18.5208C148.205 18.9931 147.201 18.934 146.021 18.3437C139.764 15.1563 133.299 12.7078 126.627 10.9983C119.954 9.28889 113.138 8.43181 106.177 8.42708C99.3299 8.42708 92.6007 9.22514 85.9896 10.8212C79.3785 12.4174 73.0625 14.9249 67.0417 18.3437ZM87.9375 140.177C80.9723 132.858 75.6314 125.392 71.915 117.78C68.1987 110.167 66.3381 101.164 66.3334 90.7708C66.3334 80.0278 70.2292 70.9658 78.0209 63.585C85.8125 56.2042 95.198 52.5161 106.177 52.5208C117.156 52.5208 126.601 56.2112 134.51 63.5921C142.42 70.9729 146.375 80.0325 146.375 90.7708C146.375 91.8333 146.052 92.6904 145.405 93.3421C144.758 93.9937 143.901 94.3172 142.833 94.3125C141.889 94.3125 141.063 93.989 140.354 93.3421C139.646 92.6951 139.292 91.8381 139.292 90.7708C139.292 81.9167 136.014 74.5099 129.46 68.5504C122.906 62.591 115.145 59.6089 106.177 59.6042C97.2049 59.6042 89.503 62.5862 83.0713 68.5504C76.6396 74.5146 73.4214 81.9214 73.4167 90.7708C73.4167 100.333 75.0695 108.451 78.375 115.123C81.6806 121.796 86.5209 128.494 92.8959 135.219C93.6042 135.927 93.9584 136.753 93.9584 137.698C93.9584 138.642 93.6042 139.469 92.8959 140.177C92.1875 140.885 91.3612 141.24 90.4167 141.24C89.4723 141.24 88.6459 140.885 87.9375 140.177ZM141.417 128.135C130.91 128.135 121.789 124.594 114.054 117.51C106.319 110.427 102.454 101.514 102.458 90.7708C102.458 89.8264 102.784 89 103.436 88.2917C104.088 87.5833 104.942 87.2292 106 87.2292C107.063 87.2292 107.92 87.5833 108.571 88.2917C109.223 89 109.546 89.8264 109.542 90.7708C109.542 99.625 112.729 106.885 119.104 112.552C125.479 118.219 132.917 121.052 141.417 121.052C142.125 121.052 143.129 120.993 144.427 120.875C145.726 120.757 147.083 120.58 148.5 120.344C149.563 120.108 150.479 120.256 151.248 120.79C152.018 121.324 152.519 122.119 152.75 123.177C152.986 124.122 152.809 124.948 152.219 125.656C151.629 126.365 150.861 126.837 149.917 127.073C147.792 127.663 145.934 127.989 144.342 128.05C142.751 128.112 141.776 128.14 141.417 128.135Z"
+          fill="currentColor"
+        />
+        {/*Clip path to contain animated scanning line*/}
+        <g clipPath="url(#clip0_0_1)">
+          <path
+            d="M44.0209 55.3542C43.1945 54.7639 42.6916 54.0272 42.5121 53.1442C42.3327 52.2611 42.5995 51.345 43.3125 50.3958C50.632 40.3611 59.812 32.5694 70.8525 27.0208C81.8931 21.4722 93.668 18.6979 106.177 18.6979C118.691 18.6979 130.497 21.3849 141.594 26.7587C152.691 32.1326 161.958 39.8936 169.396 50.0417C170.222 51.1042 170.489 52.0486 170.196 52.875C169.904 53.7014 169.401 54.4097 168.688 55C167.979 55.5903 167.153 55.8571 166.208 55.8004C165.264 55.7437 164.438 55.2408 163.729 54.2917C157.236 45.0833 148.885 38.0307 138.675 33.1337C128.466 28.2368 117.633 25.786 106.177 25.7812C94.7257 25.7812 83.9827 28.2321 73.948 33.1337C63.9132 38.0354 55.5903 45.0881 48.9792 54.2917C48.2709 55.3542 47.4445 55.9444 46.5 56.0625C45.5556 56.1806 44.7292 55.9444 44.0209 55.3542ZM126.188 142.656C113.91 139.587 103.875 133.476 96.0834 124.325C88.2917 115.173 84.3959 103.988 84.3959 90.7708C84.3959 84.8681 86.5209 79.9097 90.7709 75.8958C95.0209 71.8819 100.156 69.875 106.177 69.875C112.198 69.875 117.333 71.8819 121.583 75.8958C125.833 79.9097 127.958 84.8681 127.958 90.7708C127.958 94.6667 129.434 97.9439 132.385 100.602C135.337 103.261 138.819 104.588 142.833 104.583C146.847 104.583 150.271 103.256 153.104 100.602C155.938 97.9486 157.354 94.6714 157.354 90.7708C157.354 77.0764 152.337 65.566 142.302 56.2396C132.267 46.9132 120.285 42.25 106.354 42.25C92.4237 42.25 80.441 46.9132 70.4063 56.2396C60.3716 65.566 55.3542 77.0174 55.3542 90.5937C55.3542 93.4271 55.621 96.9687 56.1546 101.219C56.6882 105.469 57.9562 110.427 59.9584 116.094C60.3125 117.156 60.2842 118.101 59.8734 118.927C59.4625 119.753 58.7825 120.344 57.8334 120.698C56.8889 121.052 55.9752 121.024 55.0921 120.613C54.2091 120.202 53.5881 119.522 53.2292 118.573C51.4584 113.969 50.1905 109.395 49.4255 104.853C48.6605 100.31 48.2756 95.6158 48.2709 90.7708C48.2709 75.0694 53.9682 61.9062 65.363 51.2812C76.7577 40.6562 90.3624 35.3437 106.177 35.3437C122.115 35.3437 135.809 40.6562 147.26 51.2812C158.712 61.9062 164.438 75.0694 164.438 90.7708C164.438 96.6736 162.343 101.601 158.155 105.554C153.966 109.506 148.859 111.485 142.833 111.49C136.813 111.49 131.649 109.513 127.342 105.561C123.035 101.608 120.88 96.6783 120.875 90.7708C120.875 86.875 119.43 83.5978 116.54 80.9392C113.65 78.2805 110.196 76.9536 106.177 76.9583C102.163 76.9583 98.7089 78.2876 95.8142 80.9462C92.9195 83.6049 91.4745 86.8797 91.4792 90.7708C91.4792 102.222 94.8745 111.785 101.665 119.458C108.456 127.132 117.22 132.503 127.958 135.573C129.021 135.927 129.729 136.517 130.083 137.344C130.438 138.17 130.497 139.056 130.26 140C130.024 140.826 129.552 141.535 128.844 142.125C128.135 142.715 127.25 142.892 126.188 142.656ZM67.0417 18.3437C66.0973 18.934 65.1528 19.0828 64.2084 18.79C63.2639 18.4972 62.5556 17.8762 62.0834 16.9271C61.6112 15.9826 61.4931 15.1279 61.7292 14.3629C61.9653 13.5979 62.5556 12.9179 63.5 12.3229C70.1112 8.78125 77.0174 6.06597 84.2188 4.17708C91.4202 2.28819 98.7396 1.34375 106.177 1.34375C113.733 1.34375 121.111 2.25986 128.313 4.09208C135.514 5.92431 142.479 8.54986 149.208 11.9687C150.271 12.559 150.892 13.2674 151.071 14.0937C151.251 14.9201 151.161 15.7465 150.802 16.5729C150.448 17.3993 149.858 18.0486 149.031 18.5208C148.205 18.9931 147.201 18.934 146.021 18.3437C139.764 15.1563 133.299 12.7078 126.627 10.9983C119.954 9.28889 113.138 8.43181 106.177 8.42708C99.3299 8.42708 92.6007 9.22514 85.9896 10.8212C79.3785 12.4174 73.0625 14.9249 67.0417 18.3437ZM87.9375 140.177C80.9723 132.858 75.6314 125.392 71.915 117.78C68.1987 110.167 66.3381 101.164 66.3334 90.7708C66.3334 80.0278 70.2292 70.9658 78.0209 63.585C85.8125 56.2042 95.198 52.5161 106.177 52.5208C117.156 52.5208 126.601 56.2112 134.51 63.5921C142.42 70.9729 146.375 80.0325 146.375 90.7708C146.375 91.8333 146.052 92.6904 145.405 93.3421C144.758 93.9937 143.901 94.3172 142.833 94.3125C141.889 94.3125 141.063 93.989 140.354 93.3421C139.646 92.6951 139.292 91.8381 139.292 90.7708C139.292 81.9167 136.014 74.5099 129.46 68.5504C122.906 62.591 115.145 59.6089 106.177 59.6042C97.2049 59.6042 89.503 62.5862 83.0713 68.5504C76.6396 74.5146 73.4214 81.9214 73.4167 90.7708C73.4167 100.333 75.0695 108.451 78.375 115.123C81.6806 121.796 86.5209 128.494 92.8959 135.219C93.6042 135.927 93.9584 136.753 93.9584 137.698C93.9584 138.642 93.6042 139.469 92.8959 140.177C92.1875 140.885 91.3612 141.24 90.4167 141.24C89.4723 141.24 88.6459 140.885 87.9375 140.177ZM141.417 128.135C130.91 128.135 121.789 124.594 114.054 117.51C106.319 110.427 102.454 101.514 102.458 90.7708C102.458 89.8264 102.784 89 103.436 88.2917C104.088 87.5833 104.942 87.2292 106 87.2292C107.063 87.2292 107.92 87.5833 108.571 88.2917C109.223 89 109.546 89.8264 109.542 90.7708C109.542 99.625 112.729 106.885 119.104 112.552C125.479 118.219 132.917 121.052 141.417 121.052C142.125 121.052 143.129 120.993 144.427 120.875C145.726 120.757 147.083 120.58 148.5 120.344C149.563 120.108 150.479 120.256 151.248 120.79C152.018 121.324 152.519 122.119 152.75 123.177C152.986 124.122 152.809 124.948 152.219 125.656C151.629 126.365 150.861 126.837 149.917 127.073C147.792 127.663 145.934 127.989 144.342 128.05C142.751 128.112 141.776 128.14 141.417 128.135Z"
+            fill="url(#paint0_linear_0_1)"
+          />
+        </g>
+
+        {/* Animated scanning line */}
+        <motion.path
+          className="text-emphasis"
+          d="M48 0H164"
+          stroke="currentColor"
+          strokeWidth="6"
+          strokeLinecap="round"
+          animate={{
+            y: isHovered ? [0, 140, 0] : 0,
+            opacity: isHovered ? [0.3, 1, 0.3] : 0,
+          }}
+          transition={{
+            duration: 2.5,
+            repeat: isHovered ? Infinity : 0,
+            ease: "easeInOut",
+          }}
+        />
+
+        <defs>
+          <linearGradient
+            id="paint0_linear_0_1"
+            x1="106.385"
+            y1="1.34375"
+            x2="106"
+            y2="72"
+            gradientUnits="userSpaceOnUse">
+            <stop stopColor="white" stopOpacity="0" />
+            <stop className="text-emphasis" offset="1" stopColor="currentColor" />
+          </linearGradient>
+          <clipPath id="clip0_0_1">
+            <rect width="129" height="72" fill="white" transform="translate(41)" />
+          </clipPath>
+        </defs>
+      </svg>
+    </div>
+  );
+}
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInModal.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInModal.tsx
new file mode 100644
index 00000000000000..efaea7790382bf
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInModal.tsx
@@ -0,0 +1,129 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+
+import { FingerprintAnimation } from "./FingerprintAnimation";
+
+interface PbacOptInModalProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  revalidateRolesPath: () => Promise<void>;
+}
+
+export function PbacOptInModal({ open, onOpenChange, revalidateRolesPath }: PbacOptInModalProps) {
+  const router = useRouter();
+  const { t } = useLocale();
+  const [isButtonHovered, setIsButtonHovered] = useState(false);
+
+  const enablePbacMutation = trpc.viewer.pbac.enablePbac.useMutation({
+    onSuccess: async () => {
+      showToast(t("pbac_enabled_success"), "success");
+      await revalidateRolesPath();
+      onOpenChange(false);
+      router.refresh();
+    },
+    onError: (error) => {
+      showToast(error.message || t("pbac_enabled_error"), "error");
+    },
+  });
+
+  const handleOptIn = () => {
+    enablePbacMutation.mutate();
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        enableOverflow
+        type={undefined}
+        className="max-w-[468px] p-6"
+        preventCloseOnOutsideClick={true}>
+        <div className="flex flex-col items-center gap-8">
+          <div className="flex w-full flex-col items-center gap-6">
+            <FingerprintAnimation isHovered={isButtonHovered} />
+
+            <div className="flex w-full flex-col items-center gap-1 text-center">
+              <h2 className="font-cal text-emphasis text-xl font-semibold">{t("pbac_opt_in_title")}</h2>
+              <p className="text-default text-sm">{t("pbac_opt_in_description")}</p>
+            </div>
+          </div>
+
+          <div className="bg-subtle w-full space-y-px overflow-hidden rounded-xl border border-gray-200">
+            <div className="bg-default flex gap-3 p-3">
+              <div className="bg-subtle flex h-8 w-8 shrink-0 items-center justify-center rounded-md">
+                <Icon name="shield-check" className="text-subtle h-5 w-5" />
+              </div>
+              <div className="flex flex-col gap-1">
+                <p className="text-emphasis text-sm font-semibold">{t("pbac_opt_in_custom_roles_title")}</p>
+                <p className="text-subtle text-sm">{t("pbac_opt_in_custom_roles_desc")}</p>
+              </div>
+            </div>
+
+            <div className="bg-default flex gap-3 p-3">
+              <div className="bg-subtle flex h-8 w-8 shrink-0 items-center justify-center rounded-md">
+                <Icon name="lock" className="text-subtle h-5 w-5" />
+              </div>
+              <div className="flex flex-col gap-1">
+                <p className="text-emphasis text-sm font-semibold">
+                  {t("pbac_opt_in_granular_permissions_title")}
+                </p>
+                <p className="text-subtle text-sm">{t("pbac_opt_in_granular_permissions_desc")}</p>
+              </div>
+            </div>
+
+            <div className="bg-default flex gap-3 p-3">
+              <div className="bg-subtle flex h-8 w-8 shrink-0 items-center justify-center rounded-md">
+                <Icon name="users" className="text-subtle h-5 w-5" />
+              </div>
+              <div className="flex flex-col gap-1">
+                <p className="text-emphasis text-sm font-semibold">
+                  {t("pbac_opt_in_team_assignment_title")}
+                </p>
+                <p className="text-subtle text-sm">{t("pbac_opt_in_team_assignment_desc")}</p>
+              </div>
+            </div>
+
+            <div className="bg-default flex gap-3 p-3">
+              <div className="bg-subtle flex h-8 w-8 shrink-0 items-center justify-center rounded-md">
+                <Icon name="shield" className="text-subtle h-5 w-5" />
+              </div>
+              <div className="flex flex-col gap-1">
+                <p className="text-emphasis text-sm font-semibold">
+                  {t("pbac_opt_in_enhanced_security_title")}
+                </p>
+                <p className="text-subtle text-sm">{t("pbac_opt_in_enhanced_security_desc")}</p>
+              </div>
+            </div>
+          </div>
+
+          <div className="flex w-full flex-col-reverse gap-2 sm:flex-row">
+            <Button
+              color="secondary"
+              onClick={() => onOpenChange(false)}
+              disabled={enablePbacMutation.isPending}
+              className="w-full justify-center sm:w-1/4">
+              {t("cancel")}
+            </Button>
+            <Button
+              onClick={handleOptIn}
+              loading={enablePbacMutation.isPending}
+              className="w-full justify-center sm:w-3/4"
+              EndIcon="arrow-right"
+              onMouseEnter={() => setIsButtonHovered(true)}
+              onMouseLeave={() => setIsButtonHovered(false)}>
+              {t("pbac_opt_in_enable_button")}
+            </Button>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx
new file mode 100644
index 00000000000000..b5031379aa43d9
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { useState } from "react";
+
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+import { PbacOptInModal } from "./PbacOptInModal";
+import { RolesList } from "./RolesList";
+
+type Role = {
+  id: string;
+  name: string;
+  description?: string;
+  teamId?: number;
+  color?: string;
+  createdAt: Date;
+  updatedAt: Date;
+  type: "SYSTEM" | "CUSTOM";
+  permissions: {
+    id: string;
+    resource: string;
+    action: string;
+  }[];
+};
+
+interface PbacOptInViewProps {
+  revalidateRolesPath: () => Promise<void>;
+  systemRoles: Role[];
+  teamId: number;
+}
+
+export function PbacOptInView({ revalidateRolesPath, systemRoles, teamId }: PbacOptInViewProps) {
+  const [open, setOpen] = useState(true);
+  const { t } = useLocale();
+
+  return (
+    <>
+      <SettingsHeader
+        title={t("roles_and_permissions")}
+        description={t("roles_and_permissions_description")}
+        borderInShellHeader={false}
+        CTA={null}>
+        <RolesList
+          teamId={teamId}
+          roles={systemRoles}
+          permissions={{
+            canCreate: false,
+            canRead: true,
+            canUpdate: false,
+            canDelete: false,
+          }}
+          isPrivate={false}
+        />
+      </SettingsHeader>
+      <PbacOptInModal open={open} onOpenChange={setOpen} revalidateRolesPath={revalidateRolesPath} />
+    </>
+  );
+}
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx
index 97a0382843a269..dcd08c327e1da6 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx
@@ -1,6 +1,7 @@
 import { _generateMetadata, getTranslate } from "app/_utils";
 import { unstable_cache } from "next/cache";
 import { notFound } from "next/navigation";
+import { revalidatePath } from "next/cache";
 
 import type { AppFlags } from "@calcom/features/flags/config";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
@@ -13,6 +14,7 @@ import { prisma } from "@calcom/prisma";
 
 import { validateUserHasOrg } from "../actions/validateUserHasOrg";
 import { CreateRoleCTA } from "./_components/CreateRoleCta";
+import { PbacOptInView } from "./_components/PbacOptInView";
 import { RolesList } from "./_components/RolesList";
 import { roleSearchParamsCache } from "./_components/searchParams";
 
@@ -65,6 +67,11 @@ export const generateMetadata = async () =>
     "/settings/organizations/roles"
   );
 
+async function revalidateRolesPath() {
+  "use server";
+  revalidatePath("/settings/organizations/roles");
+}
+
 const Page = async ({ searchParams }: { searchParams: Record<string, string | string[] | undefined> }) => {
   const t = await getTranslate();
   const session = await validateUserHasOrg();
@@ -76,7 +83,18 @@ const Page = async ({ searchParams }: { searchParams: Record<string, string | st
   const teamHasPBACFeature = await getCachedTeamFeature(session.user.org.id, "pbac");
 
   if (!teamHasPBACFeature) {
-    return notFound();
+    // Get system roles for preview
+    const roleService = new RoleService();
+    const systemRoles = (await roleService.getTeamRoles(session.user.org.id)).filter(
+      (role) => role.type === "SYSTEM"
+    );
+    return (
+      <PbacOptInView
+        revalidateRolesPath={revalidateRolesPath}
+        systemRoles={systemRoles}
+        teamId={session.user.org.id}
+      />
+    );
   }
 
   roleSearchParamsCache.parse(searchParams);
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx
index d8cee42e1e1fb7..9160d5d47b6bcc 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx
@@ -3,7 +3,7 @@ import { redirect } from "next/navigation";
 
 import { OtherTeamsListing } from "@calcom/features/ee/organizations/pages/components/OtherTeamsListing";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
 import { validateUserHasOrg } from "../../../actions/validateUserHasOrg";
 
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
new file mode 100644
index 00000000000000..3f4153df16f768
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx
@@ -0,0 +1,22 @@
+import { _generateMetadata } from "app/_utils";
+
+import ResumeOnboardingPage, { LayoutWrapper } from "~/settings/organizations/new/resume-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("resume_onboarding"),
+    (t) => t("resume_onboarding_description"),
+    undefined,
+    undefined,
+    "/settings/organizations/new/resume"
+  );
+
+const ServerPage = async () => {
+  return (
+    <LayoutWrapper>
+      <ResumeOnboardingPage />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx b/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
index bbfb461dd2dd33..18507908fc9f3e 100644
--- a/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
@@ -5,7 +5,7 @@ import { cookies, headers } from "next/headers";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
diff --git a/apps/web/app/(use-page-wrapper)/workflows/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
index cca1bd675053f2..1601dee104d820 100644
--- a/apps/web/app/(use-page-wrapper)/workflows/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
@@ -2,7 +2,7 @@
 // import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 // import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 // import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
-// import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+// import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import LegacyPage from "@calcom/features/ee/workflows/pages/index";
 
 const Page = async () => {
diff --git a/apps/web/app/api/availability/calendar/route.ts b/apps/web/app/api/availability/calendar/route.ts
index e0a6bdca532578..2ac9b534e0ff76 100644
--- a/apps/web/app/api/availability/calendar/route.ts
+++ b/apps/web/app/api/availability/calendar/route.ts
@@ -10,7 +10,7 @@ import { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/
 import { HttpError } from "@calcom/lib/http-error";
 import notEmpty from "@calcom/lib/notEmpty";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
diff --git a/apps/web/app/api/cancel/route.ts b/apps/web/app/api/cancel/route.ts
index 46da34f7e7d1da..c2eaabc8e52817 100644
--- a/apps/web/app/api/cancel/route.ts
+++ b/apps/web/app/api/cancel/route.ts
@@ -26,11 +26,20 @@ async function handler(req: NextRequest) {
   cookieStore.delete("calcom.csrf_token");
 
   const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
+
   const result = await handleCancelBooking({
     bookingData,
     userId: session?.user?.id || -1,
   });
 
+  // const bookingCancelService = getBookingCancelService();
+  // const result = await bookingCancelService.cancelBooking({
+  //   bookingData: bookingData,
+  //   bookingMeta: {
+  //     userId: session?.user?.id || -1,
+  //   },
+  // });
+
   const statusCode = result.success ? 200 : 400;
 
   return NextResponse.json(result, { status: statusCode });
diff --git a/apps/web/app/api/cron/calendar-subscriptions/route.ts b/apps/web/app/api/cron/calendar-subscriptions/route.ts
index 9de6a7353a584d..bd3e07fda64345 100644
--- a/apps/web/app/api/cron/calendar-subscriptions/route.ts
+++ b/apps/web/app/api/cron/calendar-subscriptions/route.ts
@@ -8,7 +8,7 @@ import { CalendarCacheEventService } from "@calcom/features/calendar-subscriptio
 import { CalendarSyncService } from "@calcom/features/calendar-subscription/lib/sync/CalendarSyncService";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/SelectedCalendarRepository";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import { defaultResponderForAppDir } from "@calcom/web/app/api/defaultResponderForAppDir";
 
diff --git a/apps/web/app/api/cron/credentials/route.ts b/apps/web/app/api/cron/credentials/route.ts
index c771e4ec8152b0..1ce4dc1ef86446 100644
--- a/apps/web/app/api/cron/credentials/route.ts
+++ b/apps/web/app/api/cron/credentials/route.ts
@@ -6,11 +6,11 @@
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
 
 import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";
 
diff --git a/apps/web/app/api/cron/selected-calendars/route.ts b/apps/web/app/api/cron/selected-calendars/route.ts
index b311a63dbe02c8..22a91932c4fb74 100644
--- a/apps/web/app/api/cron/selected-calendars/route.ts
+++ b/apps/web/app/api/cron/selected-calendars/route.ts
@@ -12,7 +12,7 @@ import { findUniqueDelegationCalendarCredential } from "@calcom/app-store/delega
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
 import type { Ensure } from "@calcom/types/utils";
diff --git a/apps/web/app/api/recorded-daily-video/route.ts b/apps/web/app/api/recorded-daily-video/route.ts
index b7ab18df15b282..c968a8eadb0712 100644
--- a/apps/web/app/api/recorded-daily-video/route.ts
+++ b/apps/web/app/api/recorded-daily-video/route.ts
@@ -17,7 +17,7 @@ import { safeStringify } from "@calcom/lib/safeStringify";
 import {
   getAllTranscriptsAccessLinkFromMeetingId,
   submitBatchProcessorTranscriptionJob,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
 import { generateVideoToken } from "@calcom/lib/videoTokens";
 import prisma from "@calcom/prisma";
 import { getBooking } from "@calcom/web/lib/daily-webhook/getBooking";
diff --git a/apps/web/app/api/support/conversation/route.ts b/apps/web/app/api/support/conversation/route.ts
index 671bd39b27da2c..5df9f5fe3dffda 100644
--- a/apps/web/app/api/support/conversation/route.ts
+++ b/apps/web/app/api/support/conversation/route.ts
@@ -9,8 +9,8 @@ import { intercom } from "@calcom/features/ee/support/lib/intercom/intercom";
 import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
diff --git a/apps/web/app/api/teams/api/create/route.ts b/apps/web/app/api/teams/api/create/route.ts
index 670fd044b5730b..9699897de7a077 100644
--- a/apps/web/app/api/teams/api/create/route.ts
+++ b/apps/web/app/api/teams/api/create/route.ts
@@ -5,6 +5,7 @@ import type Stripe from "stripe";
 import { z } from "zod";
 
 import { Plan, SubscriptionStatus } from "@calcom/features/ee/billing/repository/IBillingRepository";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { InternalTeamBilling } from "@calcom/features/ee/billing/teams/internal-team-billing";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { HttpError } from "@calcom/lib/http-error";
@@ -57,6 +58,9 @@ async function handler(request: NextRequest) {
     });
 
     if (checkoutSessionSubscription) {
+      const { subscriptionStart } =
+        StripeBillingService.extractSubscriptionDates(checkoutSessionSubscription);
+
       const internalBillingService = new InternalTeamBilling(finalizedTeam);
       await internalBillingService.saveTeamBilling({
         teamId: finalizedTeam.id,
@@ -66,6 +70,7 @@ async function handler(request: NextRequest) {
         // TODO: Implement true subscription status when webhook events are implemented
         status: SubscriptionStatus.ACTIVE,
         planName: Plan.TEAM,
+        subscriptionStart,
       });
     }
 
diff --git a/apps/web/app/api/teams/create/route.ts b/apps/web/app/api/teams/create/route.ts
index 0099914ab5df6c..3d936872aefb97 100644
--- a/apps/web/app/api/teams/create/route.ts
+++ b/apps/web/app/api/teams/create/route.ts
@@ -5,6 +5,7 @@ import type Stripe from "stripe";
 import { z } from "zod";
 
 import { Plan, SubscriptionStatus } from "@calcom/features/ee/billing/repository/IBillingRepository";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { InternalTeamBilling } from "@calcom/features/ee/billing/teams/internal-team-billing";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { HttpError } from "@calcom/lib/http-error";
@@ -87,6 +88,7 @@ async function getHandler(req: NextRequest) {
   });
 
   if (checkoutSession && subscription) {
+    const { subscriptionStart } = StripeBillingService.extractSubscriptionDates(subscription);
     const internalBillingService = new InternalTeamBilling(team);
     await internalBillingService.saveTeamBilling({
       teamId: team.id,
@@ -96,6 +98,7 @@ async function getHandler(req: NextRequest) {
       // TODO: Implement true subscription status when webhook events are implemented
       status: SubscriptionStatus.ACTIVE,
       planName: Plan.TEAM,
+      subscriptionStart,
     });
   }
 
diff --git a/apps/web/app/api/username/route.ts b/apps/web/app/api/username/route.ts
index 26e399e6922744..a4be17f81129a3 100644
--- a/apps/web/app/api/username/route.ts
+++ b/apps/web/app/api/username/route.ts
@@ -5,7 +5,7 @@ import { NextResponse } from "next/server";
 import { z } from "zod";
 
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { checkUsername } from "@calcom/lib/server/checkUsername";
+import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
diff --git a/apps/web/app/api/video/recording/__tests__/route.test.ts b/apps/web/app/api/video/recording/__tests__/route.test.ts
index 3d3a947e262a09..5dfe1acbc22fac 100644
--- a/apps/web/app/api/video/recording/__tests__/route.test.ts
+++ b/apps/web/app/api/video/recording/__tests__/route.test.ts
@@ -1,12 +1,12 @@
 import { NextResponse } from "next/server";
 import { describe, expect, test, vi, afterEach } from "vitest";
 
-import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/app-store/videoClient";
+import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/features/conferencing/lib/videoClient";
 import { verifyVideoToken } from "@calcom/lib/videoTokens";
 
 import { GET } from "../route";
 
-vi.mock("@calcom/app-store/videoClient", () => ({
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => ({
   getDownloadLinkOfCalVideoByRecordingId: vi.fn(),
 }));
 
diff --git a/apps/web/app/api/video/recording/route.ts b/apps/web/app/api/video/recording/route.ts
index 00d04beec50442..f2fbba1047be7e 100644
--- a/apps/web/app/api/video/recording/route.ts
+++ b/apps/web/app/api/video/recording/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 
-import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/app-store/videoClient";
+import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/features/conferencing/lib/videoClient";
 import { verifyVideoToken } from "@calcom/lib/videoTokens";
 
 export async function GET(request: Request) {
diff --git a/apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts b/apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts
index 3cd6fc53ba9976..60abe54140ac73 100644
--- a/apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts
+++ b/apps/web/app/api/webhooks/calendar-subscription/[provider]/route.ts
@@ -11,7 +11,7 @@ import { CalendarSyncService } from "@calcom/features/calendar-subscription/lib/
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import logger from "@calcom/lib/logger";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/SelectedCalendarRepository";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import { defaultResponderForAppDir } from "@calcom/web/app/api/defaultResponderForAppDir";
 
diff --git a/apps/web/app/cache/membership.ts b/apps/web/app/cache/membership.ts
index ef40178d438def..9af484adde03d3 100644
--- a/apps/web/app/cache/membership.ts
+++ b/apps/web/app/cache/membership.ts
@@ -3,7 +3,7 @@
 import { revalidateTag, unstable_cache } from "next/cache";
 
 import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 
 const CACHE_TAGS = {
   HAS_TEAM_PLAN: "MembershipRepository.findFirstAcceptedMembershipByUserId",
diff --git a/apps/web/components/apps/AppPage.tsx b/apps/web/components/apps/AppPage.tsx
index 20f136ab42341b..b0a727b5b30463 100644
--- a/apps/web/components/apps/AppPage.tsx
+++ b/apps/web/components/apps/AppPage.tsx
@@ -160,13 +160,21 @@ export const AppPage = ({
     function refactorMeWithoutEffect() {
       const data = appDbQuery.data;
 
-      const credentialsCount = data?.credentials.length || 0;
-      setExistingCredentials(data?.credentials || []);
+      const credentials = data?.credentials || [];
+      setExistingCredentials(credentials);
+
+      const hasPersonalInstall = credentials.some((c) => !!c.userId && !c.teamId);
+      const installedTeamIds = new Set<number>();
+      for (const cred of credentials) {
+        if (cred.teamId) installedTeamIds.add(cred.teamId);
+      }
+
+      const totalInstalledTargets = (hasPersonalInstall ? 1 : 0) + installedTeamIds.size;
 
       const appInstalledForAllTargets =
         availableForTeams && data?.userAdminTeams && data.userAdminTeams.length > 0
-          ? credentialsCount >= data.userAdminTeams.length
-          : credentialsCount > 0;
+          ? totalInstalledTargets >= data.userAdminTeams.length + 1
+          : credentials.length > 0;
       setAppInstalledForAllTargets(appInstalledForAllTargets);
     },
     [appDbQuery.data, availableForTeams]
@@ -244,7 +252,14 @@ export const AppPage = ({
               loading: isLoading,
             };
           }
-          return <InstallAppButtonChild credentials={appDbQuery.data?.credentials} paid={paid} {...props} />;
+
+          return (
+            <InstallAppButtonChild
+              credentials={availableForTeams ? undefined : appDbQuery.data?.credentials}
+              paid={paid}
+              {...props}
+            />
+          );
         }}
       />
     );
diff --git a/apps/web/components/apps/alby/AlbyPaymentComponent.tsx b/apps/web/components/apps/alby/AlbyPaymentComponent.tsx
index e65d71e65727e3..0e2e8f8392863a 100644
--- a/apps/web/components/apps/alby/AlbyPaymentComponent.tsx
+++ b/apps/web/components/apps/alby/AlbyPaymentComponent.tsx
@@ -5,8 +5,8 @@ import { useEffect, useState } from "react";
 import QRCode from "react-qr-code";
 import z from "zod";
 
+import { useBookingSuccessRedirect } from "@calcom/features/bookings/lib/bookingSuccessRedirect";
 import type { PaymentPageProps } from "@calcom/features/ee/payments/pages/payment";
-import { useBookingSuccessRedirect } from "@calcom/lib/bookingSuccessRedirect";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useCopy } from "@calcom/lib/hooks/useCopy";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
diff --git a/apps/web/components/apps/btcpayserver/BtcpayPaymentComponent.tsx b/apps/web/components/apps/btcpayserver/BtcpayPaymentComponent.tsx
index 1a07443012e67e..870c5e8c0bcf13 100644
--- a/apps/web/components/apps/btcpayserver/BtcpayPaymentComponent.tsx
+++ b/apps/web/components/apps/btcpayserver/BtcpayPaymentComponent.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import z from "zod";
 
 import type { PaymentPageProps } from "@calcom/features/ee/payments/pages/payment";
-import { useBookingSuccessRedirect } from "@calcom/lib/bookingSuccessRedirect";
+import { useBookingSuccessRedirect } from "@calcom/features/bookings/lib/bookingSuccessRedirect";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useCopy } from "@calcom/lib/hooks/useCopy";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index f673aa9f6440fb..72ae646473f5ce 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -52,6 +52,7 @@ import { AddGuestsDialog } from "@components/dialog/AddGuestsDialog";
 import { ChargeCardDialog } from "@components/dialog/ChargeCardDialog";
 import { EditLocationDialog } from "@components/dialog/EditLocationDialog";
 import { ReassignDialog } from "@components/dialog/ReassignDialog";
+import { ReportBookingDialog } from "@components/dialog/ReportBookingDialog";
 import { RerouteDialog } from "@components/dialog/RerouteDialog";
 import { RescheduleDialog } from "@components/dialog/RescheduleDialog";
 
@@ -60,9 +61,11 @@ import {
   getCancelEventAction,
   getEditEventActions,
   getAfterEventActions,
+  getReportAction,
   shouldShowPendingActions,
   shouldShowEditActions,
   shouldShowRecurringCancelAction,
+  shouldShowIndividualReportButton,
   type BookingActionContext,
 } from "./bookingActions";
 
@@ -181,6 +184,13 @@ function BookingListItem(booking: BookingItemProps) {
   const isPending = booking.status === BookingStatus.PENDING;
   const isRescheduled = booking.fromReschedule !== null;
   const isRecurring = booking.recurringEventId !== null;
+
+  const getBookingStatus = (): "upcoming" | "past" | "cancelled" | "rejected" => {
+    if (isCancelled) return "cancelled";
+    if (isRejected) return "rejected";
+    if (isBookingInPast) return "past";
+    return "upcoming";
+  };
   const isTabRecurring = booking.listingStatus === "recurring";
   const isTabUnconfirmed = booking.listingStatus === "unconfirmed";
   const isBookingFromRoutingForm = isBookingReroutable(parsedBooking);
@@ -292,6 +302,7 @@ function BookingListItem(booking: BookingItemProps) {
   const [isOpenReassignDialog, setIsOpenReassignDialog] = useState(false);
   const [isOpenSetLocationDialog, setIsOpenLocationDialog] = useState(false);
   const [isOpenAddGuestsDialog, setIsOpenAddGuestsDialog] = useState(false);
+  const [isOpenReportDialog, setIsOpenReportDialog] = useState(false);
   const [rerouteDialogIsOpen, setRerouteDialogIsOpen] = useState(false);
   const setLocationMutation = trpc.viewer.bookings.editLocation.useMutation({
     onSuccess: () => {
@@ -402,6 +413,12 @@ function BookingListItem(booking: BookingItemProps) {
       (action.id === "view_recordings" && !booking.isRecorded),
   })) as ActionType[];
 
+  const reportAction = getReportAction(actionContext);
+  const reportActionWithHandler = {
+    ...reportAction,
+    onClick: () => setIsOpenReportDialog(true),
+  };
+
   return (
     <>
       <RescheduleDialog
@@ -430,6 +447,13 @@ function BookingListItem(booking: BookingItemProps) {
         setIsOpenDialog={setIsOpenAddGuestsDialog}
         bookingId={booking.id}
       />
+      <ReportBookingDialog
+        isOpenDialog={isOpenReportDialog}
+        setIsOpenDialog={setIsOpenReportDialog}
+        bookingUid={booking.uid}
+        isRecurring={isRecurring}
+        status={getBookingStatus()}
+      />
       {booking.paid && booking.payment[0] && (
         <ChargeCardDialog
           isOpenDialog={chargeCardDialogIsOpen}
@@ -685,6 +709,24 @@ function BookingListItem(booking: BookingItemProps) {
                         </DropdownItem>
                       </DropdownMenuItem>
                     ))}
+                    <>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem
+                        className="rounded-lg"
+                        key={reportActionWithHandler.id}
+                        disabled={reportActionWithHandler.disabled}>
+                        <DropdownItem
+                          type="button"
+                          color={reportActionWithHandler.color}
+                          StartIcon={reportActionWithHandler.icon}
+                          onClick={reportActionWithHandler.onClick}
+                          disabled={reportActionWithHandler.disabled}
+                          data-testid={reportActionWithHandler.id}
+                          className={reportActionWithHandler.disabled ? "text-muted" : undefined}>
+                          {reportActionWithHandler.label}
+                        </DropdownItem>
+                      </DropdownMenuItem>
+                    </>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem
                       className="rounded-lg"
@@ -708,6 +750,21 @@ function BookingListItem(booking: BookingItemProps) {
               </Dropdown>
             )}
             {shouldShowRecurringCancelAction(actionContext) && <TableActions actions={[cancelEventAction]} />}
+            {shouldShowIndividualReportButton(actionContext) && (
+              <div className="flex items-center space-x-2">
+                <Button
+                  type="button"
+                  variant="icon"
+                  color="destructive"
+                  StartIcon={reportActionWithHandler.icon}
+                  onClick={reportActionWithHandler.onClick}
+                  disabled={reportActionWithHandler.disabled}
+                  data-testid={reportActionWithHandler.id}
+                  className="h-8 w-8"
+                  tooltip={reportActionWithHandler.label}
+                />
+              </div>
+            )}
             {isRejected && <div className="text-subtle text-sm">{t("rejected")}</div>}
             {isCancelled && booking.rescheduled && (
               <div className="hidden h-full items-center md:flex">
@@ -776,6 +833,24 @@ const BookingItemBadges = ({
       {booking?.assignmentReason.length > 0 && (
         <AssignmentReasonTooltip assignmentReason={booking.assignmentReason[0]} />
       )}
+      {booking.report && (
+        <Tooltip
+          content={
+            <div className="text-xs">
+              {(() => {
+                const reasonKey = `report_reason_${booking.report.reason.toLowerCase()}`;
+                const reasonText = t(reasonKey);
+                return booking.report.description
+                  ? `${reasonText}: ${booking.report.description}`
+                  : reasonText;
+              })()}
+            </div>
+          }>
+          <Badge className="ltr:mr-2 rtl:ml-2" variant="red">
+            {t("reported")}
+          </Badge>
+        </Tooltip>
+      )}
       {booking.paid && !booking.payment[0] ? (
         <Badge className="ltr:mr-2 rtl:ml-2" variant="orange">
           {t("error_collecting_card")}
diff --git a/apps/web/components/booking/bookingActions.ts b/apps/web/components/booking/bookingActions.ts
index f98e99266a5d2a..96457a65da5ff2 100644
--- a/apps/web/components/booking/bookingActions.ts
+++ b/apps/web/components/booking/bookingActions.ts
@@ -64,13 +64,14 @@ export function getPendingActions(context: BookingActionContext): ActionType[] {
 
 export function getCancelEventAction(context: BookingActionContext): ActionType {
   const { booking, isTabRecurring, isRecurring, getSeatReferenceUid, t } = context;
+  const seatReferenceUid = getSeatReferenceUid();
 
   return {
     id: "cancel",
     label: isTabRecurring && isRecurring ? t("cancel_all_remaining") : t("cancel_event"),
     href: `/booking/${booking.uid}?cancel=true${
       isTabRecurring && isRecurring ? "&allRemainingBookings=true" : ""
-    }${booking.seatsReferences.length ? `&seatReferenceUid=${getSeatReferenceUid()}` : ""}`,
+    }${booking.seatsReferences.length && seatReferenceUid ? `&seatReferenceUid=${seatReferenceUid}` : ""}`,
     icon: "circle-x",
     color: "destructive",
     disabled: isActionDisabled("cancel", context),
@@ -106,6 +107,7 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
     isAttendee,
     t,
   } = context;
+  const seatReferenceUid = getSeatReferenceUid();
 
   const actions: (ActionType | null)[] = [
     {
@@ -113,7 +115,7 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
       icon: "clock",
       label: t("reschedule_booking"),
       href: `/reschedule/${booking.uid}${
-        booking.seatsReferences.length && isAttendee ? `?seatReferenceUid=${getSeatReferenceUid()}` : ""
+        booking.seatsReferences.length && isAttendee && seatReferenceUid ? `?seatReferenceUid=${seatReferenceUid}` : ""
       }`,
       disabled:
         (isBookingInPast && !booking.eventType.allowReschedulingPastBookings) || isDisabledRescheduling,
@@ -163,6 +165,18 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
   return actions.filter(Boolean) as ActionType[];
 }
 
+export function getReportAction(context: BookingActionContext): ActionType {
+  const { booking, t } = context;
+
+  return {
+    id: "report",
+    label: t("report_booking"),
+    icon: "flag",
+    color: "destructive",
+    disabled: !!booking.report,
+  };
+}
+
 export function getAfterEventActions(context: BookingActionContext): ActionType[] {
   const { booking, cardCharged, attendeeList, t } = context;
 
@@ -203,9 +217,14 @@ export function shouldShowRecurringCancelAction(context: BookingActionContext):
   return isTabRecurring && isRecurring;
 }
 
+export function shouldShowIndividualReportButton(context: BookingActionContext): boolean {
+  const { booking, isPending, isUpcoming, isCancelled, isRejected } = context;
+  const hasDropdown = shouldShowEditActions(context);
+  return !booking.report && !hasDropdown && (isCancelled || isRejected || (isPending && isUpcoming));
+}
+
 export function isActionDisabled(actionId: string, context: BookingActionContext): boolean {
-  const { booking, isBookingInPast, isDisabledRescheduling, isDisabledCancelling, isPending, isConfirmed } =
-    context;
+  const { booking, isBookingInPast, isDisabledRescheduling, isDisabledCancelling } = context;
 
   switch (actionId) {
     case "reschedule":
@@ -225,7 +244,7 @@ export function isActionDisabled(actionId: string, context: BookingActionContext
 }
 
 export function getActionLabel(actionId: string, context: BookingActionContext): string {
-  const { booking, isTabRecurring, isRecurring, attendeeList, cardCharged, t } = context;
+  const { isTabRecurring, isRecurring, attendeeList, cardCharged, t } = context;
 
   switch (actionId) {
     case "reject":
diff --git a/apps/web/components/dialog/ReportBookingDialog.tsx b/apps/web/components/dialog/ReportBookingDialog.tsx
new file mode 100644
index 00000000000000..b926e546eaed31
--- /dev/null
+++ b/apps/web/components/dialog/ReportBookingDialog.tsx
@@ -0,0 +1,139 @@
+import type { Dispatch, SetStateAction } from "react";
+import { Controller, useForm } from "react-hook-form";
+
+import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { BookingReportReason } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc/react";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { Select, Label } from "@calcom/ui/components/form";
+import { TextArea } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+
+type BookingReportStatus = "upcoming" | "past" | "cancelled" | "rejected";
+
+interface IReportBookingDialog {
+  isOpenDialog: boolean;
+  setIsOpenDialog: Dispatch<SetStateAction<boolean>>;
+  bookingUid: string;
+  isRecurring: boolean;
+  status: BookingReportStatus;
+}
+
+interface FormValues {
+  reason: BookingReportReason;
+  description: string;
+}
+
+export const ReportBookingDialog = (props: IReportBookingDialog) => {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+  const { isOpenDialog, setIsOpenDialog, bookingUid, status } = props;
+
+  const willBeCancelled = status === "upcoming";
+
+  const {
+    control,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<FormValues>({
+    defaultValues: {
+      reason: BookingReportReason.SPAM,
+      description: "",
+    },
+  });
+
+  const { mutate: reportBooking, isPending } = trpc.viewer.bookings.reportBooking.useMutation({
+    async onSuccess(data) {
+      showToast(data.message, "success");
+      setIsOpenDialog(false);
+      await utils.viewer.bookings.invalidate();
+    },
+    onError(error) {
+      showToast(error.message || t("unexpected_error_try_again"), "error");
+    },
+  });
+
+  const onSubmit = (data: FormValues) => {
+    reportBooking({
+      bookingUid,
+      reason: data.reason,
+      description: data.description || undefined,
+    });
+  };
+
+  const reasonOptions = [
+    { label: t("report_reason_spam"), value: BookingReportReason.SPAM },
+    { label: t("report_reason_dont_know_person"), value: BookingReportReason.DONT_KNOW_PERSON },
+    { label: t("report_reason_other"), value: BookingReportReason.OTHER },
+  ];
+
+  return (
+    <Dialog open={isOpenDialog} onOpenChange={setIsOpenDialog}>
+      <DialogContent enableOverflow>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div className="flex flex-row space-x-3">
+            <div className="w-full">
+              <DialogHeader title={t("report_booking")} subtitle={t("report_booking_description")} />
+              <div className="mb-4">
+                <Label htmlFor="reason" className="text-emphasis mb-2 block text-sm font-medium">
+                  {t("reason")} <span className="text-destructive">*</span>
+                </Label>
+                <Controller
+                  name="reason"
+                  control={control}
+                  rules={{ required: t("field_required") }}
+                  render={({ field }) => (
+                    <Select
+                      {...field}
+                      options={reasonOptions}
+                      onChange={(option) => {
+                        if (option) field.onChange(option.value);
+                      }}
+                      value={reasonOptions.find((opt) => opt.value === field.value)}
+                    />
+                  )}
+                />
+                {errors.reason && <p className="text-destructive mt-1 text-sm">{errors.reason.message}</p>}
+              </div>
+
+              <div className="mb-4">
+                <Label htmlFor="description" className="text-emphasis mb-2 block text-sm font-medium">
+                  {t("description")} <span className="text-subtle font-normal">({t("optional")})</span>
+                </Label>
+                <Controller
+                  name="description"
+                  control={control}
+                  render={({ field }) => (
+                    <TextArea {...field} placeholder={t("report_booking_description_placeholder")} rows={3} />
+                  )}
+                />
+              </div>
+
+              {willBeCancelled && (
+                <div className="mb-4">
+                  <Alert severity="warning" title={t("report_booking_will_cancel_description")} />
+                </div>
+              )}
+            </div>
+          </div>
+
+          <DialogFooter showDivider className="mt-8">
+            <Button
+              type="button"
+              color="secondary"
+              onClick={() => setIsOpenDialog(false)}
+              disabled={isPending}>
+              {t("cancel")}
+            </Button>
+            <Button type="submit" color="primary" disabled={isPending} loading={isPending}>
+              {t("submit_report")}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/web/components/dialog/RerouteDialog.tsx b/apps/web/components/dialog/RerouteDialog.tsx
index d4b48835d5efb9..6b0d39dd07f873 100644
--- a/apps/web/components/dialog/RerouteDialog.tsx
+++ b/apps/web/components/dialog/RerouteDialog.tsx
@@ -15,10 +15,10 @@ import { substituteVariables } from "@calcom/app-store/routing-forms/lib/substit
 import type { FormResponse, LocalRoute } from "@calcom/app-store/routing-forms/types/types";
 import { RouteActionType } from "@calcom/app-store/routing-forms/zod";
 import dayjs from "@calcom/dayjs";
+import { useBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl";
 import { createBooking } from "@calcom/features/bookings/lib/create-booking";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { getUrlSearchParamsToForwardForReroute } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward";
-import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { EventType, User, Team, Attendee, Booking as PrismaBooking } from "@calcom/prisma/client";
 import { SchedulingType } from "@calcom/prisma/enums";
diff --git a/apps/web/components/error/error-page.tsx b/apps/web/components/error/error-page.tsx
index 1ed087665db101..e6773da325502d 100644
--- a/apps/web/components/error/error-page.tsx
+++ b/apps/web/components/error/error-page.tsx
@@ -2,6 +2,7 @@
 
 import React from "react";
 
+import "@calcom/embed-core/src/embed-iframe";
 import { HttpError } from "@calcom/lib/http-error";
 import { Button } from "@calcom/ui/components/button";
 
diff --git a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts
index f168705014142d..18630b9af84743 100644
--- a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts
+++ b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts
@@ -9,7 +9,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
 import { CAL_URL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
diff --git a/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsRoutingLink.ts b/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsRoutingLink.ts
index 69c36692f2fae0..ef035564185cda 100644
--- a/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsRoutingLink.ts
+++ b/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsRoutingLink.ts
@@ -65,7 +65,7 @@ export const getServerSideProps = async function getServerSideProps(
     };
   }
 
-  const { UserRepository } = await import("@calcom/lib/server/repository/user");
+  const { UserRepository } = await import("@calcom/features/users/repositories/UserRepository");
   const userRepo = new UserRepository(prisma);
   const formWithUserProfile = {
     ...form,
@@ -83,9 +83,12 @@ export const getServerSideProps = async function getServerSideProps(
     props: {
       isEmbed,
       profile: {
-        theme: form.user.theme,
-        brandColor: form.user.brandColor,
-        darkBrandColor: form.user.darkBrandColor,
+        theme: formWithUserProfile.user.profile?.organization?.theme ?? formWithUserProfile.user.theme,
+        brandColor:
+          formWithUserProfile.user.profile?.organization?.brandColor ?? formWithUserProfile.user.brandColor,
+        darkBrandColor:
+          formWithUserProfile.user.profile?.organization?.darkBrandColor ??
+          formWithUserProfile.user.darkBrandColor,
       },
       form: await getSerializableForm({ form: enrichFormWithMigrationData(formWithUserProfile) }),
     },
diff --git a/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsSingleForm.ts b/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsSingleForm.ts
index 3203fbb905a9ad..49a5c60fdbdc62 100644
--- a/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsSingleForm.ts
+++ b/apps/web/lib/apps/routing-forms/[...pages]/getServerSidePropsSingleForm.ts
@@ -2,7 +2,7 @@ import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enr
 import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
 import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
 import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { AppGetServerSidePropsContext, AppPrisma, AppUser } from "@calcom/types/AppGetServerSideProps";
 
@@ -90,7 +90,7 @@ export const getServerSidePropsForSingleFormView = async function getServerSideP
       : null,
   };
 
-  const { UserRepository } = await import("@calcom/lib/server/repository/user");
+  const { UserRepository } = await import("@calcom/features/users/repositories/UserRepository");
 
   const userRepo = new UserRepository(prisma);
   const formWithUserInfoProfile = {
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
index 3c61015f0fff52..d209dfafbb1d3a 100644
--- a/apps/web/lib/booking.ts
+++ b/apps/web/lib/booking.ts
@@ -49,6 +49,13 @@ export const getEventTypesFromDB = async (id: number) => {
       profile: {
         select: {
           organizationId: true,
+          organization: {
+            select: {
+              brandColor: true,
+              darkBrandColor: true,
+              theme: true,
+            },
+          },
         },
       },
       teamId: true,
@@ -71,9 +78,15 @@ export const getEventTypesFromDB = async (id: number) => {
           slug: true,
           name: true,
           hideBranding: true,
+          brandColor: true,
+          darkBrandColor: true,
+          theme: true,
           parent: {
             select: {
               hideBranding: true,
+              brandColor: true,
+              darkBrandColor: true,
+              theme: true,
             },
           },
           createdByOAuthClientId: true,
@@ -116,12 +129,11 @@ export const getEventTypesFromDB = async (id: number) => {
   }
 
   const metadata = EventTypeMetaDataSchema.parse(eventType.metadata);
-  const { profile, ...restEventType } = eventType;
-  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
+  const isOrgTeamEvent = !!eventType?.team && !!eventType.profile?.organizationId;
 
   return {
     isDynamic: false,
-    ...restEventType,
+    ...eventType,
     bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),
     metadata,
   };
diff --git a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx
index 16c05ffffc926c..7ea04380bddf47 100644
--- a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx
+++ b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx
@@ -6,11 +6,14 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getBookingForReschedule, getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
 import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
+import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
-import { shouldHideBrandingForTeamEvent, shouldHideBrandingForUserEvent } from "@calcom/lib/hideBranding";
-import { EventRepository } from "@calcom/lib/server/repository/event";
-import { UserRepository } from "@calcom/lib/server/repository/user";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
+import {
+  shouldHideBrandingForTeamEvent,
+  shouldHideBrandingForUserEvent,
+} from "@calcom/features/profile/lib/hideBranding";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";
 import { RedirectType } from "@calcom/prisma/enums";
diff --git a/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts b/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts
index a7d8c256aad70e..52836d898df2eb 100644
--- a/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts
+++ b/apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts
@@ -5,8 +5,8 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
 import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { shouldHideBrandingForTeamEvent } from "@calcom/lib/hideBranding";
-import { EventRepository } from "@calcom/lib/server/repository/event";
+import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
+import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
 import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";
 
diff --git a/apps/web/lib/pages/auth/verify-email.test.ts b/apps/web/lib/pages/auth/verify-email.test.ts
index 14d3304712e329..d11e370cdd4f4a 100644
--- a/apps/web/lib/pages/auth/verify-email.test.ts
+++ b/apps/web/lib/pages/auth/verify-email.test.ts
@@ -1,4 +1,4 @@
-import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/organization";
+import { organizationScenarios } from "@calcom/features/ee/organizations/__mocks__/organizationMock";
 
 import { describe, it, expect, beforeEach, vi } from "vitest";
 
@@ -10,14 +10,14 @@ import { moveUserToMatchingOrg } from "./verify-email";
 
 // TODO: This test passes but coverage is very low.
 vi.mock("@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler");
-vi.mock("@calcom/lib/server/repository/organization");
+vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository");
 vi.mock("@calcom/prisma", () => {
   return {
     prisma: vi.fn(),
   };
 });
 
-vi.mock("@calcom/features/ee/billing/stripe-billling-service", () => {
+vi.mock("@calcom/features/ee/billing/stripe-billing-service", () => {
   return {
     StripeBillingService: vi.fn(),
   };
diff --git a/apps/web/lib/pages/auth/verify-email.ts b/apps/web/lib/pages/auth/verify-email.ts
index 1df92535ec4dd5..f2685246bff622 100644
--- a/apps/web/lib/pages/auth/verify-email.ts
+++ b/apps/web/lib/pages/auth/verify-email.ts
@@ -2,10 +2,10 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { z } from "zod";
 
 import dayjs from "@calcom/dayjs";
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { IS_STRIPE_ENABLED } from "@calcom/lib/constants";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { CreationSource } from "@calcom/prisma/enums";
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index 88d7a26dfbb738..5c69b8a7c76b49 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -4,11 +4,11 @@ import { URLSearchParams } from "url";
 import { z } from "zod";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { buildEventUrlFromBooking } from "@calcom/features/bookings/lib/buildEventUrlFromBooking";
 import { determineReschedulePreventionRedirect } from "@calcom/features/bookings/lib/reschedule/determineReschedulePreventionRedirect";
 import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
-import { buildEventUrlFromBooking } from "@calcom/lib/bookings/buildEventUrlFromBooking";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
-import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma, { bookingMinimalSelect } from "@calcom/prisma";
 
 const querySchema = z.object({
diff --git a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
index 4923562ece6104..fcd939cd874928 100644
--- a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
+++ b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx
@@ -7,8 +7,9 @@ import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booki
 import { getSlugOrRequestedSlug, orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { getOrganizationSEOSettings } from "@calcom/features/ee/organizations/lib/orgSettings";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
+import { getBrandingForEventType } from "@calcom/features/profile/lib/getBranding";
+import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { shouldHideBrandingForTeamEvent } from "@calcom/lib/hideBranding";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
 import type { User } from "@calcom/prisma/client";
@@ -30,7 +31,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   const { req, params, query } = context;
   const session = await getServerSession({ req });
   const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(params);
-  const { rescheduleUid, isInstantMeeting: queryIsInstantMeeting, email } = query;
+  const { rescheduleUid, isInstantMeeting: queryIsInstantMeeting } = query;
   const allowRescheduleForCancelledBooking = query.allowRescheduleForCancelledBooking === "true";
   const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(req, params?.orgSlug);
 
@@ -133,6 +134,14 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   const teamHasApiV2Route = await featureRepo.checkIfTeamHasFeature(team.id, "use-api-v2-for-team-slots");
   const useApiV2 = teamHasApiV2Route && hasApiV2RouteInEnv();
 
+  const branding = getBrandingForEventType({
+    eventType: {
+      team: team.parent ?? team,
+      users: [],
+      profile: null,
+    },
+  });
+
   return {
     props: {
       useApiV2,
@@ -153,6 +162,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
             : getPlaceholderAvatar(team.logoUrl, team.name),
           name,
           username: orgSlug ?? null,
+          ...branding,
         },
         title: eventData.title,
         users: eventHostsUserData,
@@ -204,6 +214,9 @@ const getTeamWithEventsData = async (
           bannerUrl: true,
           logoUrl: true,
           hideBranding: true,
+          brandColor: true,
+          darkBrandColor: true,
+          theme: true,
           organizationSettings: {
             select: {
               allowSEOIndexing: true,
@@ -214,6 +227,9 @@ const getTeamWithEventsData = async (
       logoUrl: true,
       name: true,
       slug: true,
+      brandColor: true,
+      darkBrandColor: true,
+      theme: true,
       eventTypes: {
         where: {
           slug: meetingSlug,
diff --git a/apps/web/lib/team/[slug]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/getServerSideProps.tsx
index 07bed34c247007..96ca6d30f05f89 100644
--- a/apps/web/lib/team/[slug]/getServerSideProps.tsx
+++ b/apps/web/lib/team/[slug]/getServerSideProps.tsx
@@ -9,7 +9,7 @@ import { getTeamWithMembers } from "@calcom/features/ee/teams/lib/queries";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { IS_CALCOM } from "@calcom/lib/constants";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import slugify from "@calcom/lib/slugify";
diff --git a/apps/web/lib/types/booking.ts b/apps/web/lib/types/booking.ts
index 272cdc0d021277..df61be8354f42b 100644
--- a/apps/web/lib/types/booking.ts
+++ b/apps/web/lib/types/booking.ts
@@ -1,3 +1,3 @@
-export type BookingResponse = Awaited<
-  ReturnType<typeof import("@calcom/features/bookings/lib/handleNewBooking").default>
->;
+import type { RegularBookingCreateResult } from "@calcom/features/bookings/lib/dto/types";
+
+export type BookingResponse = RegularBookingCreateResult;
diff --git a/apps/web/lib/video/[uid]/getServerSideProps.ts b/apps/web/lib/video/[uid]/getServerSideProps.ts
index f448eeb4d799cf..4fdcc2caf313f3 100644
--- a/apps/web/lib/video/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/video/[uid]/getServerSideProps.ts
@@ -7,14 +7,14 @@ import {
   updateMeetingTokenIfExpired,
 } from "@calcom/app-store/dailyvideo/lib/VideoApiAdapter";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { getCalVideoReference } from "@calcom/features/get-cal-video-reference";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { CAL_VIDEO_MEETING_LINK_FOR_TESTING } from "@calcom/lib/constants";
 import { isENVDev } from "@calcom/lib/env";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import prisma from "@calcom/prisma";
 
 const md = new MarkdownIt("default", { html: true, breaks: true, linkify: true });
diff --git a/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts b/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts
index bcdfeb3b6dc026..98112fe5b43693 100644
--- a/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/video/meeting-ended/[uid]/getServerSideProps.ts
@@ -1,6 +1,6 @@
 import type { GetServerSidePropsContext } from "next";
 
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 
 import { type inferSSRProps } from "@lib/types/inferSSRProps";
diff --git a/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts b/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts
index aa66d8be6d3cf6..da76d42d3c4a48 100644
--- a/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/video/meeting-not-started/[uid]/getServerSideProps.ts
@@ -1,6 +1,6 @@
 import type { GetServerSidePropsContext } from "next";
 
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 
 // change the type
diff --git a/apps/web/modules/auth/login-view.tsx b/apps/web/modules/auth/login-view.tsx
index c6a60ff0f5c0a4..30da9693338c3d 100644
--- a/apps/web/modules/auth/login-view.tsx
+++ b/apps/web/modules/auth/login-view.tsx
@@ -11,11 +11,11 @@ import { z } from "zod";
 
 import { SAMLLogin } from "@calcom/features/auth/SAMLLogin";
 import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
+import { LastUsed, useLastUsed } from "@calcom/features/auth/lib/hooks/useLastUsed";
 import { HOSTED_CAL_FEATURES, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { emailRegex } from "@calcom/lib/emailSchema";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { LastUsed, useLastUsed } from "@calcom/lib/hooks/useLastUsed";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTelemetry } from "@calcom/lib/hooks/useTelemetry";
 import { collectPageParameters, telemetryEventTypes } from "@calcom/lib/telemetry";
@@ -62,7 +62,7 @@ export default function Login({
         .string()
         .min(1, `${t("error_required_field")}`)
         .regex(emailRegex, `${t("enter_valid_email")}`),
-      ...(!!totpEmail ? {} : { password: z.string().min(1, `${t("error_required_field")}`) }),
+      ...(totpEmail ? {} : { password: z.string().min(1, `${t("error_required_field")}`) }),
     })
     // Passthrough other fields like totpCode
     .passthrough();
diff --git a/apps/web/modules/availability/availability-view.tsx b/apps/web/modules/availability/availability-view.tsx
index 6b048655f1e7d1..9bdb9075382ae3 100644
--- a/apps/web/modules/availability/availability-view.tsx
+++ b/apps/web/modules/availability/availability-view.tsx
@@ -141,6 +141,7 @@ export function AvailabilityList({ availabilities }: AvailabilityListProps) {
             <ul className="divide-subtle divide-y" data-testid="schedules" ref={animationParentRef}>
               {availabilities.schedules.map((schedule) => (
                 <ScheduleListItem
+                  redirectUrl={`/availability/${schedule.id}`}
                   displayOptions={{
                     hour12: user?.timeFormat ? user.timeFormat === 12 : undefined,
                     timeZone: user?.timeZone,
diff --git a/apps/web/modules/bookings/components/BookingsCalendar.tsx b/apps/web/modules/bookings/components/BookingsCalendar.tsx
new file mode 100644
index 00000000000000..eb1cf6b6c5d8f1
--- /dev/null
+++ b/apps/web/modules/bookings/components/BookingsCalendar.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import type { Table as ReactTable } from "@tanstack/react-table";
+
+import { DataTableFilters, DataTableSegment } from "@calcom/features/data-table";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+
+import type { RowData, BookingListingStatus } from "../types";
+
+type BookingsCalendarViewProps = {
+  status: BookingListingStatus;
+  table: ReactTable<RowData>;
+};
+
+export function BookingsCalendar({ table }: BookingsCalendarViewProps) {
+  return (
+    <>
+      <div className="mb-4 flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <DataTableFilters.FilterBar table={table} />
+        </div>
+
+        <div className="flex items-center gap-2">
+          <DataTableFilters.ClearFiltersButton />
+          <DataTableSegment.SaveButton />
+          <DataTableSegment.Select />
+        </div>
+      </div>
+      <div className="flex items-center justify-center pt-2 xl:pt-0">
+        <EmptyScreen Icon="calendar" headline="Calendar view" description="Calendar view is coming soon." />
+      </div>
+    </>
+  );
+}
diff --git a/apps/web/modules/bookings/components/BookingsList.tsx b/apps/web/modules/bookings/components/BookingsList.tsx
new file mode 100644
index 00000000000000..ae4ad900674d1a
--- /dev/null
+++ b/apps/web/modules/bookings/components/BookingsList.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import type { Table as ReactTable } from "@tanstack/react-table";
+
+import { DataTableWrapper, DataTableFilters, DataTableSegment } from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+
+import SkeletonLoader from "@components/booking/SkeletonLoader";
+
+import type { RowData, BookingListingStatus } from "../types";
+
+const descriptionByStatus: Record<BookingListingStatus, string> = {
+  upcoming: "upcoming_bookings",
+  recurring: "recurring_bookings",
+  past: "past_bookings",
+  cancelled: "cancelled_bookings",
+  unconfirmed: "unconfirmed_bookings",
+};
+
+type BookingsListViewProps = {
+  status: BookingListingStatus;
+  table: ReactTable<RowData>;
+  isPending: boolean;
+  totalRowCount?: number;
+};
+
+export function BookingsList({ status, table, isPending, totalRowCount }: BookingsListViewProps) {
+  const { t } = useLocale();
+
+  return (
+    <DataTableWrapper
+      className="mb-6"
+      table={table}
+      testId={`${status}-bookings`}
+      bodyTestId="bookings"
+      headerClassName="hidden"
+      isPending={isPending}
+      totalRowCount={totalRowCount}
+      variant="compact"
+      paginationMode="standard"
+      ToolbarLeft={
+        <>
+          <DataTableFilters.FilterBar table={table} />
+        </>
+      }
+      ToolbarRight={
+        <>
+          <DataTableFilters.ClearFiltersButton />
+          <DataTableSegment.SaveButton />
+          <DataTableSegment.Select />
+        </>
+      }
+      LoaderView={<SkeletonLoader />}
+      EmptyView={
+        <div className="flex items-center justify-center pt-2 xl:pt-0">
+          <EmptyScreen
+            Icon="calendar"
+            headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
+            description={t("no_status_bookings_yet_description", {
+              status: t(status).toLowerCase(),
+              description: t(descriptionByStatus[status]),
+            })}
+          />
+        </div>
+      }
+    />
+  );
+}
diff --git a/apps/web/modules/bookings/types.ts b/apps/web/modules/bookings/types.ts
new file mode 100644
index 00000000000000..68bcaa935a6d8a
--- /dev/null
+++ b/apps/web/modules/bookings/types.ts
@@ -0,0 +1,25 @@
+import type { RouterOutputs } from "@calcom/trpc/react";
+
+import type { validStatuses } from "~/bookings/lib/validStatuses";
+
+export type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
+
+export type RecurringInfo = {
+  recurringEventId: string | null;
+  count: number;
+  firstDate: Date | null;
+  bookings: { [key: string]: Date[] };
+};
+
+export type RowData =
+  | {
+      type: "data";
+      booking: BookingOutput;
+      isToday: boolean;
+      recurringInfo?: RecurringInfo;
+    }
+  | {
+      type: "today" | "next";
+    };
+
+export type BookingListingStatus = (typeof validStatuses)[number];
diff --git a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
index b7ecab1ae5c7bd..4223b5cf6c0b30 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx
@@ -6,12 +6,13 @@ import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-util
 import { orgDomainConfig } from "@calcom/ee/organizations/lib/orgDomains";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
-import { shouldHideBrandingForEvent } from "@calcom/lib/hideBranding";
+import { getBrandingForEventType } from "@calcom/features/profile/lib/getBranding";
+import { shouldHideBrandingForEvent } from "@calcom/features/profile/lib/hideBranding";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import prisma from "@calcom/prisma";
 import { customInputSchema } from "@calcom/prisma/zod-utils";
 import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";
@@ -115,7 +116,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   bookingInfo["startTime"] = (bookingInfo?.startTime as Date)?.toISOString() as unknown as Date;
   bookingInfo["endTime"] = (bookingInfo?.endTime as Date)?.toISOString() as unknown as Date;
 
-  eventTypeRaw.users = !!eventTypeRaw.hosts?.length
+  eventTypeRaw.users = eventTypeRaw.hosts?.length
     ? eventTypeRaw.hosts.map((host) => host.user)
     : eventTypeRaw.users;
 
@@ -150,9 +151,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   const profile = {
     name: eventType.team?.name || eventType.users[0]?.name || null,
     email: eventType.team ? null : eventType.users[0].email || null,
-    theme: (!eventType.team?.name && eventType.users[0]?.theme) || null,
-    brandColor: eventType.team ? null : eventType.users[0].brandColor || null,
-    darkBrandColor: eventType.team ? null : eventType.users[0].darkBrandColor || null,
+    ...getBrandingForEventType({ eventType: eventTypeRaw }),
     slug: eventType.team?.slug || eventType.users[0]?.username || null,
   };
 
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index d65dbec89d8521..6eb21c2e239bca 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -22,13 +22,13 @@ import {
   useIsEmbed,
 } from "@calcom/embed-core/embed-iframe";
 import { Price } from "@calcom/features/bookings/components/event-meta/Price";
+import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
+import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
 import {
   SMS_REMINDER_NUMBER_FIELD,
   SystemField,
   TITLE_FIELD,
-} from "@calcom/features/bookings/lib/SystemField";
-import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
-import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
+} from "@calcom/lib/bookings/SystemField";
 import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
 import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -698,7 +698,7 @@ export default function Success(props: PageProps) {
                           <>
                             <div className="mt-9 font-medium">{t("additional_notes")}</div>
                             <div className="col-span-2 mb-2 mt-9">
-                              <p className="break-words">{bookingInfo.description}</p>
+                              <p className="whitespace-pre-line break-words">{bookingInfo.description}</p>
                             </div>
                           </>
                         )}
@@ -771,7 +771,7 @@ export default function Success(props: PageProps) {
                             <Fragment key={field.name}>
                               <div
                                 className="text-emphasis mt-4 font-medium"
-                                // eslint-disable-next-line react/no-danger
+                                 
                                 dangerouslySetInnerHTML={{
                                   __html: markdownToSafeHTML(label),
                                 }}
@@ -1084,7 +1084,7 @@ export default function Success(props: PageProps) {
                       <span className="underline">
                         <a
                           target="_blank"
-                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations">
+                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations" rel="noreferrer">
                           {t("resolve")}
                         </a>
                       </span>
diff --git a/apps/web/modules/bookings/views/bookings-listing-view.tsx b/apps/web/modules/bookings/views/bookings-view.tsx
similarity index 82%
rename from apps/web/modules/bookings/views/bookings-listing-view.tsx
rename to apps/web/modules/bookings/views/bookings-view.tsx
index c4ccbab26e819b..00931e1a27041e 100644
--- a/apps/web/modules/bookings/views/bookings-listing-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-view.tsx
@@ -2,57 +2,38 @@
 
 import { useReactTable, getCoreRowModel, getSortedRowModel, createColumnHelper } from "@tanstack/react-table";
 import { useSearchParams, usePathname } from "next/navigation";
-import { useMemo, useRef } from "react";
+import { createParser, useQueryState } from "nuqs";
+import { useMemo } from "react";
 
 import dayjs from "@calcom/dayjs";
 import {
-  useDataTable,
   DataTableProvider,
-  DataTableWrapper,
-  DataTableFilters,
-  DataTableSegment,
+  type SystemFilterSegment,
+  useDataTable,
   ColumnFilterType,
   useFilterValue,
   ZMultiSelectFilterValue,
   ZDateRangeFilterValue,
   ZTextFilterValue,
-  type SystemFilterSegment,
 } from "@calcom/features/data-table";
 import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
 import { Alert } from "@calcom/ui/components/alert";
-import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 import type { HorizontalTabItemProps } from "@calcom/ui/components/navigation";
 import { HorizontalTabs } from "@calcom/ui/components/navigation";
 import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
 import { WipeMyCalActionButton } from "@calcom/web/components/apps/wipemycalother/wipeMyCalActionButton";
 
 import BookingListItem from "@components/booking/BookingListItem";
-import SkeletonLoader from "@components/booking/SkeletonLoader";
 
 import { useFacetedUniqueValues } from "~/bookings/hooks/useFacetedUniqueValues";
 import type { validStatuses } from "~/bookings/lib/validStatuses";
 
-type BookingListingStatus = (typeof validStatuses)[number];
-type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
-
-type RecurringInfo = {
-  recurringEventId: string | null;
-  count: number;
-  firstDate: Date | null;
-  bookings: { [key: string]: Date[] };
-};
-
-const descriptionByStatus: Record<BookingListingStatus, string> = {
-  upcoming: "upcoming_bookings",
-  recurring: "recurring_bookings",
-  past: "past_bookings",
-  cancelled: "cancelled_bookings",
-  unconfirmed: "unconfirmed_bookings",
-};
+import { BookingsCalendar } from "../components/BookingsCalendar";
+import { BookingsList } from "../components/BookingsList";
+import type { RowData, BookingOutput } from "../types";
 
 type BookingsProps = {
   status: (typeof validStatuses)[number];
@@ -103,21 +84,18 @@ export default function Bookings(props: BookingsProps) {
   );
 }
 
-type RowData =
-  | {
-      type: "data";
-      booking: BookingOutput;
-      isToday: boolean;
-      recurringInfo?: RecurringInfo;
-    }
-  | {
-      type: "today" | "next";
-    };
+const viewParser = createParser({
+  parse: (value: string) => {
+    if (value === "calendar") return "calendar";
+    return "list";
+  },
+  serialize: (value: "list" | "calendar") => value,
+});
 
 function BookingsContent({ status, permissions }: BookingsProps) {
+  const [view] = useQueryState("view", viewParser.withDefault("list"));
   const { t } = useLocale();
   const user = useMeQuery().data;
-  const tableContainerRef = useRef<HTMLDivElement>(null);
   const searchParams = useSearchParams();
 
   // Generate dynamic tabs that preserve query parameters
@@ -411,6 +389,9 @@ function BookingsContent({ status, permissions }: BookingsProps) {
     getFacetedUniqueValues,
   });
 
+  const isPending = query.isPending;
+  const totalRowCount = query.data?.totalCount;
+
   return (
     <div className="flex flex-col">
       <div className="flex flex-row flex-wrap justify-between">
@@ -431,43 +412,16 @@ function BookingsContent({ status, permissions }: BookingsProps) {
               {!!bookingsToday.length && status === "upcoming" && (
                 <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
               )}
-              <DataTableWrapper
-                className="mb-6"
-                tableContainerRef={tableContainerRef}
-                table={table}
-                testId={`${status}-bookings`}
-                bodyTestId="bookings"
-                headerClassName="hidden"
-                isPending={query.isPending}
-                totalRowCount={query.data?.totalCount}
-                variant="compact"
-                paginationMode="standard"
-                ToolbarLeft={
-                  <>
-                    <DataTableFilters.FilterBar table={table} />
-                  </>
-                }
-                ToolbarRight={
-                  <>
-                    <DataTableFilters.ClearFiltersButton />
-                    <DataTableSegment.SaveButton />
-                    <DataTableSegment.Select />
-                  </>
-                }
-                LoaderView={<SkeletonLoader />}
-                EmptyView={
-                  <div className="flex items-center justify-center pt-2 xl:pt-0">
-                    <EmptyScreen
-                      Icon="calendar"
-                      headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
-                      description={t("no_status_bookings_yet_description", {
-                        status: t(status).toLowerCase(),
-                        description: t(descriptionByStatus[status]),
-                      })}
-                    />
-                  </div>
-                }
-              />
+              {view === "list" ? (
+                <BookingsList
+                  status={status}
+                  table={table}
+                  isPending={isPending}
+                  totalRowCount={totalRowCount}
+                />
+              ) : (
+                <BookingsCalendar status={status} table={table} />
+              )}
             </>
           )}
         </div>
diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsx
index 5bcbcfd5e51994..4ad664fedf435b 100644
--- a/apps/web/modules/settings/my-account/general-view.tsx
+++ b/apps/web/modules/settings/my-account/general-view.tsx
@@ -147,6 +147,9 @@ const GeneralView = ({ user, travelSchedules }: GeneralViewProps) => {
   const [isReceiveMonthlyDigestEmailChecked, setIsReceiveMonthlyDigestEmailChecked] = useState(
     !!user.receiveMonthlyDigestEmail
   );
+  const [isRequireBookerEmailVerificationChecked, setIsRequireBookerEmailVerificationChecked] = useState(
+    !!user.requiresBookerEmailVerification
+  );
 
   const watchedTzSchedules = formMethods.watch("travelSchedules");
 
@@ -353,6 +356,19 @@ const GeneralView = ({ user, travelSchedules }: GeneralViewProps) => {
           }}
           switchContainerClassName="mt-6"
         />
+
+        <SettingsToggle
+          toggleSwitchAtTheEnd={true}
+          title={t("require_booker_email_verification")}
+          description={t("require_booker_email_verification_description")}
+          disabled={mutation.isPending}
+          checked={isRequireBookerEmailVerificationChecked}
+          onCheckedChange={(checked) => {
+            setIsRequireBookerEmailVerificationChecked(checked);
+            mutation.mutate({ requiresBookerEmailVerification: checked });
+          }}
+          switchContainerClassName="mt-6"
+        />
         <TravelScheduleModal
           open={isTZScheduleOpen}
           onOpenChange={() => setIsTZScheduleOpen(false)}
diff --git a/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx b/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
index 529363abab48aa..3dbec49cc64394 100644
--- a/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
@@ -205,6 +205,7 @@ const AddNewTeamsFormChild = ({ teams }: { teams: { id: number; name: string; sl
             <TextField
               key={field.id}
               {...register(`teams.${index}.name`)}
+              data-testid={`team.${index}.name`}
               label=""
               addOnClassname="bg-transparent p-0 border-l-0"
               className={index > 0 ? "mb-2" : ""}
diff --git a/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx b/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
index 51d381f3954449..5ec854143832eb 100644
--- a/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
@@ -34,28 +34,28 @@ const useOrgCreation = () => {
   const session = useSession();
   const utils = trpc.useUtils();
   const [serverErrorMessage, setServerErrorMessage] = useState("");
-  const { useOnboardingStore, isBillingEnabled } = useOnboarding();
+  const { useOnboardingStore } = useOnboarding();
   const { reset } = useOnboardingStore();
 
-  const checkoutMutation = trpc.viewer.organizations.createWithPaymentIntent.useMutation({
-    onSuccess: (data) => {
+  // Single mutation for all flows (billing, self-hosted, admin)
+  const intentToCreateOrgMutation = trpc.viewer.organizations.intentToCreateOrg.useMutation({
+    onSuccess: async (data) => {
+      reset({
+        onboardingId: data.organizationOnboardingId,
+      });
+
       if (data.checkoutUrl) {
+        // Billing enabled - redirect to Stripe
         window.location.href = data.checkoutUrl;
-      }
-    },
-    onError: (error) => {
-      setServerErrorMessage(t(error.message));
-    },
-  });
-
-  const createOrgMutation = trpc.viewer.organizations.createSelfHosted.useMutation({
-    onSuccess: async (data) => {
-      if (data.organization) {
-        // Invalidate the organizations query to ensure fresh data on the next page
+      } else if (data.organizationId) {
+        // Self-hosted - org already created, redirect to organizations
         await utils.viewer.organizations.listCurrent.invalidate();
         await session.update();
         reset();
         window.location.href = `${window.location.origin}/settings/organizations/profile`;
+      } else {
+        // Unexpected state
+        setServerErrorMessage("Unexpected response from server");
       }
     },
     onError: (error) => {
@@ -63,12 +63,10 @@ const useOrgCreation = () => {
     },
   });
 
-  const mutationToUse = isBillingEnabled ? checkoutMutation : createOrgMutation;
-
   return {
-    mutation: mutationToUse,
-    mutate: mutationToUse.mutate,
-    isPending: mutationToUse.isPending,
+    mutation: intentToCreateOrgMutation,
+    mutate: intentToCreateOrgMutation.mutate,
+    isPending: intentToCreateOrgMutation.isPending,
     errorMessage: serverErrorMessage,
   };
 };
@@ -84,7 +82,13 @@ export const AddNewTeamMembersForm = () => {
     invitedMembers,
     logo,
     bio,
-    onboardingId,
+    name,
+    slug,
+    billingPeriod,
+    seats,
+    pricePerSeat,
+    brandColor,
+    bannerUrl,
   } = useOnboardingStore();
   const orgCreation = useOrgCreation();
 
@@ -155,7 +159,7 @@ export const AddNewTeamMembersForm = () => {
                 placeholder="colleague@company.com"
               />
             </div>
-            <Button type="submit" StartIcon="plus" color="secondary">
+            <Button type="submit" StartIcon="plus" color="secondary" data-testid="invite-new-member-button">
               {t("add")}
             </Button>
           </form>
@@ -203,22 +207,31 @@ export const AddNewTeamMembersForm = () => {
         )}
       </div>
 
-      <div className="mt-3 mt-6 flex items-center justify-end">
+      <div className="mt-3 flex items-center justify-end">
         <Button
+          data-testid="publish-button"
           onClick={() => {
-            if (!onboardingId) {
-              console.error("Org owner email and onboardingId are required", {
-                orgOwnerEmail,
-                onboardingId,
-              });
+            // Submit ALL data to intentToCreateOrg
+            if (!name || !slug || !orgOwnerEmail) {
+              console.error("Required fields missing", { name, slug, orgOwnerEmail });
+              showToast(t("required_fields_missing"), "error");
               return;
             }
-            orgCreation.mutation.mutate({
+
+            orgCreation.mutate({
+              name,
+              slug,
+              orgOwnerEmail,
+              seats,
+              pricePerSeat,
+              billingPeriod,
+              creationSource: "WEBAPP" as const,
               logo,
               bio,
+              brandColor,
+              bannerUrl,
               teams,
               invitedMembers,
-              onboardingId,
             });
           }}
           loading={orgCreation.isPending}>
diff --git a/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx b/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
index e5854338494f47..2cedf3f3ab7a69 100644
--- a/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
@@ -6,8 +6,8 @@ import { useEffect, useState } from "react";
 import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
-import { Icon } from "@calcom/ui/components/icon";
 import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
 
 const PaymentStatusView = () => {
   const { t } = useLocale();
@@ -15,9 +15,7 @@ const PaymentStatusView = () => {
   const searchParams = useSearchParams();
   const paymentStatus = searchParams?.get("paymentStatus");
   const paymentError = searchParams?.get("error");
-  const { useOnboardingStore } = useOnboarding({
-    step: "status",
-  });
+  const { useOnboardingStore } = useOnboarding();
   const [organizationCreated, setOrganizationCreated] = useState<boolean>(false);
   const { name } = useOnboardingStore();
 
diff --git a/apps/web/modules/settings/organizations/new/resume-view.tsx b/apps/web/modules/settings/organizations/new/resume-view.tsx
new file mode 100644
index 00000000000000..84fe7b9fab679b
--- /dev/null
+++ b/apps/web/modules/settings/organizations/new/resume-view.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+
+import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+import { WizardLayout } from "@calcom/ui/components/layout";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <WizardLayout currentStep={1} maxSteps={5}>
+      {children}
+    </WizardLayout>
+  );
+};
+
+const ResumeOnboardingView = () => {
+  const { t } = useLocale();
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const onboardingIdParam = searchParams?.get("onboardingId");
+
+  const { dbOnboarding, isLoadingOrgOnboarding, useOnboardingStore } = useOnboarding();
+  const { reset } = useOnboardingStore();
+
+  useEffect(() => {
+    if (isLoadingOrgOnboarding) {
+      return;
+    }
+
+    if (!onboardingIdParam) {
+      router.push("/settings/organizations/new");
+      return;
+    }
+
+    if (!dbOnboarding) {
+      return;
+    }
+
+    if (dbOnboarding.isComplete) {
+      router.push("/settings/organizations");
+      return;
+    }
+
+    // Load onboarding data into store
+    reset({
+      onboardingId: dbOnboarding.id,
+      name: dbOnboarding.name,
+      slug: dbOnboarding.slug,
+      orgOwnerEmail: dbOnboarding.orgOwnerEmail,
+      billingPeriod: dbOnboarding.billingPeriod,
+      seats: dbOnboarding.seats,
+      pricePerSeat: dbOnboarding.pricePerSeat,
+      logo: dbOnboarding.logo,
+      bio: dbOnboarding.bio,
+      brandColor: dbOnboarding.brandColor,
+      bannerUrl: dbOnboarding.bannerUrl,
+    });
+
+    // Redirect to next step (About page)
+    router.push("/settings/organizations/new/about");
+  }, [dbOnboarding, isLoadingOrgOnboarding, onboardingIdParam, reset, router]);
+
+  if (isLoadingOrgOnboarding) {
+    return (
+      <SkeletonContainer className="space-y-4">
+        <SkeletonText className="h-8 w-full" />
+        <SkeletonText className="h-4 w-3/4" />
+        <SkeletonText className="h-4 w-1/2" />
+      </SkeletonContainer>
+    );
+  }
+
+  if (!onboardingIdParam) {
+    return (
+      <Alert
+        data-testid="error"
+        severity="error"
+        title={t("error")}
+        message={t("no_onboarding_id_provided")}
+      />
+    );
+  }
+
+  if (!dbOnboarding) {
+    return (
+      <Alert data-testid="error" severity="error" title={t("error")} message={t("onboarding_not_found")} />
+    );
+  }
+
+  if (dbOnboarding.isComplete) {
+    return (
+      <Alert
+        data-testid="error"
+        severity="info"
+        title={t("onboarding_already_complete")}
+        message={t("onboarding_already_complete_description")}
+      />
+    );
+  }
+
+  // Loading state while redirecting
+  return (
+    <SkeletonContainer className="space-y-4">
+      <SkeletonText className="h-8 w-full" />
+      <SkeletonText className="h-4 w-3/4" />
+    </SkeletonContainer>
+  );
+};
+
+export default ResumeOnboardingView;
diff --git a/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
new file mode 100644
index 00000000000000..34fe92f86f7ad9
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/blocklist-table.tsx
@@ -0,0 +1,207 @@
+"use client";
+
+import { keepPreviousData } from "@tanstack/react-query";
+import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table";
+import { useMemo, useState } from "react";
+
+import { DataTableWrapper, DataTableToolbar, useDataTable } from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
+
+import { BlocklistEntryDetailsSheet } from "./components/blocklist-entry-details-sheet";
+import { CreateBlocklistEntryModal } from "./components/create-blocklist-entry-modal";
+
+type BlocklistEntry = RouterOutputs["viewer"]["organizations"]["listWatchlistEntries"]["rows"][number];
+
+interface BlocklistTableProps {
+  permissions?: {
+    canRead: boolean;
+    canCreate: boolean;
+    canDelete: boolean;
+  };
+}
+
+export function BlocklistTable({ permissions }: BlocklistTableProps) {
+  const { t } = useLocale();
+  const { limit, offset, searchTerm } = useDataTable();
+
+  const [showCreateModal, setShowCreateModal] = useState(false);
+  const [showDetailsSheet, setShowDetailsSheet] = useState(false);
+  const [selectedEntry, setSelectedEntry] = useState<BlocklistEntry | null>(null);
+  const [entryToDelete, setEntryToDelete] = useState<BlocklistEntry | null>(null);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+  const { data, isPending } = trpc.viewer.organizations.listWatchlistEntries.useQuery(
+    {
+      limit,
+      offset,
+      searchTerm,
+    },
+    {
+      placeholderData: keepPreviousData,
+    }
+  );
+
+  const utils = trpc.useUtils();
+
+  const deleteWatchlistEntry = trpc.viewer.organizations.deleteWatchlistEntry.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listWatchlistEntries.invalidate();
+      showToast(t("blocklist_entry_deleted"), "success");
+      setShowDeleteDialog(false);
+      setEntryToDelete(null);
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const handleDelete = (entry: BlocklistEntry) => {
+    setEntryToDelete(entry);
+    setShowDeleteDialog(true);
+  };
+
+  const confirmDelete = () => {
+    if (entryToDelete) {
+      deleteWatchlistEntry.mutate({ id: entryToDelete.id });
+    }
+  };
+
+  const handleViewDetails = (entry: BlocklistEntry) => {
+    setSelectedEntry(entry);
+    setShowDetailsSheet(true);
+  };
+
+  const totalRowCount = data?.meta?.totalRowCount ?? 0;
+  const flatData = useMemo<BlocklistEntry[]>(() => data?.rows ?? [], [data]);
+
+  const columns = useMemo<ColumnDef<BlocklistEntry>[]>(
+    () => [
+      {
+        id: "value",
+        header: t("value"),
+        accessorKey: "value",
+        enableHiding: false,
+        cell: ({ row }) => <span className="text-emphasis">{row.original.value}</span>,
+      },
+      {
+        id: "type",
+        header: t("type"),
+        accessorKey: "type",
+        size: 100,
+        cell: ({ row }) => (
+          <Badge variant="blue">{row.original.type === "EMAIL" ? t("email") : t("domain")}</Badge>
+        ),
+      },
+      {
+        id: "createdBy",
+        header: t("blocked_by"),
+        size: 180,
+        cell: ({ row }) => {
+          const audit = row.original.audits?.[0] as
+            | { changedByUserId: number | null }
+            | {
+                changedByUser?: { id: number; email: string; name: string | null } | undefined;
+                changedByUserId: number | null;
+              }
+            | undefined;
+          const email =
+            (audit && "changedByUser" in audit ? audit.changedByUser?.email : undefined) ?? undefined;
+          return <span className="text-default">{email ?? "—"}</span>;
+        },
+      },
+      {
+        id: "actions",
+        header: "",
+        size: 120,
+        enableHiding: false,
+        enableSorting: false,
+        enableResizing: false,
+        cell: ({ row }) => {
+          const entry = row.original;
+          return (
+            <div className="flex items-center justify-end">
+              <ButtonGroup combined containerProps={{ className: "border-default" }}>
+                <Button
+                  color="secondary"
+                  variant="icon"
+                  StartIcon="eye"
+                  onClick={() => handleViewDetails(entry)}
+                  tooltip={t("view")}
+                />
+                {permissions?.canDelete && (
+                  <Button
+                    color="destructive"
+                    variant="icon"
+                    StartIcon="trash"
+                    onClick={() => handleDelete(entry)}
+                    tooltip={t("delete")}
+                  />
+                )}
+              </ButtonGroup>
+            </div>
+          );
+        },
+      },
+    ],
+    [t, permissions?.canDelete]
+  );
+
+  const table = useReactTable({
+    data: flatData,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    manualPagination: true,
+    pageCount: Math.ceil(totalRowCount / limit),
+  });
+
+  return (
+    <>
+      <DataTableWrapper
+        table={table}
+        isPending={isPending}
+        variant="default"
+        paginationMode="standard"
+        totalRowCount={totalRowCount}>
+        <div className="flex items-center justify-between">
+          <DataTableToolbar.SearchBar />
+          <div className="flex items-center gap-2">
+            {permissions?.canCreate && (
+              <Button color="primary" StartIcon="plus" onClick={() => setShowCreateModal(true)}>
+                {t("create_block_entry")}
+              </Button>
+            )}
+          </div>
+        </div>
+      </DataTableWrapper>
+
+      <CreateBlocklistEntryModal isOpen={showCreateModal} onClose={() => setShowCreateModal(false)} />
+
+      <BlocklistEntryDetailsSheet
+        entry={selectedEntry}
+        isOpen={showDetailsSheet}
+        onClose={() => {
+          setShowDetailsSheet(false);
+          setSelectedEntry(null);
+        }}
+      />
+
+      <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+        <ConfirmationDialogContent
+          variety="danger"
+          title={t("delete_blocklist_entry")}
+          confirmBtnText={t("delete")}
+          onConfirm={confirmDelete}>
+          {t("delete_blocklist_entry_confirmation", { value: entryToDelete?.value })}
+        </ConfirmationDialogContent>
+      </Dialog>
+    </>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx b/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
new file mode 100644
index 00000000000000..3ac4140fa21480
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/blocklist-entry-details-sheet.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import { format } from "date-fns";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { trpc } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@calcom/ui/components/sheet";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+
+type BlocklistEntry = RouterOutputs["viewer"]["organizations"]["listWatchlistEntries"]["rows"][number];
+
+interface BlocklistEntryDetailsSheetProps {
+  entry: BlocklistEntry | null;
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+export function BlocklistEntryDetailsSheet({ entry, isOpen, onClose }: BlocklistEntryDetailsSheetProps) {
+  const { t } = useLocale();
+
+  const { data, isLoading } = trpc.viewer.organizations.getWatchlistEntryDetails.useQuery(
+    { id: entry?.id ?? "" },
+    {
+      enabled: !!entry?.id && isOpen,
+    }
+  );
+
+  const getActionVariant = (action: string) => {
+    switch (action) {
+      case "BLOCK":
+        return "red";
+      case "REPORT":
+        return "orange";
+      case "ALERT":
+        return "blue";
+      default:
+        return "gray";
+    }
+  };
+
+  return (
+    <Sheet open={isOpen} onOpenChange={(open) => { if (!open) onClose(); }}>
+      <SheetContent className="overflow-y-auto">
+        <SheetHeader>
+          <SheetTitle>{t("blocklist_entry_details")}</SheetTitle>
+        </SheetHeader>
+
+        {isLoading ? (
+          <div className="mt-6 space-y-4">
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-10 w-full" />
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-10 w-full" />
+            <SkeletonText className="h-6 w-32" />
+            <SkeletonText className="h-20 w-full" />
+          </div>
+        ) : data?.entry ? (
+          <div className="mt-6">
+            <div className="space-y-4">
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("type")}</label>
+                <Badge variant="blue" size="lg">
+                  {data.entry.type === "EMAIL" ? t("email") : t("domain")}
+                </Badge>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("value")}</label>
+                <p className="text-emphasis text-base">{data.entry.value}</p>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("action")}</label>
+                <Badge variant={getActionVariant(data.entry.action)} size="lg">
+                  {t(data.entry.action.toLowerCase())}
+                </Badge>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("description")}</label>
+                <p className="text-default">{data.entry.description || t("no_description_provided")}</p>
+              </div>
+
+              <div>
+                <label className="text-default mb-1 block text-sm font-medium">{t("created_by")}</label>
+                <p className="text-default">{data.auditHistory[0]?.changedByUser?.email || "—"}</p>
+              </div>
+            </div>
+
+            <div className="border-subtle my-6 border-t" />
+
+            <div>
+              <h3 className="text-emphasis mb-4 font-semibold">{t("audit_history")}</h3>
+              {data.auditHistory.length > 0 ? (
+                <div className="space-y-0">
+                  {data.auditHistory.map((audit, index) => (
+                    <div
+                      key={audit.id}
+                      className={`py-3 ${
+                        index !== data.auditHistory.length - 1 ? "border-subtle border-b" : ""
+                      }`}>
+                      <div className="mb-1 flex items-start justify-between">
+                        <div className="flex items-center gap-1.5">
+                          <span className="text-muted text-xs">{t("by")}:</span>
+                          <span className="text-default text-sm">{audit.changedByUser?.email || "—"}</span>
+                        </div>
+                        <span className="text-muted text-xs">
+                          {format(new Date(audit.changedAt), "MMM d, h:mm a")}
+                        </span>
+                      </div>
+                      <div className="flex items-center gap-1.5">
+                        <span className="text-muted text-xs">{t("added")}:</span>
+                        <span className="text-emphasis text-sm">{audit.value}</span>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <p className="text-muted text-sm">{t("no_audit_history")}</p>
+              )}
+            </div>
+          </div>
+        ) : (
+          <div className="text-muted mt-8 text-center">{t("blocklist_entry_not_found")}</div>
+        )}
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
new file mode 100644
index 00000000000000..b2b5d036c2759f
--- /dev/null
+++ b/apps/web/modules/settings/organizations/privacy/components/create-blocklist-entry-modal.tsx
@@ -0,0 +1,173 @@
+"use client";
+
+import { Controller, useForm } from "react-hook-form";
+
+import { domainRegex, emailRegex } from "@calcom/lib/emailSchema";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { WatchlistType } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { Input, Select, Label, TextArea } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+
+interface CreateBlocklistEntryModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+interface FormData {
+  type: WatchlistType;
+  value: string;
+  description?: string;
+}
+
+export function CreateBlocklistEntryModal({ isOpen, onClose }: CreateBlocklistEntryModalProps) {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+
+  const {
+    control,
+    handleSubmit,
+    watch,
+    setValue,
+    reset,
+    formState: { errors, isSubmitting },
+  } = useForm<FormData>({
+    defaultValues: {
+      type: WatchlistType.EMAIL,
+      value: "",
+      description: "",
+    },
+  });
+
+  const watchType = watch("type");
+
+  const createWatchlistEntry = trpc.viewer.organizations.createWatchlistEntry.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.organizations.listWatchlistEntries.invalidate();
+      showToast(t("blocklist_entry_created"), "success");
+      onClose();
+      reset();
+    },
+    onError: (error) => {
+      showToast(error.message, "error");
+    },
+  });
+
+  const onSubmit = (data: FormData) => {
+    createWatchlistEntry.mutate({
+      type: data.type,
+      value: data.value,
+      description: data.description,
+    });
+  };
+
+  const validateValue = (value: string) => {
+    if (!value) return t("required");
+
+    if (watchType === WatchlistType.EMAIL) {
+      if (!emailRegex.test(value)) {
+        return t("invalid_email_address");
+      }
+    } else if (watchType === WatchlistType.DOMAIN) {
+      if (!domainRegex.test(value)) {
+        return t("invalid_domain_format");
+      }
+    }
+
+    return true;
+  };
+
+  const typeOptions = [
+    { label: t("email"), value: WatchlistType.EMAIL },
+    { label: t("domain"), value: WatchlistType.DOMAIN },
+  ];
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onClose}>
+      <DialogContent enableOverflow>
+        <DialogHeader title={t("create_block_entry")} />
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div className="space-y-4">
+            <div>
+              <Label htmlFor="type" className="text-emphasis mb-2 block text-sm font-medium">
+                {t("what_would_you_like_to_block")} <span className="text-destructive">*</span>
+              </Label>
+              <Controller
+                name="type"
+                control={control}
+                rules={{ required: t("field_required") }}
+                render={({ field }) => (
+                  <Select
+                    {...field}
+                    options={typeOptions}
+                    onChange={(option) => {
+                      if (option) {
+                        field.onChange(option.value);
+                        setValue("value", "");
+                      }
+                    }}
+                    value={typeOptions.find((opt) => opt.value === field.value)}
+                  />
+                )}
+              />
+              {errors.type && <p className="text-destructive mt-1 text-sm">{errors.type.message}</p>}
+            </div>
+
+            <div>
+              <Label htmlFor="value" className="text-emphasis mb-2 block text-sm font-medium">
+                {watchType === WatchlistType.EMAIL ? t("email_address") : t("domain_name")}{" "}
+                <span className="text-destructive">*</span>
+              </Label>
+              <Controller
+                name="value"
+                control={control}
+                rules={{
+                  required: t("field_required"),
+                  validate: validateValue,
+                }}
+                render={({ field }) => (
+                  <Input
+                    {...field}
+                    placeholder={watchType === WatchlistType.EMAIL ? "user@example.com" : "spammer.com"}
+                  />
+                )}
+              />
+              {errors.value && <p className="text-destructive mt-1 text-sm">{errors.value.message}</p>}
+            </div>
+
+            <div>
+              <Label htmlFor="description" className="text-emphasis mb-2 block text-sm font-medium">
+                {t("description")} <span className="text-subtle font-normal">({t("optional")})</span>
+              </Label>
+              <Controller
+                name="description"
+                control={control}
+                render={({ field }) => (
+                  <TextArea {...field} placeholder={t("reason_for_adding_to_blocklist")} rows={3} />
+                )}
+              />
+            </div>
+          </div>
+
+          <DialogFooter className="mt-6">
+            <Button
+              type="button"
+              color="secondary"
+              onClick={onClose}
+              disabled={isSubmitting || createWatchlistEntry.isPending}>
+              {t("cancel")}
+            </Button>
+            <Button
+              type="submit"
+              loading={isSubmitting || createWatchlistEntry.isPending}
+              disabled={isSubmitting || createWatchlistEntry.isPending}>
+              {t("create_entry")}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/modules/settings/teams/[id]/event-types-view.tsx b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
index f03018423099f0..c06a3afbccedf8 100644
--- a/apps/web/modules/settings/teams/[id]/event-types-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
@@ -4,8 +4,8 @@ import { useRouter } from "next/navigation";
 
 import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
 import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
+import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
diff --git a/apps/web/modules/test-setup.ts b/apps/web/modules/test-setup.ts
index 25148028b12f86..8b05766057600d 100644
--- a/apps/web/modules/test-setup.ts
+++ b/apps/web/modules/test-setup.ts
@@ -60,7 +60,7 @@ vi.mock("@calcom/features/bookings/components/event-meta/Price", () => {
   return {};
 });
 
-vi.mock("@calcom/features/bookings/lib/SystemField", () => {
+vi.mock("@calcom/lib/bookings/SystemField", () => {
   return {};
 });
 
diff --git a/apps/web/modules/users/views/users-public-view.test.tsx b/apps/web/modules/users/views/users-public-view.test.tsx
index 466122ff75aff0..407f2a6293eae7 100644
--- a/apps/web/modules/users/views/users-public-view.test.tsx
+++ b/apps/web/modules/users/views/users-public-view.test.tsx
@@ -20,7 +20,14 @@ function mockedUserPageComponentProps(props: Partial<React.ComponentProps<typeof
       theme: "dark",
       brandColor: "red",
       darkBrandColor: "black",
-      organization: { requestedSlug: "slug", slug: "slug", id: 1 },
+      organization: {
+        requestedSlug: "slug",
+        slug: "slug",
+        id: 1,
+        brandColor: null,
+        darkBrandColor: null,
+        theme: null,
+      },
       allowSEOIndexing: true,
       username: "john",
     },
diff --git a/apps/web/package.json b/apps/web/package.json
index cdb294a9620621..33022163e2acab 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "5.7.10",
+  "version": "5.8.1",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",
@@ -201,7 +201,8 @@
     "tailwindcss": "^3.3.3",
     "tailwindcss-animate": "^1.0.6",
     "ts-node": "^10.9.1",
-    "typescript": "^5.9.0-beta"
+    "typescript": "^5.9.0-beta",
+    "turbo": "^2.5.5"
   },
   "nextBundleAnalysis": {
     "budget": 358400,
diff --git a/apps/web/pages/_error.tsx b/apps/web/pages/_error.tsx
index 50dce26a4110d7..b20f35a256c2f6 100644
--- a/apps/web/pages/_error.tsx
+++ b/apps/web/pages/_error.tsx
@@ -7,6 +7,7 @@ import type { ErrorProps } from "next/error";
 import NextError from "next/error";
 import React from "react";
 
+import "@calcom/embed-core/src/embed-iframe";
 import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
diff --git a/apps/web/pages/api/book/event.ts b/apps/web/pages/api/book/event.ts
index a4ca317048692b..85a7480771539d 100644
--- a/apps/web/pages/api/book/event.ts
+++ b/apps/web/pages/api/book/event.ts
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
+import { getRegularBookingService } from "@calcom/features/bookings/di/RegularBookingService.container";
 import { BotDetectionService } from "@calcom/features/bot-detection";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
@@ -9,7 +9,7 @@ import getIP from "@calcom/lib/getIP";
 import { piiHasher } from "@calcom/lib/server/PiiHasher";
 import { checkCfTurnstileToken } from "@calcom/lib/server/checkCfTurnstileToken";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import prisma from "@calcom/prisma";
 import { CreationSource } from "@calcom/prisma/enums";
 
@@ -45,11 +45,14 @@ async function handler(req: NextApiRequest & { userId?: number }) {
     creationSource: CreationSource.WEBAPP,
   };
 
-  const booking = await handleNewBooking({
+  const regularBookingService = getRegularBookingService();
+  const booking = await regularBookingService.createBooking({
     bookingData: req.body,
-    userId: session?.user?.id || -1,
-    hostname: req.headers.host || "",
-    forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
+    bookingMeta: {
+      userId: session?.user?.id || -1,
+      hostname: req.headers.host || "",
+      forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
+    },
   });
   // const booking = await createBookingThroughFactory();
   return booking;
diff --git a/apps/web/pages/api/book/instant-event.ts b/apps/web/pages/api/book/instant-event.ts
index bcabfa472f4f44..f809795c10c744 100644
--- a/apps/web/pages/api/book/instant-event.ts
+++ b/apps/web/pages/api/book/instant-event.ts
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import handleInstantMeeting from "@calcom/features/instant-meeting/handleInstantMeeting";
+import { getInstantBookingCreateService } from "@calcom/features/bookings/di/InstantBookingCreateService.container";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import getIP from "@calcom/lib/getIP";
 import { piiHasher } from "@calcom/lib/server/PiiHasher";
@@ -19,7 +19,14 @@ async function handler(req: NextApiRequest & { userId?: number }) {
   const session = await getServerSession({ req });
   req.userId = session?.user?.id || -1;
   req.body.creationSource = CreationSource.WEBAPP;
-  const booking = await handleInstantMeeting(req);
+
+  const instantBookingService = getInstantBookingCreateService();
+  // Even though req.body is any type, createBooking validates the schema on run-time.
+  // TODO: We should do the run-time schema validation here and pass a typed bookingData instead and then run-time schema could be removed from createBooking. Then we can remove the any type from req.body.
+  const booking = await instantBookingService.createBooking({
+    bookingData: req.body,
+  });
+
   return booking;
 }
 export default defaultResponder(handler);
diff --git a/apps/web/pages/api/book/recurring-event.ts b/apps/web/pages/api/book/recurring-event.ts
index d7dae48827ec2c..23b9a28fae670c 100644
--- a/apps/web/pages/api/book/recurring-event.ts
+++ b/apps/web/pages/api/book/recurring-event.ts
@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { handleNewRecurringBooking } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
+import { getRecurringBookingService } from "@calcom/features/bookings/di/RecurringBookingService.container";
 import type { BookingResponse } from "@calcom/features/bookings/types";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import getIP from "@calcom/lib/getIP";
@@ -43,15 +43,18 @@ async function handler(req: NextApiRequest & RequestMeta) {
   const session = await getServerSession({ req });
   /* To mimic API behavior and comply with types */
 
-  const createdBookings: BookingResponse[] = await handleNewRecurringBooking({
+  const recurringBookingService = getRecurringBookingService();
+  const createdBookings: BookingResponse[] = await recurringBookingService.createBooking({
     bookingData: req.body,
-    userId: session?.user?.id || -1,
-    platformClientId: req.platformClientId,
-    platformCancelUrl: req.platformCancelUrl,
-    platformBookingUrl: req.platformBookingUrl,
-    platformRescheduleUrl: req.platformRescheduleUrl,
-    platformBookingLocation: req.platformBookingLocation,
-    noEmail: req.noEmail,
+    bookingMeta: {
+      userId: session?.user?.id || -1,
+      platformClientId: req.platformClientId,
+      platformCancelUrl: req.platformCancelUrl,
+      platformBookingUrl: req.platformBookingUrl,
+      platformRescheduleUrl: req.platformRescheduleUrl,
+      platformBookingLocation: req.platformBookingLocation,
+      noEmail: req.noEmail,
+    },
   });
 
   return createdBookings;
diff --git a/apps/web/playwright/booking-duplicate-api-calls.e2e.ts b/apps/web/playwright/booking-duplicate-api-calls.e2e.ts
index fb8030f1d74d2b..41ce78aa489f38 100644
--- a/apps/web/playwright/booking-duplicate-api-calls.e2e.ts
+++ b/apps/web/playwright/booking-duplicate-api-calls.e2e.ts
@@ -1,45 +1,87 @@
 import { expect } from "@playwright/test";
+import type { Page } from "@playwright/test";
 
 import { createTeamEventType } from "./fixtures/users";
 import { test } from "./lib/fixtures";
 
+async function testDuplicateAPICalls(
+  page: Page,
+  url: string,
+  testDate?: Date
+): Promise<{ totalCalls: number; trpcCalls: number; apiV2Calls: number }> {
+  const trpcCalls: string[] = [];
+  const apiV2Calls: string[] = [];
+
+  if (testDate) {
+    await page.clock.install({ time: testDate });
+  }
+
+  await page.route("**/api/trpc/slots/getSchedule**", async (route) => {
+    trpcCalls.push(route.request().url());
+    await route.continue();
+  });
+
+  await page.route("**/api/v2/slots/available**", async (route) => {
+    apiV2Calls.push(route.request().url());
+    await route.continue();
+  });
+
+  await page.goto(url);
+  await page.waitForTimeout(5000);
+
+  return {
+    totalCalls: trpcCalls.length + apiV2Calls.length,
+    trpcCalls: trpcCalls.length,
+    apiV2Calls: apiV2Calls.length,
+  };
+}
+
 test.describe("Duplicate API Calls Prevention", () => {
   test.afterEach(({ users }) => users.deleteAll());
 
-  test("should detect when schedule endpoints are called multiple times for individual user events", async ({
+  test("should detect when schedule endpoints are called multiple times for individual user events - beginning of month", async ({
     page,
     users,
   }) => {
     const user = await users.create();
     const eventType = user.eventTypes.find((e) => e.slug === "30-min");
+    const beginningOfMonth = new Date();
+    beginningOfMonth.setDate(5);
 
-    const trpcCalls: string[] = [];
-    const apiV2Calls: string[] = [];
-
-    // Intercept tRPC getSchedule calls - pattern matches /api/trpc/slots/getSchedule
-    await page.route("**/api/trpc/slots/getSchedule**", async (route) => {
-      trpcCalls.push(route.request().url());
-      await route.continue();
-    });
-
-    await page.route("**/api/v2/slots/available**", async (route) => {
-      apiV2Calls.push(route.request().url());
-      await route.continue();
-    });
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/${user.username}/${eventType?.slug}`,
+      beginningOfMonth
+    );
 
-    await page.goto(`/${user.username}/${eventType?.slug}`);
+    expect(totalCalls).toBeGreaterThan(0);
+    expect(totalCalls).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
+  });
 
-    await page.waitForTimeout(5000);
+  test("should detect when schedule endpoints are called multiple times for individual user events - end of month", async ({
+    page,
+    users,
+  }) => {
+    const user = await users.create();
+    const eventType = user.eventTypes.find((e) => e.slug === "30-min");
+    const endOfMonth = new Date();
+    endOfMonth.setDate(20);
 
-    const totalCalls = trpcCalls.length + apiV2Calls.length;
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/${user.username}/${eventType?.slug}`,
+      endOfMonth
+    );
 
     expect(totalCalls).toBeGreaterThan(0);
     expect(totalCalls).toBeLessThanOrEqual(1);
-    expect(trpcCalls.length).toBeLessThanOrEqual(1);
-    expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
   });
 
-  test("should detect when schedule endpoints are called multiple times for team events", async ({
+  test("should detect when schedule endpoints are called multiple times for team events - beginning of month", async ({
     page,
     users,
   }) => {
@@ -50,6 +92,8 @@ test.describe("Duplicate API Calls Prevention", () => {
         teammates: [{ name: "teammate-1" }],
       }
     );
+    const beginningOfMonth = new Date();
+    beginningOfMonth.setDate(5);
 
     const { team } = await teamOwner.getFirstTeamMembership();
     const teamEvent = await createTeamEventType(
@@ -58,32 +102,52 @@ test.describe("Duplicate API Calls Prevention", () => {
       { teamEventSlug: "team-event-test", teamEventTitle: "Team Event Test" }
     );
 
-    const trpcCalls: string[] = [];
-    const apiV2Calls: string[] = [];
-
-    await page.route("**/api/trpc/slots/getSchedule**", async (route) => {
-      trpcCalls.push(route.request().url());
-      await route.continue();
-    });
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/team/${team.slug}/${teamEvent.slug}`,
+      beginningOfMonth
+    );
 
-    await page.route("**/api/v2/slots/available**", async (route) => {
-      apiV2Calls.push(route.request().url());
-      await route.continue();
-    });
+    expect(totalCalls).toBeGreaterThan(0);
+    expect(totalCalls).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
+  });
 
-    await page.goto(`/team/${team.slug}/${teamEvent.slug}`);
+  test("should detect when schedule endpoints are called multiple times for team events - end of month", async ({
+    page,
+    users,
+  }) => {
+    const teamOwner = await users.create(
+      { name: "Team Owner" },
+      {
+        hasTeam: true,
+        teammates: [{ name: "teammate-1" }],
+      }
+    );
 
-    await page.waitForTimeout(5000);
+    const { team } = await teamOwner.getFirstTeamMembership();
+    const teamEvent = await createTeamEventType(
+      { id: teamOwner.id },
+      { id: team.id },
+      { teamEventSlug: "team-event-test", teamEventTitle: "Team Event Test" }
+    );
+    const endOfMonth = new Date();
+    endOfMonth.setDate(20);
 
-    const totalCalls = trpcCalls.length + apiV2Calls.length;
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/team/${team.slug}/${teamEvent.slug}`,
+      endOfMonth
+    );
 
     expect(totalCalls).toBeGreaterThan(0);
     expect(totalCalls).toBeLessThanOrEqual(1);
-    expect(trpcCalls.length).toBeLessThanOrEqual(1);
-    expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
   });
 
-  test("should detect when schedule endpoints are called multiple times for organization team events", async ({
+  test("should detect when schedule endpoints are called multiple times for organization team events - beginning of month", async ({
     page,
     users,
   }) => {
@@ -105,29 +169,55 @@ test.describe("Duplicate API Calls Prevention", () => {
       { id: team.id },
       { teamEventSlug: "org-team-event", teamEventTitle: "Org Team Event" }
     );
+    const beginningOfMonth = new Date();
+    beginningOfMonth.setDate(5);
 
-    const trpcCalls: string[] = [];
-    const apiV2Calls: string[] = [];
-
-    await page.route("**/api/trpc/slots/getSchedule**", async (route) => {
-      trpcCalls.push(route.request().url());
-      await route.continue();
-    });
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/org/${org.slug}/${team.slug}/${teamEvent.slug}`,
+      beginningOfMonth
+    );
 
-    await page.route("**/api/v2/slots/available**", async (route) => {
-      apiV2Calls.push(route.request().url());
-      await route.continue();
-    });
+    expect(totalCalls).toBeGreaterThan(0);
+    expect(totalCalls).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
+  });
 
-    await page.goto(`/org/${org.slug}/${team.slug}/${teamEvent.slug}`);
+  test("should detect when schedule endpoints are called multiple times for organization team events - end of month", async ({
+    page,
+    users,
+  }) => {
+    const orgOwner = await users.create(
+      { name: "Org Owner" },
+      {
+        hasTeam: true,
+        teammates: [{ name: "teammate-1" }],
+        isOrg: true,
+        isOrgVerified: true,
+        hasSubteam: true,
+      }
+    );
 
-    await page.waitForTimeout(5000);
+    const { team } = await orgOwner.getFirstTeamMembership();
+    const { team: org } = await orgOwner.getOrgMembership();
+    const teamEvent = await createTeamEventType(
+      { id: orgOwner.id },
+      { id: team.id },
+      { teamEventSlug: "org-team-event", teamEventTitle: "Org Team Event" }
+    );
+    const endOfMonth = new Date();
+    endOfMonth.setDate(20);
 
-    const totalCalls = trpcCalls.length + apiV2Calls.length;
+    const { totalCalls, trpcCalls, apiV2Calls } = await testDuplicateAPICalls(
+      page,
+      `/org/${org.slug}/${team.slug}/${teamEvent.slug}`,
+      endOfMonth
+    );
 
     expect(totalCalls).toBeGreaterThan(0);
     expect(totalCalls).toBeLessThanOrEqual(1);
-    expect(trpcCalls.length).toBeLessThanOrEqual(1);
-    expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    expect(trpcCalls).toBeLessThanOrEqual(1);
+    expect(apiV2Calls).toBeLessThanOrEqual(1);
   });
 });
diff --git a/apps/web/playwright/booking-seats.e2e.ts b/apps/web/playwright/booking-seats.e2e.ts
index 9b6224f0a74159..4bc016ef835c98 100644
--- a/apps/web/playwright/booking-seats.e2e.ts
+++ b/apps/web/playwright/booking-seats.e2e.ts
@@ -541,9 +541,10 @@ test.describe("Reschedule for booking with seats", () => {
       data: bookingSeats,
     });
 
-    const references = await prisma.bookingSeat.findMany({
-      where: { bookingId: booking.id },
-      orderBy: { id: "asc" },
+    const secondAttendeeId = bookingAttendees.find((attendee)=> attendee.email === "second+seats@cal.com");
+
+    const references = await prisma.bookingSeat.findFirst({
+      where: { bookingId: booking.id, attendeeId: secondAttendeeId?.id },
     });
 
     const secondUser = await users.create({
@@ -556,13 +557,14 @@ test.describe("Reschedule for booking with seats", () => {
     await page.waitForSelector('[data-testid="bookings"]');
 
     await page.locator('[data-testid="booking-actions-dropdown"]').nth(0).click();
+    const href = await page.locator('[data-testid="reschedule"]').getAttribute("href");
+    expect(href).toBeTruthy();
+    const url = new URL(href!, page.url());
+    const seatReferenceUid = url.searchParams.get('seatReferenceUid');
+    expect(seatReferenceUid).toBeTruthy();
+    expect(seatReferenceUid).toBe(references?.referenceUid);
     await page.locator('[data-testid="reschedule"]').click();
 
-    await page.waitForURL((url) => {
-      const rescheduleUid = url.searchParams.get("rescheduleUid");
-      return !!rescheduleUid && rescheduleUid === references[1].referenceUid;
-    });
-
     await selectFirstAvailableTimeSlotNextMonth(page);
 
     const nameElement = page.locator("input[name=name]");
diff --git a/apps/web/playwright/fixtures/apps.ts b/apps/web/playwright/fixtures/apps.ts
index b511b041a8e2c2..e2c359b10522c1 100644
--- a/apps/web/playwright/fixtures/apps.ts
+++ b/apps/web/playwright/fixtures/apps.ts
@@ -117,6 +117,7 @@ export function createAppsFixture(page: Page) {
     },
     goToAppsTab: async () => {
       await page.getByTestId("vertical-tab-apps").click();
+      await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page");
     },
     activeApp: async (app: string) => {
       await page.locator(`[data-testid='${app}-app-switch']`).click();
@@ -126,7 +127,7 @@ export function createAppsFixture(page: Page) {
     },
     verifyAppsInfoNew: async (app: string, eventTypeId: number) => {
       await page.goto(`event-types/${eventTypeId}?tabName=apps`);
-      await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); // fix the race condition
+      await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page"); // fix the race condition
       await expect(page.locator(`[data-testid='${app}-app-switch'][data-state="checked"]`)).toBeVisible();
     },
   };
diff --git a/apps/web/playwright/fixtures/users.ts b/apps/web/playwright/fixtures/users.ts
index 604528d4199c14..67584a7cb58a7a 100644
--- a/apps/web/playwright/fixtures/users.ts
+++ b/apps/web/playwright/fixtures/users.ts
@@ -8,7 +8,7 @@ import updateChildrenEventTypes from "@calcom/features/ee/managed-event-types/li
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
 import type Prisma from "@calcom/prisma/client";
 import type { Team } from "@calcom/prisma/client";
diff --git a/apps/web/playwright/lib/orgMigration.ts b/apps/web/playwright/lib/orgMigration.ts
index 92663bd65a02b5..3427adcadb17ab 100644
--- a/apps/web/playwright/lib/orgMigration.ts
+++ b/apps/web/playwright/lib/orgMigration.ts
@@ -1,9 +1,9 @@
 import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
 import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
 import prisma from "@calcom/prisma";
 import type { Team, User } from "@calcom/prisma/client";
 import { Prisma } from "@calcom/prisma/client";
diff --git a/apps/web/playwright/organization/organization-creation-flows.e2e.ts b/apps/web/playwright/organization/organization-creation-flows.e2e.ts
new file mode 100644
index 00000000000000..95ed2f0f65c577
--- /dev/null
+++ b/apps/web/playwright/organization/organization-creation-flows.e2e.ts
@@ -0,0 +1,451 @@
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
+import { uuid } from "short-uuid";
+
+import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
+
+import { test } from "../lib/fixtures";
+
+/**
+ * Utility function to complete the organization onboarding wizard steps
+ * (about, add-teams, onboard-members)
+ */
+async function completeOnboardingWizard(
+  page: Page,
+  options: {
+    aboutText?: string;
+    teams?: string[];
+    members?: string[];
+  } = {}
+) {
+  const { aboutText = "Test organization description", teams = ["Engineering"], members = [] } = options;
+
+  // Step 1: Complete "About" step
+  await page.waitForURL("**/settings/organizations/new/about");
+  await page.locator('textarea[name="about"]').fill(aboutText);
+  await page.locator("button[type=submit]").click();
+
+  // Step 2: Complete "Add Teams" step
+  await page.waitForURL("**/settings/organizations/new/add-teams");
+  for (let i = 0; i < teams.length; i++) {
+    await page.getByTestId(`team.${i}.name`).fill(teams[i]);
+    if (i < teams.length - 1) {
+      await page.getByTestId("add_a_team").click();
+    }
+  }
+  await page.locator("button[type=submit]").click();
+
+  // Step 3: Complete "Onboard Members" step
+  await page.waitForURL("**/settings/organizations/new/onboard-members");
+
+  // Add members if provided
+  for (const memberEmail of members) {
+    await page.locator('[placeholder="colleague\\@company\\.com"]').fill(memberEmail);
+    await page.getByTestId("invite-new-member-button").click();
+    await expect(page.getByTestId("pending-member-list")).toContainText(memberEmail);
+  }
+
+  // Click publish and wait for response
+  const responsePromise = page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**");
+  await page.getByTestId("publish-button").click();
+
+  const response = await responsePromise;
+  const responseData = await response.json();
+
+  // TRPC batch response is an array with one element
+  const result = responseData[0].result.data.json;
+
+  return result;
+}
+
+test.describe("Organization Creation Flows - Comprehensive Suite", () => {
+  test.afterEach(({ users, orgs }) => {
+    users.deleteAll();
+    orgs.deleteAll();
+  });
+
+  test.describe("Admin Handover Flow (Billing Disabled)", () => {
+    test("Admin creates org for existing user - handover and complete", async ({ page, users }) => {
+      // Setup: Create admin and future owner
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const ownerEmail = users.trackEmail({
+        username: "orgowner",
+        domain: "example.com",
+      });
+      const ownerUser = await users.create({
+        username: "orgowner",
+        email: ownerEmail,
+      });
+
+      const orgName = "Test Organization";
+      const orgSlug = `test-org-${uuid()}`.toLowerCase();
+
+      // Step 1: Admin fills form
+      await page.goto("/settings/organizations/new");
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      // If billing enabled, admin sees billing fields but we're testing billing disabled scenario
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("10");
+        await page.locator("input[name=pricePerSeat]").fill("15");
+      }
+
+      // Submit and wait for intentToCreateOrg
+      await Promise.all([
+        page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
+        page.locator("button[type=submit]").click(),
+      ]);
+
+      // Step 2: Verify admin is on handover page
+      await page.waitForURL("**/settings/organizations/new/handover");
+
+      const onboardingUrlElement = page.getByTestId("onboarding-url");
+      await expect(onboardingUrlElement).toBeVisible();
+
+      const onboardingUrl = await onboardingUrlElement.textContent();
+      expect(onboardingUrl).toContain("/settings/organizations/new/resume?onboardingId=");
+
+      // Extract onboardingId from URL
+      const onboardingIdMatch = onboardingUrl?.match(/onboardingId=([\w-]+)/);
+      expect(onboardingIdMatch).toBeTruthy();
+      const onboardingId = onboardingIdMatch?.[1];
+
+      // Step 3: Switch to owner user
+      await page.context().clearCookies();
+      await ownerUser.apiLogin();
+
+      // Step 4: Owner opens resume URL and completes the onboarding wizard
+      await page.goto(`/settings/organizations/new/resume?onboardingId=${onboardingId}`);
+
+      const memberEmail = users.trackEmail({ username: "member1", domain: "example.com" });
+      const result = await completeOnboardingWizard(page, {
+        aboutText: "This is our test organization",
+        teams: ["Engineering", "Marketing"],
+        members: [memberEmail],
+      });
+
+      // Verify the organization was created successfully in the API response
+      expect(result.organizationId).toBeTruthy();
+      expect(result.name).toBe(orgName);
+      expect(result.slug).toBe(orgSlug);
+    });
+
+    test("Admin creates org for self - immediate creation", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const orgName = "Admin Org";
+      const orgSlug = `admin-org-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      // Fill form with admin's own email
+      await page.locator("input[name=orgOwnerEmail]").fill(admin.email);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("5");
+        await page.locator("input[name=pricePerSeat]").fill("20");
+      }
+
+      // Submit - admin creating for self goes through wizard
+      await page.locator("button[type=submit]").click();
+
+      // Admin creating for self goes through the onboarding wizard
+      const result = await completeOnboardingWizard(page, {
+        aboutText: "Admin's organization",
+        teams: ["Operations"],
+        members: [],
+      });
+
+      // Verify the organization was created successfully
+      expect(result.organizationId).toBeTruthy();
+      expect(result.name).toBe(orgName);
+      expect(result.slug).toBe(orgSlug);
+    });
+
+    test("Admin handover URL structure is correct", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const ownerEmail = users.trackEmail({
+        username: "testowner",
+        domain: "example.com",
+      });
+      await users.create({
+        username: "testowner",
+        email: ownerEmail,
+      });
+
+      const orgName = "Handover Test";
+      const orgSlug = `handover-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("10");
+        await page.locator("input[name=pricePerSeat]").fill("15");
+      }
+
+      const responsePromise = page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**");
+      await page.locator("button[type=submit]").click();
+
+      // Wait for the response
+      await responsePromise;
+
+      // Wait for redirect to handover page
+      await page.waitForURL("**/settings/organizations/new/handover");
+
+      // Wait for handover page elements to be visible (with longer timeout for store to populate)
+      await expect(page.getByTestId("onboarding-url")).toBeVisible({ timeout: 10000 });
+      await expect(page.getByTestId("copy-onboarding-url")).toBeVisible();
+
+      const onboardingUrl = await page.getByTestId("onboarding-url").textContent();
+
+      // Verify URL format
+      expect(onboardingUrl).toMatch(/\/settings\/organizations\/new\/resume\?onboardingId=[\w-]+/);
+
+      // Verify copy button is clickable (toast message may vary by locale)
+      await page.getByTestId("copy-onboarding-url").click();
+    });
+  });
+
+  test.describe("Non-Admin User Flow", () => {
+    test("Regular user creates org through full wizard", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "regularuser",
+        email: users.trackEmail({ username: "regularuser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      const orgName = "User Organization";
+      const orgSlug = `user-org-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify user email is pre-filled and disabled
+      const emailInput = page.locator("input[name=orgOwnerEmail]");
+      await expect(emailInput).toBeDisabled();
+      await expect(emailInput).toHaveValue(user.email);
+
+      // Verify billing fields are NOT visible to regular users
+      if (IS_TEAM_BILLING_ENABLED) {
+        await expect(page.locator("input[name=seats]")).not.toBeVisible();
+        await expect(page.locator("input[name=pricePerSeat]")).not.toBeVisible();
+
+        // Verify "Upgrade to Organizations" UI is shown
+        await expect(page.getByText(/upgrade to organizations/i)).toBeVisible();
+      }
+
+      // Fill form
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      await page.locator("button[type=submit]").click();
+
+      // Verify navigated to /about step
+      await page.waitForURL("**/settings/organizations/new/about");
+
+      // Complete about step
+      await page.locator('textarea[name="about"]').fill("User's organization description");
+      await page.locator("button[type=submit]").click();
+
+      // Complete add-teams step
+      await page.waitForURL("**/settings/organizations/new/add-teams");
+      await page.getByTestId("team.0.name").fill("Team Alpha");
+      await page.locator("button[type=submit]").click();
+
+      // Complete onboard-members step
+      await page.waitForURL("**/settings/organizations/new/onboard-members");
+      await Promise.all([
+        page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
+        page.getByTestId("publish-button").click(),
+      ]);
+
+      // In billing enabled mode, should redirect to Stripe or payment
+      // In billing disabled mode, org created immediately
+      if (IS_TEAM_BILLING_ENABLED) {
+        // Would redirect to Stripe checkout
+        await page.waitForURL(/checkout\.stripe\.com|\/settings\/organizations/);
+      } else {
+        // After org creation, session update causes redirect to profile page
+        // Wait for it to load, then navigate to organizations
+        await page.waitForURL("**/settings/my-account/profile");
+        await page.goto("/settings/organizations");
+        await page.waitForURL(/\/settings\/organizations/);
+      }
+    });
+
+    test("Regular user - email field is disabled", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "testuser",
+        email: users.trackEmail({ username: "testuser", domain: "company.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify email field state
+      const emailInput = page.locator("input[name=orgOwnerEmail]");
+      await expect(emailInput).toBeVisible();
+      await expect(emailInput).toBeDisabled();
+      await expect(emailInput).toHaveValue(user.email);
+
+      // Verify name and slug are derived from email domain
+      const nameInput = page.locator("input[name=name]");
+      const slugInput = page.locator("input[name=slug]");
+
+      // Name should be capitalized version of domain
+      const nameValue = await nameInput.inputValue();
+      expect(nameValue).toBeTruthy();
+      expect(nameValue).toMatch(/company/i);
+
+      // Slug should be domain-based
+      const slugValue = await slugInput.inputValue();
+      expect(slugValue).toBeTruthy();
+      expect(slugValue).toContain("company");
+    });
+  });
+
+  test.describe("Form Validation", () => {
+    test("Admin form - required fields validation", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Submit empty form
+      await page.locator("button[type=submit]").click();
+
+      // Should show validation errors
+      await expect(page.getByTestId("field-error")).toHaveCount(2); // name and slug required
+    });
+
+    test("Slug already taken shows error", async ({ page, users, orgs }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      // Create an existing org with a specific slug
+      const existingSlug = `existing-${uuid()}`.toLowerCase();
+      await orgs.create({
+        name: "Existing Org",
+        slug: existingSlug,
+      });
+
+      await page.goto("/settings/organizations/new");
+
+      const ownerEmail = users.trackEmail({ username: "owner", domain: "example.com" });
+      await users.create({ username: "owner", email: ownerEmail });
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill("New Org");
+      await page.locator("input[name=slug]").fill(existingSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("5");
+        await page.locator("input[name=pricePerSeat]").fill("10");
+      }
+
+      await page.locator("button[type=submit]").click();
+
+      // Should show slug taken error
+      await expect(page.getByText(/url.*taken|already.*exists/i)).toBeVisible();
+    });
+  });
+
+  test.describe("Navigation Between Steps", () => {
+    test("User can navigate through wizard steps", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "wizarduser",
+        email: users.trackEmail({ username: "wizarduser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      const orgName = "Wizard Test";
+      const orgSlug = `wizard-${uuid()}`.toLowerCase();
+
+      // Step 1
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+      await page.locator("button[type=submit]").click();
+
+      // Step 2: About
+      await page.waitForURL("**/settings/organizations/new/about");
+      await page.locator('textarea[name="about"]').fill("Wizard test org");
+      await page.locator("button[type=submit]").click();
+
+      // Step 3: Add teams
+      await page.waitForURL("**/settings/organizations/new/add-teams");
+      await page.getByTestId("team.0.name").fill("Team 1");
+      await page.locator("button[type=submit]").click();
+
+      // Step 4: Onboard members
+      await page.waitForURL("**/settings/organizations/new/onboard-members");
+
+      // Verify wizard shows correct step numbers
+      // The WizardLayout component shows currentStep/maxSteps
+      // Just verify we reached the last step
+      await expect(page.getByTestId("publish-button")).toBeVisible();
+    });
+  });
+
+  test.describe("Billing Field Visibility", () => {
+    test("Admin sees billing fields when billing enabled", async ({ page, users }) => {
+      test.skip(!IS_TEAM_BILLING_ENABLED, "Billing is not enabled");
+
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify billing fields are visible for admin
+      await expect(page.locator("input[name=seats]")).toBeVisible();
+      await expect(page.locator("input[name=pricePerSeat]")).toBeVisible();
+      await expect(page.locator("#billingPeriod")).toBeVisible();
+
+      // Verify toggle between monthly/annual
+      await expect(page.getByText("Monthly")).toBeVisible();
+      await expect(page.getByText("Annually")).toBeVisible();
+    });
+
+    test("Non-admin sees pricing UI but not billing fields", async ({ page, users }) => {
+      test.skip(!IS_TEAM_BILLING_ENABLED, "Billing is not enabled");
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "pricinguser",
+        email: users.trackEmail({ username: "pricinguser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Should NOT see admin billing fields
+      await expect(page.locator("input[name=seats]")).not.toBeVisible();
+      await expect(page.locator("input[name=pricePerSeat]")).not.toBeVisible();
+      await expect(page.locator("#billingPeriod")).not.toBeVisible();
+
+      // Should see upgrade/pricing UI
+      await expect(page.getByText(/upgrade to organizations/i)).toBeVisible();
+      await expect(page.getByText(/organization/i)).toBeVisible();
+    });
+  });
+});
diff --git a/apps/web/playwright/organization/organization-creation.e2e.ts b/apps/web/playwright/organization/organization-creation.e2e.ts
deleted file mode 100644
index 5fb6d0ca7b2093..00000000000000
--- a/apps/web/playwright/organization/organization-creation.e2e.ts
+++ /dev/null
@@ -1,475 +0,0 @@
-import type { Page } from "@playwright/test";
-import { expect } from "@playwright/test";
-import { JSDOM } from "jsdom";
-import type { Messages } from "mailhog";
-import path from "path";
-import { uuid } from "short-uuid";
-
-import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
-
-import type { createEmailsFixture } from "../fixtures/emails";
-import { test } from "../lib/fixtures";
-import { fillStripeTestCheckout } from "../lib/testUtils";
-import { getEmailsReceivedByUser } from "../lib/testUtils";
-
-async function expectEmailWithSubject(
-  page: Page,
-  emails: ReturnType<typeof createEmailsFixture>,
-  userEmail: string,
-  subject: string
-) {
-  if (!emails) return null;
-
-  // eslint-disable-next-line playwright/no-wait-for-timeout
-  await page.waitForTimeout(2000);
-  const receivedEmails = await getEmailsReceivedByUser({ emails, userEmail });
-
-  const allEmails = (receivedEmails as Messages).items;
-  const email = allEmails.find((email) => email.subject === subject);
-  if (!email) {
-    throw new Error(`Email with subject ${subject} not found`);
-  }
-  const dom = new JSDOM(email.html);
-  return dom;
-}
-
-export async function expectOrganizationCreationEmailToBeSent({
-  page,
-  emails,
-  userEmail,
-  orgSlug,
-}: {
-  page: Page;
-  emails: ReturnType<typeof createEmailsFixture>;
-  userEmail: string;
-  orgSlug: string;
-}) {
-  const dom = await expectEmailWithSubject(page, emails, userEmail, "Your organization has been created");
-  const document = dom?.window?.document;
-  expect(document?.querySelector(`[href*=${orgSlug}]`)).toBeTruthy();
-  return dom;
-}
-
-async function expectOrganizationCreationEmailToBeSentWithLinks({
-  page,
-  emails,
-  userEmail,
-  oldUsername,
-  newUsername,
-  orgSlug,
-}: {
-  page: Page;
-  emails: ReturnType<typeof createEmailsFixture>;
-  userEmail: string;
-  oldUsername: string;
-  newUsername: string;
-  orgSlug: string;
-}) {
-  const dom = await expectOrganizationCreationEmailToBeSent({
-    page,
-    emails,
-    userEmail,
-    orgSlug,
-  });
-  const document = dom?.window.document;
-  const links = document?.querySelectorAll(`[data-testid="organization-link-info"] [href]`);
-  if (!links) {
-    throw new Error(`data-testid="organization-link-info doesn't have links`);
-  }
-  expect((links[0] as unknown as HTMLAnchorElement).href).toContain(oldUsername);
-  expect((links[1] as unknown as HTMLAnchorElement).href).toContain(newUsername);
-}
-
-export async function expectEmailVerificationEmailToBeSent(
-  page: Page,
-  emails: ReturnType<typeof createEmailsFixture>,
-  userEmail: string
-) {
-  const subject = "Cal.com: Verify your account";
-  return expectEmailWithSubject(page, emails, userEmail, subject);
-}
-
-test.afterEach(({ users, orgs }) => {
-  users.deleteAll();
-  orgs.deleteAll();
-});
-
-function capitalize(text: string) {
-  if (!text) {
-    return text;
-  }
-  return text.charAt(0).toUpperCase() + text.slice(1);
-}
-
-test.describe("Organization", () => {
-  test("Admin should be able to do onboarding handover an org where an existing user is made an owner", async ({
-    page,
-    users,
-    emails,
-  }) => {
-    const appLevelAdmin = await users.create({
-      role: "ADMIN",
-    });
-    await appLevelAdmin.apiLogin();
-
-    const orgOwnerUsernamePrefix = "owner";
-
-    const orgOwnerEmail = users.trackEmail({
-      username: orgOwnerUsernamePrefix,
-      domain: `example.com`,
-    });
-
-    const orgOwnerUser = await users.create({
-      username: orgOwnerUsernamePrefix,
-      email: orgOwnerEmail,
-      role: "ADMIN",
-    });
-
-    const orgOwnerUsernameOutsideOrg = orgOwnerUser.username;
-    const orgOwnerUsernameInOrg = orgOwnerEmail.split("@")[0];
-    const orgName = capitalize(`${orgOwnerUser.username}`);
-    const orgSlug = `myOrg-${uuid()}`.toLowerCase();
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // Check required fields
-      await page.locator("button[type=submit]").click();
-      await expect(page.getByTestId("field-error")).toHaveCount(2);
-
-      // Happy path
-      await fillAndSubmitFirstStepAsAdmin(page, orgOwnerEmail, orgName, orgSlug);
-    });
-
-    await test.step("Handover", async () => {
-      const onboardingUrl = await page.getByTestId("onboarding-url").textContent();
-      expect(onboardingUrl).toContain("settings/organizations/new");
-    });
-  });
-
-  test.skip("Admin should be able to create an org where the owner doesn't exist yet", async ({
-    page,
-    users,
-    emails,
-  }) => {
-    const appLevelAdmin = await users.create({
-      role: "ADMIN",
-    });
-    await appLevelAdmin.apiLogin();
-    const orgOwnerUsername = `owner`;
-    const orgName = capitalize(`${orgOwnerUsername}`);
-    const orgSlug = `myOrg-${uuid()}`.toLowerCase();
-    const orgOwnerEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // Check required fields
-      await page.locator("button[type=submit]").click();
-      await expect(page.getByTestId("field-error")).toHaveCount(2);
-
-      // Happy path
-      await fillAndSubmitFirstStepAsAdmin(page, orgOwnerEmail, orgName, orgSlug);
-    });
-
-    const dom = await expectOrganizationCreationEmailToBeSent({
-      page,
-      emails,
-      userEmail: orgOwnerEmail,
-      orgSlug,
-    });
-    expect(dom?.window.document.querySelector(`[href*=${orgSlug}]`)).toBeTruthy();
-    await expectEmailVerificationEmailToBeSent(page, emails, orgOwnerEmail);
-    // Rest of the steps remain same as org creation with existing user as owner. So skipping them
-  });
-
-  test("User can create and upgrade a org", async ({ page, users, emails }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
-    const stringUUID = uuid();
-
-    const orgOwnerUsername = `owner-${stringUUID}`;
-
-    const targetOrgEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-    const orgOwnerUser = await users.create({
-      username: orgOwnerUsername,
-      email: targetOrgEmail,
-    });
-
-    await orgOwnerUser.apiLogin();
-    const orgName = capitalize(`${orgOwnerUsername}`);
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // These values are inferred due to an existing user being signed
-      expect(await page.locator("input[name=name]").inputValue()).toBe("Example");
-      expect(await page.locator("input[name=slug]").inputValue()).toBe("example");
-
-      await page.locator("input[name=name]").fill(orgName);
-      await page.locator("input[name=slug]").fill(orgOwnerUsername);
-
-      await page.locator("button[type=submit]").click();
-    });
-
-    await test.step("About the organization", async () => {
-      // Choosing an avatar
-      await page.getByTestId("open-upload-avatar-dialog").click();
-      const fileChooserPromise = page.waitForEvent("filechooser");
-      await page.getByText("Choose a file...").click();
-      const fileChooser = await fileChooserPromise;
-      await fileChooser.setFiles(path.join(__dirname, "../../public/apple-touch-icon.png"));
-      await page.getByTestId("upload-avatar").click();
-
-      // About text
-      await page.locator('textarea[name="about"]').fill("This is a testing org");
-      await page.locator("button[type=submit]").click();
-
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/onboard-members");
-    });
-
-    await test.step("On-board administrators", async () => {
-      await page.waitForSelector('[data-testid="pending-member-list"]');
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-
-      const adminEmail = users.trackEmail({ username: "rick", domain: `example.com` });
-
-      //can add members
-      await page.getByTestId("new-member-button").click();
-      await page.locator('[placeholder="email\\@example\\.com"]').fill(adminEmail);
-      await page.getByTestId("invite-new-member-button").click();
-      await expect(page.getByTestId("pending-member-item").filter({ hasText: adminEmail })).toBeVisible();
-      // TODO: Check if invited admin received the invitation email
-      // await expectInvitationEmailToBeReceived(
-      //   page,
-      //   emails,
-      //   adminEmail,
-      //   `${orgName}'s admin invited you to join the organization ${orgName} on Cal.com`
-      // );
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-
-      // can remove members
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-      const lastRemoveMemberButton = page.getByTestId("remove-member-button").last();
-      await lastRemoveMemberButton.click();
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-      await page.getByTestId("publish-button").click();
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/add-teams");
-    });
-
-    await test.step("Create teams", async () => {
-      // Filling one team
-      await page.locator('input[name="teams.0.name"]').fill("Marketing");
-
-      // Adding another team
-      await page.getByTestId("add_a_team").click();
-      await page.locator('input[name="teams.1.name"]').fill("Sales");
-
-      // Finishing the creation wizard
-      await page.getByTestId("continue_or_checkout").click();
-    });
-
-    await test.step("Login as org owner and pay", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      test.skip(!IS_TEAM_BILLING_ENABLED, "Skipping paying for org as stripe is disabled");
-      await orgOwnerUser.apiLogin();
-      await page.goto("/event-types");
-      const upgradeButton = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButton).toBeVisible();
-      await upgradeButton.click();
-      // Check that stripe checkout is present
-      const expectedUrl = "https://checkout.stripe.com";
-
-      await page.waitForURL((url) => url.href.startsWith(expectedUrl));
-      const url = page.url();
-
-      // Check that the URL matches the expected URL
-      expect(url).toContain(expectedUrl);
-
-      await fillStripeTestCheckout(page);
-
-      const upgradeButtonHidden = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButtonHidden).toBeHidden();
-    });
-  });
-
-  test("User gets prompted with >=3 teams to upgrade & can transfer existing teams to org", async ({
-    page,
-    users,
-  }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
-    const numberOfTeams = 3;
-    const stringUUID = uuid();
-
-    const orgOwnerUsername = `owner-${stringUUID}`;
-
-    const targetOrgEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-    const orgOwnerUser = await users.create(
-      {
-        username: orgOwnerUsername,
-        email: targetOrgEmail,
-      },
-      { hasTeam: true, numberOfTeams }
-    );
-
-    await orgOwnerUser.apiLogin();
-
-    await page.goto("/teams");
-
-    await test.step("Has org self serve banner", async () => {
-      // These values are inferred due to an existing user being signed
-      const selfServeButtonLocator = await page.getByTestId("setup_your_org_action_button");
-      await expect(selfServeButtonLocator).toBeVisible();
-
-      await selfServeButtonLocator.click();
-      await page.waitForURL("/settings/organizations/new");
-    });
-
-    await test.step("Basic info", async () => {
-      // These values are inferred due to an existing user being signed
-      const slugLocator = await page.locator("input[name=slug]");
-      expect(await page.locator("input[name=name]").inputValue()).toBe("Example");
-      expect(await slugLocator.inputValue()).toBe("example");
-
-      await slugLocator.fill(`example-${stringUUID}`);
-
-      await page.locator("button[type=submit]").click();
-    });
-
-    await test.step("About the organization", async () => {
-      // Choosing an avatar
-      await page.getByTestId("open-upload-avatar-dialog").click();
-      const fileChooserPromise = page.waitForEvent("filechooser");
-      await page.getByText("Choose a file...").click();
-      const fileChooser = await fileChooserPromise;
-      await fileChooser.setFiles(path.join(__dirname, "../../public/apple-touch-icon.png"));
-      await page.getByTestId("upload-avatar").click();
-
-      // About text
-      await page.locator('textarea[name="about"]').fill("This is a testing org");
-      await page.locator("button[type=submit]").click();
-
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/onboard-members");
-    });
-
-    await test.step("On-board administrators", async () => {
-      await page.waitForSelector('[data-testid="pending-member-list"]');
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-
-      const adminEmail = users.trackEmail({ username: "rick", domain: `example.com` });
-
-      //can add members
-      await page.getByTestId("new-member-button").click();
-      await page.locator('[placeholder="email\\@example\\.com"]').fill(adminEmail);
-      await page.getByTestId("invite-new-member-button").click();
-      await expect(page.getByTestId("pending-member-item").filter({ hasText: adminEmail })).toBeVisible();
-      // TODO: Check if invited admin received the invitation email
-      // await expectInvitationEmailToBeReceived(
-      //   page,
-      //   emails,
-      //   adminEmail,
-      //   `${orgName}'s admin invited you to join the organization ${orgName} on Cal.com`
-      // );
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-
-      // can remove members
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-      const lastRemoveMemberButton = page.getByTestId("remove-member-button").last();
-      await lastRemoveMemberButton.click();
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-      await page.getByTestId("publish-button").click();
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/add-teams");
-    });
-
-    await test.step("Move existing teams to org", async () => {
-      // No easy way to get all team checkboxes so we fill all checkboxes on the page in
-      const foundCheckboxes = page.locator('input[type="checkbox"]');
-      const count = await foundCheckboxes.count();
-      for (let i = 0; i < count; i++) {
-        const checkbox = foundCheckboxes.nth(i);
-        await checkbox.click();
-      }
-    });
-
-    await test.step("Create teams", async () => {
-      // Filling one team
-      await page.locator('input[name="teams.0.name"]').fill("Marketing");
-
-      // Adding another team
-      await page.getByTestId("new-team-dialog-button").click();
-      await page.locator('input[name="teams.1.name"]').fill("Sales");
-
-      // Finishing the creation wizard
-      await page.getByTestId("continue_or_checkout").click();
-    });
-
-    await test.step("Login as org owner and pay", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      test.skip(!IS_TEAM_BILLING_ENABLED, "Skipping paying for org as stripe is disabled");
-      await orgOwnerUser.apiLogin();
-      await page.goto("/event-types");
-      const upgradeButton = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButton).toBeVisible();
-      await upgradeButton.click();
-      // Check that stripe checkout is present
-      const expectedUrl = "https://checkout.stripe.com";
-
-      await page.waitForURL((url) => url.href.startsWith(expectedUrl));
-      const url = page.url();
-
-      // Check that the URL matches the expected URL
-      expect(url).toContain(expectedUrl);
-
-      await fillStripeTestCheckout(page);
-
-      const upgradeButtonHidden = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButtonHidden).toBeHidden();
-    });
-
-    await test.step("Ensure correctnumberOfTeams are migrated", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      await page.goto("/teams");
-      const teamListItems = await page.getByTestId("team-list-item-link").all();
-
-      // Number of teams migrated + the two created in the create teams step
-      expect(teamListItems.length).toBe(numberOfTeams + 2);
-    });
-  });
-});
-
-async function fillAndSubmitFirstStepAsAdmin(
-  page: Page,
-  targetOrgEmail: string,
-  orgName: string,
-  orgSlug: string
-) {
-  await page.locator("input[name=orgOwnerEmail]").fill(targetOrgEmail);
-  // Since we are admin fill in this information instead of deriving it
-  await page.locator("input[name=name]").fill(orgName);
-  await page.locator("input[name=slug]").fill(orgSlug);
-
-  // Fill in seat information
-  await page.locator("input[name=seats]").fill("30");
-  await page.locator("input[name=pricePerSeat]").fill("30");
-
-  await Promise.all([
-    page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
-    page.locator("button[type=submit]").click(),
-  ]);
-}
diff --git a/apps/web/playwright/out-of-office.e2e.ts b/apps/web/playwright/out-of-office.e2e.ts
index 08779282481b07..e3b526bd9598d9 100644
--- a/apps/web/playwright/out-of-office.e2e.ts
+++ b/apps/web/playwright/out-of-office.e2e.ts
@@ -653,11 +653,12 @@ test.describe("Out of office", () => {
     test("Default date range filter set to `Last 7 Days`", async ({ page, users }) => {
       const user = await users.create({ name: `userOne=${Date.now()}` });
       await user.apiLogin();
-      await page.goto("/settings/my-account/out-of-office");
-      await page.waitForLoadState("domcontentloaded");
-      await page.waitForResponse(
+      const responsePromise = page.waitForResponse(
         (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
       );
+      await page.goto("/settings/my-account/out-of-office");
+      await page.waitForLoadState("domcontentloaded");
+      await responsePromise;
       await addFilter(page, "dateRange");
       await expect(
         page.locator('[data-testid="filter-popover-trigger-dateRange"]', { hasText: "Last 7 Days" }).first()
@@ -667,11 +668,12 @@ test.describe("Out of office", () => {
     test("Can choose date range presets", async ({ page, users }) => {
       const user = await users.create({ name: `userOne=${Date.now()}` });
       await user.apiLogin();
-      await page.goto("/settings/my-account/out-of-office");
-      await page.waitForLoadState("domcontentloaded");
-      await page.waitForResponse(
+      const responsePromise = page.waitForResponse(
         (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
       );
+      await page.goto("/settings/my-account/out-of-office");
+      await page.waitForLoadState("domcontentloaded");
+      await responsePromise;
       await addFilter(page, "dateRange");
 
       await expect(page.locator('[data-testid="date-range-options-tdy"]')).toBeVisible(); //Today
diff --git a/apps/web/playwright/payment-apps.e2e.ts b/apps/web/playwright/payment-apps.e2e.ts
index 6cd2a08fe4773f..629d872a4e089a 100644
--- a/apps/web/playwright/payment-apps.e2e.ts
+++ b/apps/web/playwright/payment-apps.e2e.ts
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 
 import prisma from "@calcom/prisma";
+import type { Page } from "@playwright/test";
 
 import { test } from "./lib/fixtures";
 import { selectFirstAvailableTimeSlotNextMonth, submitAndWaitForResponse } from "./lib/testUtils";
@@ -8,6 +9,11 @@ import { selectFirstAvailableTimeSlotNextMonth, submitAndWaitForResponse } from
 test.describe.configure({ mode: "parallel" });
 test.afterEach(({ users }) => users.deleteAll());
 
+async function goToAppsTab(page: Page, eventTypeId?: number) {
+  await page.goto(`event-types/${eventTypeId}?tabName=apps`);
+  await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page");
+}
+
 test.describe("Payment app", () => {
   test("Should be able to edit alby price, currency", async ({ page, users }) => {
     const user = await users.create();
@@ -29,7 +35,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("#event-type-form").getByRole("switch").click();
     await page.getByPlaceholder("Price").click();
@@ -75,7 +81,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
     await page.locator("#event-type-form").getByRole("switch").click();
     await page.getByTestId("stripe-currency-select").click();
     await page.getByTestId("select-option-usd").click();
@@ -115,7 +121,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("#event-type-form").getByRole("switch").click();
 
@@ -158,7 +164,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("#event-type-form").getByRole("switch").click();
 
@@ -185,7 +191,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("#event-type-form").getByRole("switch").click();
 
@@ -220,7 +226,7 @@ test.describe("Payment app", () => {
       },
     });
 
-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("#event-type-form").getByRole("switch").click();
     // make sure Tracking ID is displayed
@@ -267,7 +273,7 @@ test.describe("Payment app", () => {
       ],
     });
 
-    await page.goto(`event-types/${paymentEvent.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.locator("[data-testid='paypal-app-switch']").click();
     await page.locator("[data-testid='stripe-app-switch']").isDisabled();
@@ -314,7 +320,7 @@ test.describe("Payment app", () => {
       ],
     });
 
-    await page.goto(`event-types/${paymentEvent.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
 
     await page.getByTestId("paypal-app-switch").click();
     await page.getByTestId("paypal-price-input").fill("100");
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index ae9f14502f5714..52fec89b9afa1c 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -86,6 +86,14 @@
   "rejection_reason_title": "Reject the booking request?",
   "rejection_reason_description": "Are you sure you want to reject the booking? We'll let the person who tried to book know. You can provide a reason below.",
   "rejection_confirmation": "Reject the booking",
+  "report_booking_description": "Report this booking as suspicious. This helps us identify and prevent spam or unwanted bookings.",
+  "report_reason_spam": "Spam or unwanted booking",
+  "report_reason_dont_know_person": "I don't know this person",
+  "report_reason_other": "Other",
+  "cancel_booking_when_reporting": "Cancel this booking",
+  "report_all_remaining_bookings": "Report all remaining bookings in series",
+  "submit_report": "Submit Report",
+  "report_booking_description_placeholder": "Please provide additional details about why you're reporting this booking (optional)",
   "manage_this_event": "Manage this event",
   "invite_team_member": "Invite team member",
   "invite_team_individual_segment": "Invite individual",
@@ -759,6 +767,10 @@
   "cancel_all_remaining": "Cancel all remaining",
   "apply": "Apply",
   "cancel_event": "Cancel event",
+  "report_booking": "Report booking",
+  "report_booking_will_cancel_description": "Reporting this booking will automatically cancel it",
+  "add_to_report": "Add to report",
+  "reported": "Reported",
   "continue": "Continue",
   "confirm": "Confirm",
   "confirm_all": "Confirm all",
@@ -781,6 +793,7 @@
   "remove_attribute": "Remove attribute",
   "remove_attribute_confirmation_message": "Are you sure you want to remove the attribute '{{name}}'? All users currently assigned to it will be unassigned.",
   "delete": "Delete",
+  "view": "View",
   "update": "Update",
   "save": "Save",
   "pending": "Pending",
@@ -1176,6 +1189,8 @@
   "featured_categories": "Featured Categories",
   "feature_flags": "Feature Flags",
   "admin_flags_description": "Here you can toggle your Cal.com instance features.",
+  "feature_assigned_successfully": "Feature assigned successfully",
+  "feature_unassigned_successfully": "Feature unassigned successfully",
   "popular_categories": "Popular Categories",
   "number_apps_one": "{{count}} App",
   "number_apps_other": "{{count}} Apps",
@@ -1444,6 +1459,7 @@
   "new_event_trigger": "when new event is booked",
   "email_host_action": "send email to host",
   "email_attendee_action": "send email to attendees",
+  "email_attendee_action_form": "Send email to submitted email address",
   "sms_attendee_action": "Send SMS to attendee",
   "sms_number_action": "send SMS to a specific number",
   "send_reminder_sms": "Easily send meeting reminders via SMS to your attendees",
@@ -1515,6 +1531,8 @@
   "may_require_confirmation": "May require confirmation",
   "nr_event_type_one": "{{count}} event type",
   "nr_event_type_other": "{{count}} event types",
+  "nr_routing_form_one": "{{count}} routing form",
+  "nr_routing_form_other": "{{count}} routing forms",
   "count_team_one": "{{count}} team",
   "count_team_other": "{{count}} teams",
   "add_action": "Add action",
@@ -1631,7 +1649,9 @@
   "2fa_required": "Two factor authentication required",
   "incorrect_2fa": "Incorrect two factor authentication code",
   "which_event_type_apply": "Which event type will this apply to?",
+  "which_routing_form_apply": "Which routing form will this apply to?",
   "apply_to_all_event_types": "Apply to all, including future event types",
+  "apply_to_all_routing_forms": "Apply to all, including future routing forms",
   "apply_to_all_teams": "Apply to all team and user event types",
   "which_team_apply": "Which team will this apply to?",
   "no_workflows_description": "Workflows enable simple automation to send notifications & reminders enabling you to build processes around your events.",
@@ -1873,7 +1893,7 @@
   "only_show_first_available_slot_description": "This will limit your availability for this event type to one slot per day, scheduled at the earliest available time.",
   "limit_total_booking_duration": "Limit total booking duration",
   "limit_total_booking_duration_description": "Limit total amount of time that this event can be booked",
-  "booker_booking_limit": "Booker active booking limit",
+  "booker_upcoming_limit": "Limit number of upcoming bookings per booker",
   "booker_booking_limit_description": "Limit the number of active bookings a booker can make for this event type",
   "recurring_event_doesnt_support_booker_booking_limit": "Recurring events don't support booker booking limit",
   "add_limit": "Add Limit",
@@ -2836,6 +2856,7 @@
   "organization_price_per_user_month": "$37 per user per month",
   "privacy_organization_description": "Manage privacy settings for your organization",
   "privacy": "Privacy",
+  "privacy_and_security": "Privacy & Security",
   "team_will_be_under_org": "New teams will be under your organization",
   "add_group_name": "Add group name",
   "group_name": "Group Name",
@@ -3278,6 +3299,12 @@
   "organization_onboarding_already_completed": "Organization onboarding already completed",
   "organization_onboarding_already_exists": "Organization onboarding already exists",
   "organization_onboarding_not_found": "Organization onboarding not found",
+  "no_onboarding_id_provided": "No onboarding ID provided",
+  "onboarding_not_found": "Onboarding not found",
+  "onboarding_already_complete": "Onboarding already complete",
+  "onboarding_already_complete_description": "This onboarding has already been completed. You can view your organization in settings.",
+  "resume_onboarding": "Resume Onboarding",
+  "resume_onboarding_description": "Continue with your organization onboarding process",
   "payment_successful": "Payment successful!",
   "handover_onboarding_page_title": "Handover onboarding",
   "handover_onboarding_page_description": "Handover onboarding to the user",
@@ -3467,6 +3494,7 @@
   "requires_credits_tooltip": "You need enough credits in your account to use this feature",
   "available_credits": "Available credits",
   "create_role": "Create role",
+  "roles": "Roles",
   "roles_and_permissions": "Roles & Permissions",
   "roles_and_permissions_description": "Manage roles and permissions for your organization",
   "learn_more_permissions": "Learn more about how Permissions work",
@@ -3531,6 +3559,7 @@
   "pbac_resource_webhook": "Webhook",
   "pbac_resource_availability": "Availability",
   "pbac_resource_out_of_office": "Out of Office",
+  "pbac_resource_blocklist": "Blocklist",
   "pbac_desc_create_webhooks": "Create webhooks",
   "pbac_desc_view_webhooks": "View webhooks",
   "pbac_desc_update_webhooks": "Update webhooks",
@@ -3580,6 +3609,19 @@
   "pbac_desc_view_routing_forms": "View routing forms",
   "pbac_desc_update_routing_forms": "Update routing forms",
   "pbac_desc_delete_routing_forms": "Delete routing forms",
+  "pbac_opt_in_title": "Enable Roles & Permissions for your organization",
+  "pbac_opt_in_description": "Take control of your organization with customizable roles and granular permissions for your team members.",
+  "pbac_opt_in_custom_roles_title": "Custom roles",
+  "pbac_opt_in_custom_roles_desc": "Create custom roles tailored to your organization's unique workflow",
+  "pbac_opt_in_granular_permissions_title": "Granular permissions",
+  "pbac_opt_in_granular_permissions_desc": "Control exactly what team members can view, edit, and manage",
+  "pbac_opt_in_team_assignment_title": "Team member assignment",
+  "pbac_opt_in_team_assignment_desc": "Easily assign roles to team members as your team grows",
+  "pbac_opt_in_enhanced_security_title": "Enhanced security",
+  "pbac_opt_in_enhanced_security_desc": "Protect sensitive data with organization-wide security controls",
+  "pbac_opt_in_enable_button": "Enable PBAC",
+  "pbac_enabled_success": "Successfully enabled PBAC for your organization",
+  "pbac_enabled_error": "Failed to enable PBAC for your organization",
   "read_permission_auto_enabled_tooltip": "Read permission is automatically enabled when creating, updating, or deleting a resource",
   "choose_restriction_schedule": "Add restriction schedule",
   "restriction_schedule_description": "Limit availability of hosts to only display slots that fall within a specified schedule.",
@@ -3596,8 +3638,10 @@
   "no_members_affected_by_disabling_delegation_credential": "No members affected by disabling delegation credential",
   "download_expense_log": "Download Expense Log",
   "error_downloading_expense_log": "Error downloading expense log",
-  "offer_to_reschedule_last_booking": "Offer to reschedule last active booking to chosen time slot",
-  "booker_limit_exceeded_error": "Booker maximum active booking limit exceeded",
+  "require_booker_email_verification": "Prevent Impersonation on Bookings",
+  "require_booker_email_verification_description": "When enabled, anyone trying to book events using your email address must verify they own it via a one time code or be logged in to prevent impersonation",
+  "reschedule_last_booking_offer": "Offer to reschedule the last booking to the new time slot",
+  "booker_upcoming_limit_reached": "You've reached the limit of {{count}} upcoming bookings for this event type",
   "booker_limit_exceeded_error_reschedule": "You already have a booking for this event on {{date}}. Would you like to reschedule to the new selected time?",
   "duration_min_error": "Duration must be at least {{min}} minute(s)",
   "duration_max_error": "Duration cannot exceed {{max}} minutes (24 hours)",
@@ -3701,6 +3745,9 @@
   "webhook_metadata": "Metadata",
   "stats": "Stats",
   "booking_status": "Booking status",
+  "form_submitted_trigger": "When routing form is submitted",
+  "form_submitted_no_event_trigger": "When routing form is submitted and no booking is created",
+  "how_long_after_form_submitted_no_event": "How long after the form was submitted?",
   "visit": "Visit",
   "location_custom_label_input_label": "Custom label on booking page",
   "meeting_link": "Meeting link",
@@ -3770,6 +3817,10 @@
   "configure_agent_to_handle_incoming_calls": "Configure agent to handle incoming calls",
   "incoming_calls": "Incoming Calls",
   "outgoing_calls": "Outgoing Calls",
+  "booking_fields_email_and_phone_both_hidden": "Both Email and Attendee Phone Number cannot be hidden",
+  "booking_fields_email_or_phone_required": "At least Email or Attendee Phone Number must be a required field",
+  "booking_fields_phone_required_when_email_hidden": "Attendee Phone Number must be required when Email is hidden",
+  "booking_fields_email_required_when_phone_hidden": "Email must be required when Attendee Phone Number is hidden",
   "inbound_agent_setup_success": "Inbound agent setup successful",
   "inbound_agent_configured": "Inbound agent configured",
   "setup_inbound_agent": "Set up Inbound Agent",
@@ -3777,5 +3828,26 @@
   "edit_configuration": "Edit Configuration",
   "select_event_type_for_inbound_calls": "Inbound calls can book only one event type. Select the event type where meetings will be scheduled when callers reach your agent.",
   "setup_inbound_agent_for_incoming_calls": "Set up inbound agent for incoming calls",
+  "create_block_entry": "Create Block Entry",
+  "blocklist_entry_details": "Blocklist Entry Details",
+  "blocklist_entry_not_found": "Blocklist entry not found",
+  "blocklist_entry_created": "Blocklist entry created successfully",
+  "blocklist_entry_deleted": "Blocklist entry deleted successfully",
+  "audit_history": "Audit History",
+  "no_audit_history": "No audit history available",
+  "delete_blocklist_entry": "Delete Blocklist Entry",
+  "delete_blocklist_entry_confirmation": "Are you sure you want to remove \"{{value}}\" from the blocklist? This action cannot be undone.",
+  "created_by": "Created By",
+  "blocked_by": "Blocked By",
+  "by": "By",
+  "added": "Added",
+  "no_description_provided": "No description provided",
+  "organization_blocklist": "Organization Blocklist",
+  "manage_blocked_emails_and_domains": "Manage blocked emails and domains for your organization",
+  "invalid_domain_format": "Invalid domain format. Example: example.com",
+  "invalid_email_address": "Invalid email address. Example: user@example.com",
+  "reason_for_adding_to_blocklist": "Reason for adding to blocklist",
+  "what_would_you_like_to_block": "What would you like to block?",
+  "domain_name": "Domain Name",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
index a48bd543afec3b..ac3a14eeb661c2 100644
--- a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
+++ b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts
@@ -8,9 +8,9 @@ import { getBookingForReschedule, getBookingForSeatedEvent } from "@calcom/featu
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
-import { shouldHideBrandingForUserEvent } from "@calcom/lib/hideBranding";
-import { EventRepository } from "@calcom/lib/server/repository/event";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { shouldHideBrandingForUserEvent } from "@calcom/features/profile/lib/hideBranding";
+import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
 import { BookingStatus, RedirectType } from "@calcom/prisma/enums";
diff --git a/apps/web/server/lib/[user]/getServerSideProps.ts b/apps/web/server/lib/[user]/getServerSideProps.ts
index 5e8cecaaad06e1..9122cbaadc9008 100644
--- a/apps/web/server/lib/[user]/getServerSideProps.ts
+++ b/apps/web/server/lib/[user]/getServerSideProps.ts
@@ -4,14 +4,15 @@ import { encode } from "querystring";
 import type { z } from "zod";
 
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
+import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { getEventTypesPublic } from "@calcom/features/eventtypes/lib/getEventTypesPublic";
+import { getBrandingForUser } from "@calcom/features/profile/lib/getBranding";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
-import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { UserRepository } from "@calcom/lib/server/repository/user";
 import { stripMarkdown } from "@calcom/lib/stripMarkdown";
 import { prisma } from "@calcom/prisma";
 import type { EventType, User } from "@calcom/prisma/client";
@@ -33,6 +34,9 @@ type UserPageProps = {
       requestedSlug: string | null;
       slug: string | null;
       id: number | null;
+      brandColor: string | null;
+      darkBrandColor: string | null;
+      theme: string | null;
     } | null;
     allowSEOIndexing: boolean;
     username: string | null;
@@ -130,15 +134,18 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont
 
   const [user] = usersInOrgContext; //to be used when dealing with single user, not dynamic group
 
+  const branding = getBrandingForUser({ user });
+
   const profile = {
     name: user.name || user.username || "",
     image: getUserAvatarUrl({
       avatarUrl: user.avatarUrl,
     }),
-    theme: user.theme,
-    brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
+    theme: branding.theme,
+    brandColor: branding.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
     avatarUrl: user.avatarUrl,
-    darkBrandColor: user.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
+    darkBrandColor:
+      branding.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
     allowSEOIndexing: user.allowSEOIndexing ?? true,
     username: user.username,
     organization: user.profile.organization,
diff --git a/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx b/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx
index d8738df1008b91..857bbd69f17f5d 100644
--- a/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx
+++ b/apps/web/server/lib/auth/sso/[provider]/getServerSideProps.tsx
@@ -7,7 +7,7 @@ import stripe from "@calcom/features/ee/payments/server/stripe";
 import { hostedCal, isSAMLLoginEnabled, samlProductID, samlTenantID } from "@calcom/features/ee/sso/lib/saml";
 import { ssoTenantProduct } from "@calcom/features/ee/sso/lib/sso";
 import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
-import { checkUsername } from "@calcom/lib/server/checkUsername";
+import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
 import prisma from "@calcom/prisma";
 
 import { asStringOrNull } from "@lib/asStringOrNull";
diff --git a/apps/web/test/lib/checkBookingLimits.test.ts b/apps/web/test/lib/checkBookingLimits.test.ts
index eb856ef17c6f8d..563fa66d893098 100644
--- a/apps/web/test/lib/checkBookingLimits.test.ts
+++ b/apps/web/test/lib/checkBookingLimits.test.ts
@@ -6,7 +6,7 @@ import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSche
 import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";
 
 const mockCountBookingsByEventTypeAndDateRange = vi.fn();
-vi.mock("@calcom/lib/server/repository/booking", () => ({
+vi.mock("@calcom/features/bookings/repositories/BookingRepository", () => ({
   BookingRepository: vi.fn().mockImplementation(() => ({
     countBookingsByEventTypeAndDateRange: mockCountBookingsByEventTypeAndDateRange,
   })),
diff --git a/apps/web/test/lib/checkDurationLimits.test.ts b/apps/web/test/lib/checkDurationLimits.test.ts
index f90254791bb991..f55f32bec1681f 100644
--- a/apps/web/test/lib/checkDurationLimits.test.ts
+++ b/apps/web/test/lib/checkDurationLimits.test.ts
@@ -4,11 +4,11 @@ import dayjs from "@calcom/dayjs";
 import {
   checkDurationLimit,
   checkDurationLimits,
-} from "@calcom/lib/intervalLimits/server/checkDurationLimits";
+} from "@calcom/features/bookings/lib/checkDurationLimits";
 import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";
 
 const mockGetTotalBookingDuration = vi.fn();
-vi.mock("@calcom/lib/server/repository/booking", () => ({
+vi.mock("@calcom/features/bookings/repositories/BookingRepository", () => ({
   BookingRepository: vi.fn().mockImplementation(() => ({
     getTotalBookingDuration: mockGetTotalBookingDuration,
   })),
diff --git a/apps/web/test/lib/generateCsv.test.ts b/apps/web/test/lib/generateCsv.test.ts
index 3e758991ea10dd..5b259d24ad8ef3 100644
--- a/apps/web/test/lib/generateCsv.test.ts
+++ b/apps/web/test/lib/generateCsv.test.ts
@@ -2,7 +2,10 @@ import type { Table } from "@tanstack/react-table";
 import { describe, it, expect, vi } from "vitest";
 
 import type { UserTableUser } from "@calcom/features/users/components/UserTable/types";
-import { generateCsvRawForMembersTable, generateHeaderFromReactTable } from "@calcom/lib/csvUtils";
+import {
+  generateCsvRawForMembersTable,
+  generateHeaderFromReactTable,
+} from "@calcom/features/users/lib/UserListTableUtils";
 import { MembershipRole } from "@calcom/prisma/enums";
 
 function createMockTable(data: UserTableUser[]): Table<UserTableUser> {
diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts
index 06e33ce6f80593..ea8927f62ff9c2 100644
--- a/apps/web/test/utils/bookingScenario/bookingScenario.ts
+++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts
@@ -9,12 +9,12 @@ import type { z } from "zod";
 
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
 import { handleStripePaymentSuccess } from "@calcom/features/ee/payments/api/webhook";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { weekdayToWeekIndex, type WeekDays } from "@calcom/lib/dayjs";
 import type { HttpError } from "@calcom/lib/http-error";
 import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
 import type { BookingReference, Attendee, Booking, Membership } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
 import type { WebhookTriggerEvents } from "@calcom/prisma/client";
@@ -240,6 +240,8 @@ type InputUser = Omit<typeof TestData.users.example, "defaultScheduleId"> & {
       end: string;
     }[];
   };
+  requiresBookerEmailVerification?: boolean;
+  secondaryEmails?: { email: string; emailVerified: Date | null }[];
 };
 
 export type InputEventType = {
@@ -834,6 +836,21 @@ export async function addUsersToDb(users: InputUser[]) {
     }
   }
 
+  for (const user of users) {
+    if (user.secondaryEmails) {
+      log.debug("Creating SecondaryEmail entries for user", user.id);
+      for (const secondaryEmail of user.secondaryEmails) {
+        await prismock.secondaryEmail.create({
+          data: {
+            email: secondaryEmail.email,
+            emailVerified: secondaryEmail.emailVerified,
+            userId: user.id,
+          },
+        });
+      }
+    }
+  }
+
   const allUsers = await prismock.user.findMany({
     include: {
       credentials: true,
@@ -845,6 +862,7 @@ export async function addUsersToDb(users: InputUser[]) {
         },
       },
       destinationCalendar: true,
+      secondaryEmails: true,
     },
   });
 
@@ -1554,6 +1572,8 @@ export function getOrganizer({
   username,
   locked,
   emailVerified,
+  requiresBookerEmailVerification,
+  secondaryEmails,
 }: {
   name: string;
   email: string;
@@ -1572,6 +1592,8 @@ export function getOrganizer({
   username?: string;
   locked?: boolean;
   emailVerified?: Date | null;
+  requiresBookerEmailVerification?: boolean;
+  secondaryEmails?: { email: string; emailVerified: Date | null }[];
 }) {
   username = username ?? TestData.users.example.username;
   return {
@@ -1594,6 +1616,8 @@ export function getOrganizer({
     completedOnboarding,
     locked,
     emailVerified,
+    requiresBookerEmailVerification,
+    secondaryEmails,
   };
 }
 
@@ -2001,6 +2025,10 @@ export async function mockCalendarToHaveNoBusySlots(
   return await mockCalendar(metadataLookupKey, { ...calendarData, busySlots: [] });
 }
 
+export async function mockCalendarToCrashOnGetAvailability(metadataLookupKey: keyof typeof appStoreMetadata) {
+  return await mockCalendar(metadataLookupKey, { getAvailabilityCrash: true });
+}
+
 export async function mockCalendarToCrashOnCreateEvent(metadataLookupKey: keyof typeof appStoreMetadata) {
   return await mockCalendar(metadataLookupKey, { creationCrash: true });
 }
@@ -2397,7 +2425,7 @@ export const getDefaultBookingFields = ({
           label: "",
           hidden: false,
           sources: [{ id: "default", type: "default", label: "Default" }],
-          editable: "system",
+          editable: "system-but-optional",
           required: true,
           placeholder: "",
           defaultLabel: "email_address",
diff --git a/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts b/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts
index a49edc9280242c..968b4952fcfe52 100644
--- a/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts
+++ b/apps/web/test/utils/bookingScenario/getMockRequestDataForBooking.ts
@@ -27,6 +27,7 @@ type CommonPropsMockRequestData = {
   rescheduledBy?: string;
   cancelledBy?: string;
   schedulingType?: SchedulingType;
+  guests?: string[];
   responses: {
     email: string;
     name: string;
diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json
index c9d4b6a5848718..046c06d7cd6360 100644
--- a/docs/api-reference/v2/openapi.json
+++ b/docs/api-reference/v2/openapi.json
@@ -5705,7 +5705,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetWorkflowsOutput"
+                  "$ref": "#/components/schemas/GetEventTypeWorkflowsOutput"
                 }
               }
             }
@@ -5714,8 +5714,8 @@
         "tags": ["Orgs / Teams / Workflows"]
       },
       "post": {
-        "operationId": "OrganizationTeamWorkflowsController_createWorkflow",
-        "summary": "Create organization team workflow",
+        "operationId": "OrganizationTeamWorkflowsController_createEventTypeWorkflow",
+        "summary": "Create organization team workflow for event-types",
         "parameters": [
           {
             "name": "Authorization",
@@ -5758,7 +5758,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateWorkflowDto"
+                "$ref": "#/components/schemas/CreateEventTypeWorkflowDto"
               }
             }
           }
@@ -5769,7 +5769,160 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetWorkflowOutput"
+                  "$ref": "#/components/schemas/GetEventTypeWorkflowOutput"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["Orgs / Teams / Workflows"]
+      }
+    },
+    "/v2/organizations/{orgId}/teams/{teamId}/workflows/routing-form": {
+      "get": {
+        "operationId": "OrganizationTeamWorkflowsController_getRoutingFormWorkflows",
+        "summary": "Get organization team workflows",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "orgId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "take",
+            "required": false,
+            "in": "query",
+            "description": "Maximum number of items to return",
+            "example": 25,
+            "schema": {
+              "minimum": 1,
+              "maximum": 250,
+              "default": 250,
+              "type": "number"
+            }
+          },
+          {
+            "name": "skip",
+            "required": false,
+            "in": "query",
+            "description": "Number of items to skip",
+            "example": 0,
+            "schema": {
+              "minimum": 0,
+              "default": 0,
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetRoutingFormWorkflowsOutput"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["Orgs / Teams / Workflows"]
+      },
+      "post": {
+        "operationId": "OrganizationTeamWorkflowsController_createFormWorkflow",
+        "summary": "Create organization team workflow for routing-forms",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateFormWorkflowDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetRoutingFormWorkflowOutput"
                 }
               }
             }
@@ -5833,7 +5986,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetWorkflowOutput"
+                  "$ref": "#/components/schemas/GetEventTypeWorkflowOutput"
                 }
               }
             }
@@ -5894,7 +6047,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateWorkflowDto"
+                "$ref": "#/components/schemas/UpdateEventTypeWorkflowDto"
               }
             }
           }
@@ -5905,7 +6058,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/GetWorkflowOutput"
+                  "$ref": "#/components/schemas/GetEventTypeWorkflowOutput"
                 }
               }
             }
@@ -5969,6 +6122,197 @@
         "tags": ["Orgs / Teams / Workflows"]
       }
     },
+    "/v2/organizations/{orgId}/teams/{teamId}/workflows/{workflowId}/routing-form": {
+      "get": {
+        "operationId": "OrganizationTeamWorkflowsController_getRoutingFormWorkflowById",
+        "summary": "Get organization team workflow",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "workflowId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetRoutingFormWorkflowOutput"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["Orgs / Teams / Workflows"]
+      },
+      "patch": {
+        "operationId": "OrganizationTeamWorkflowsController_updateRoutingFormWorkflow",
+        "summary": "Update organization routing form team workflow",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "workflowId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateFormWorkflowDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetRoutingFormWorkflowOutput"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["Orgs / Teams / Workflows"]
+      },
+      "delete": {
+        "operationId": "OrganizationTeamWorkflowsController_deleteRoutingFormWorkflow",
+        "summary": "Delete organization team routing-form workflow",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "workflowId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "tags": ["Orgs / Teams / Workflows"]
+      }
+    },
     "/v2/organizations/{orgId}/users": {
       "get": {
         "operationId": "OrganizationsUsersController_getOrganizationsUsers",
@@ -6037,6 +6381,7 @@
             "required": false,
             "in": "query",
             "description": "The email address or an array of email addresses to filter by",
+            "example": ["user1@example.com", "user2@example.com"],
             "schema": {
               "type": "array",
               "items": {
@@ -7612,12 +7957,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_createBooking",
         "summary": "Create a booking",
-        "description": "\n      POST /v2/bookings is used to create regular bookings, recurring bookings and instant bookings. The request bodies for all 3 are almost the same except:\n      If eventTypeId in the request body is id of a regular event, then regular booking is created.\n\n      If it is an id of a recurring event type, then recurring booking is created.\n\n      Meaning that the request bodies are equal but the outcome depends on what kind of event type it is with the goal of making it as seamless for developers as possible.\n\n      For team event types it is possible to create instant meeting. To do that just pass `\"instant\": true` to the request body.\n\n      The start needs to be in UTC aka if the timezone is GMT+2 in Rome and meeting should start at 11, then UTC time should have hours 09:00 aka without time zone.\n\n      Finally, there are 2 ways to book an event type belonging to an individual user:\n      1. Provide `eventTypeId` in the request body.\n      2. Provide `eventTypeSlug` and `username` and optionally `organizationSlug` if the user with the username is within an organization.\n\n      And 2 ways to book and event type belonging to a team:\n      1. Provide `eventTypeId` in the request body.\n      2. Provide `eventTypeSlug` and `teamSlug` and optionally `organizationSlug` if the team with the teamSlug is within an organization.\n\n      If you are creating a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n      you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n      ",
+        "description": "\n      POST /v2/bookings is used to create regular bookings, recurring bookings and instant bookings. The request bodies for all 3 are almost the same except:\n      If eventTypeId in the request body is id of a regular event, then regular booking is created.\n\n      If it is an id of a recurring event type, then recurring booking is created.\n\n      Meaning that the request bodies are equal but the outcome depends on what kind of event type it is with the goal of making it as seamless for developers as possible.\n\n      For team event types it is possible to create instant meeting. To do that just pass `\"instant\": true` to the request body.\n\n      The start needs to be in UTC aka if the timezone is GMT+2 in Rome and meeting should start at 11, then UTC time should have hours 09:00 aka without time zone.\n\n      Finally, there are 2 ways to book an event type belonging to an individual user:\n      1. Provide `eventTypeId` in the request body.\n      2. Provide `eventTypeSlug` and `username` and optionally `organizationSlug` if the user with the username is within an organization.\n\n      And 2 ways to book and event type belonging to a team:\n      1. Provide `eventTypeId` in the request body.\n      2. Provide `eventTypeSlug` and `teamSlug` and optionally `organizationSlug` if the team with the teamSlug is within an organization.\n\n      If you are creating a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n      you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n\n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -7690,11 +8035,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getBookings",
         "summary": "Get all bookings",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -7940,12 +8286,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getBooking",
         "summary": "Get a booking",
-        "description": "`:bookingUid` can be\n\n      1. uid of a normal booking\n\n      2. uid of one of the recurring booking recurrences\n\n      3. uid of recurring booking which will return an array of all recurring booking recurrences (stored as recurringBookingUid on one of the individual recurrences).\n      \n      If you are fetching a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n      you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n      ",
+        "description": "`:bookingUid` can be\n\n      1. uid of a normal booking\n\n      2. uid of one of the recurring booking recurrences\n\n      3. uid of recurring booking which will return an array of all recurring booking recurrences (stored as recurringBookingUid on one of the individual recurrences).\n      \n      If you are fetching a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n      you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n\n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8007,12 +8353,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getBookingRecordings",
         "summary": "Get all the recordings for the booking",
-        "description": "Fetches all the recordings for the booking `:bookingUid`",
+        "description": "Fetches all the recordings for the booking `:bookingUid`\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8047,12 +8393,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getBookingTranscripts",
         "summary": "Get all the transcripts download links for the booking",
-        "description": "Fetches all the transcripts download links for the booking `:bookingUid`",
+        "description": "Fetches all the transcripts download links for the booking `:bookingUid`\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8087,12 +8433,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_rescheduleBooking",
         "summary": "Reschedule a booking",
-        "description": "Reschedule a booking or seated booking",
+        "description": "Reschedule a booking or seated booking\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8172,12 +8518,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_cancelBooking",
         "summary": "Cancel a booking",
-        "description": ":bookingUid can be :bookingUid of an usual booking, individual recurrence or recurring booking to cancel all recurrences.\n    \n    \nCancelling seated bookings:\n    It is possible to cancel specific seat within a booking as an attendee or all of the seats as the host.\n    \n1. As an attendee - provide :bookingUid in the request URL `/bookings/:bookingUid/cancel` and seatUid in the request body `{\"seatUid\": \"123-123-123\"}` . This will remove this particular attendance from the booking.\n    \n2. As the host - host can cancel booking for all attendees aka for every seat. Provide :bookingUid in the request URL `/bookings/:bookingUid/cancel` and cancellationReason in the request body `{\"cancellationReason\": \"Will travel\"}` and `Authorization: Bearer token` request header where token is event type owner (host) credential. This will cancel the booking for all attendees.\n    \n    \nCancelling recurring seated bookings:\n    For recurring seated bookings it is not possible to cancel all of them with 1 call\n    like with non-seated recurring bookings by providing recurring bookind uid - you have to cancel each recurrence booking by its bookingUid + seatUid.\n    \n    If you are cancelling a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n    you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n    ",
+        "description": ":bookingUid can be :bookingUid of an usual booking, individual recurrence or recurring booking to cancel all recurrences.\n    \n    \nCancelling seated bookings:\n    It is possible to cancel specific seat within a booking as an attendee or all of the seats as the host.\n    \n1. As an attendee - provide :bookingUid in the request URL `/bookings/:bookingUid/cancel` and seatUid in the request body `{\"seatUid\": \"123-123-123\"}` . This will remove this particular attendance from the booking.\n    \n2. As the host - host can cancel booking for all attendees aka for every seat. Provide :bookingUid in the request URL `/bookings/:bookingUid/cancel` and cancellationReason in the request body `{\"cancellationReason\": \"Will travel\"}` and `Authorization: Bearer token` request header where token is event type owner (host) credential. This will cancel the booking for all attendees.\n    \n    \nCancelling recurring seated bookings:\n    For recurring seated bookings it is not possible to cancel all of them with 1 call\n    like with non-seated recurring bookings by providing recurring bookind uid - you have to cancel each recurrence booking by its bookingUid + seatUid.\n    \n    If you are cancelling a seated booking for an event type with 'show attendees' disabled, then to retrieve attendees in the response either set 'show attendees' to true on event type level or\n    you have to provide an authentication method of event type owner, host, team admin or owner or org admin or owner.\n\n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8257,12 +8603,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_markNoShow",
         "summary": "Mark a booking absence",
-        "description": "The provided authorization header refers to the owner of the booking.",
+        "description": "The provided authorization header refers to the owner of the booking.\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8316,12 +8662,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_reassignBooking",
         "summary": "Reassign a booking to auto-selected host",
-        "description": "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.",
+        "description": "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.\n      \n       <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8365,12 +8711,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_reassignBookingToUser",
         "summary": "Reassign a booking to a specific host",
-        "description": "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.",
+        "description": "Currently only supports reassigning host for round robin bookings. The provided authorization header refers to the owner of the booking.\n      \n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8432,12 +8778,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_confirmBooking",
         "summary": "Confirm a booking",
-        "description": "The provided authorization header refers to the owner of the booking.",
+        "description": "The provided authorization header refers to the owner of the booking.\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8481,12 +8827,12 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_declineBooking",
         "summary": "Decline a booking",
-        "description": "The provided authorization header refers to the owner of the booking.",
+        "description": "The provided authorization header refers to the owner of the booking.\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note> \n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8540,12 +8886,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getCalendarLinks",
         "summary": "Get 'Add to Calendar' links for a booking",
-        "description": "Retrieve calendar links for a booking that can be used to add the event to various calendar services. Returns links for Google Calendar, Microsoft Office, Microsoft Outlook, and a downloadable ICS file.",
+        "description": "Retrieve calendar links for a booking that can be used to add the event to various calendar services. Returns links for Google Calendar, Microsoft Office, Microsoft Outlook, and a downloadable ICS file.\n      \n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note> \n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -8589,11 +8935,12 @@
       "get": {
         "operationId": "BookingsController_2024_08_13_getBookingReferences",
         "summary": "Get booking references",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-08-13",
+            "description": "Must be set to 2024-08-13. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -9481,11 +9828,12 @@
       "post": {
         "operationId": "EventTypesController_2024_06_14_createEventType",
         "summary": "Create an event type",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-14",
+            "description": "Must be set to 2024-06-14. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -9529,12 +9877,12 @@
       "get": {
         "operationId": "EventTypesController_2024_06_14_getEventTypes",
         "summary": "Get all event types",
-        "description": "Hidden event types are returned only if authentication is provided and it belongs to the event type owner.",
+        "description": "Hidden event types are returned only if authentication is provided and it belongs to the event type owner.\n      \n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-14",
+            "description": "Must be set to 2024-06-14. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -9633,11 +9981,12 @@
       "get": {
         "operationId": "EventTypesController_2024_06_14_getEventTypeById",
         "summary": "Get an event type",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-14",
+            "description": "Must be set to 2024-06-14. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -9679,11 +10028,12 @@
       "patch": {
         "operationId": "EventTypesController_2024_06_14_updateEventType",
         "summary": "Update an event type",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-14",
+            "description": "Must be set to 2024-06-14. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -9735,11 +10085,12 @@
       "delete": {
         "operationId": "EventTypesController_2024_06_14_deleteEventType",
         "summary": "Delete an event type",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-14",
+            "description": "Must be set to 2024-06-14. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11287,7 +11638,7 @@
       "post": {
         "operationId": "SchedulesController_2024_06_11_createSchedule",
         "summary": "Create a schedule",
-        "description": "\n      Create a schedule for the authenticated user.\n\n      The point of creating schedules is for event types to be available at specific times.\n\n      The first goal of schedules is to have a default schedule. If you are platform customer and created managed users, then it is important to note that each managed user should have a default schedule.\n      1. If you passed `timeZone` when creating managed user, then the default schedule from Monday to Friday from 9AM to 5PM will be created with that timezone. The managed user can then change the default schedule via the `AvailabilitySettings` atom.\n      2. If you did not, then we assume you want the user to have this specific schedule right away. You should create a default schedule by specifying\n      `\"isDefault\": true` in the request body. Until the user has a default schedule the user can't be booked nor manage their schedule via the AvailabilitySettings atom.\n\n      The second goal of schedules is to create another schedule that event types can point to. This is useful for when an event is booked because availability is not checked against the default schedule but instead against that specific schedule.\n      After creating a non-default schedule, you can update an event type to point to that schedule via the PATCH `event-types/{eventTypeId}` endpoint.\n\n      When specifying start time and end time for each day use the 24 hour format e.g. 08:00, 15:00 etc.\n      ",
+        "description": "\n      Create a schedule for the authenticated user.\n\n      The point of creating schedules is for event types to be available at specific times.\n\n      The first goal of schedules is to have a default schedule. If you are platform customer and created managed users, then it is important to note that each managed user should have a default schedule.\n      1. If you passed `timeZone` when creating managed user, then the default schedule from Monday to Friday from 9AM to 5PM will be created with that timezone. The managed user can then change the default schedule via the `AvailabilitySettings` atom.\n      2. If you did not, then we assume you want the user to have this specific schedule right away. You should create a default schedule by specifying\n      `\"isDefault\": true` in the request body. Until the user has a default schedule the user can't be booked nor manage their schedule via the AvailabilitySettings atom.\n\n      The second goal of schedules is to create another schedule that event types can point to. This is useful for when an event is booked because availability is not checked against the default schedule but instead against that specific schedule.\n      After creating a non-default schedule, you can update an event type to point to that schedule via the PATCH `event-types/{eventTypeId}` endpoint.\n\n      When specifying start time and end time for each day use the 24 hour format e.g. 08:00, 15:00 etc.\n\n      <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "Authorization",
@@ -11301,7 +11652,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11336,7 +11687,7 @@
       "get": {
         "operationId": "SchedulesController_2024_06_11_getSchedules",
         "summary": "Get all schedules",
-        "description": "Get all schedules of the authenticated user.",
+        "description": "Get all schedules of the authenticated user.\n    \n     <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "Authorization",
@@ -11350,7 +11701,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11377,7 +11728,7 @@
       "get": {
         "operationId": "SchedulesController_2024_06_11_getDefaultSchedule",
         "summary": "Get default schedule",
-        "description": "Get the default schedule of the authenticated user.",
+        "description": "Get the default schedule of the authenticated user.\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n    ",
         "parameters": [
           {
             "name": "Authorization",
@@ -11391,7 +11742,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11418,6 +11769,7 @@
       "get": {
         "operationId": "SchedulesController_2024_06_11_getSchedule",
         "summary": "Get a schedule",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "Authorization",
@@ -11431,7 +11783,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11464,6 +11816,7 @@
       "patch": {
         "operationId": "SchedulesController_2024_06_11_updateSchedule",
         "summary": "Update a schedule",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "Authorization",
@@ -11477,7 +11830,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11520,6 +11873,7 @@
       "delete": {
         "operationId": "SchedulesController_2024_06_11_deleteSchedule",
         "summary": "Delete a schedule",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "Authorization",
@@ -11533,7 +11887,7 @@
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-06-11",
+            "description": "Must be set to 2024-06-11. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11668,12 +12022,12 @@
       "get": {
         "operationId": "SlotsController_2024_09_04_getAvailableSlots",
         "summary": "Get available time slots for an event type",
-        "description": "\n      There are 4 ways to get available slots for event type of an individual user:\n\n      1. By event type id. Event type id can be of user and team event types. Example '/v2/slots?eventTypeId=10&start=2050-09-05&end=2050-09-06&timeZone=Europe/Rome'\n\n      2. By event type slug + username. Example '/v2/slots?eventTypeSlug=intro&username=bob&start=2050-09-05&end=2050-09-06'\n\n      3. By event type slug + username + organization slug when searching within an organization. Example '/v2/slots?organizationSlug=org-slug&eventTypeSlug=intro&username=bob&start=2050-09-05&end=2050-09-06'\n\n      4. By usernames only (used for dynamic event type - there is no specific event but you want to know when 2 or more people are available). Example '/v2/slots?usernames=alice,bob&username=bob&organizationSlug=org-slug&start=2050-09-05&end=2050-09-06'. As you see you also need to provide the slug of the organization to which each user in the 'usernames' array belongs.\n\n      And 3 ways to get available slots for team event type:\n\n      1. By team event type id. Example '/v2/slots?eventTypeId=10&start=2050-09-05&end=2050-09-06&timeZone=Europe/Rome'\n\n      2. By team event type slug + team slug. Example '/v2/slots?eventTypeSlug=intro&teamSlug=team-slug&start=2050-09-05&end=2050-09-06'\n\n      3. By team event type slug + team slug + organization slug when searching within an organization. Example '/v2/slots?organizationSlug=org-slug&eventTypeSlug=intro&teamSlug=team-slug&start=2050-09-05&end=2050-09-06'\n\n      All of them require \"start\" and \"end\" query parameters which define the time range for which available slots should be checked.\n      Optional parameters are:\n      - timeZone: Time zone in which the available slots should be returned. Defaults to UTC.\n      - duration: Only use for event types that allow multiple durations or for dynamic event types. If not passed for multiple duration event types defaults to default duration. For dynamic event types defaults to 30 aka each returned slot is 30 minutes long. So duration=60 means that returned slots will be each 60 minutes long.\n      - format: Format of the slots. By default return is an object where each key is date and value is array of slots as string. If you want to get start and end of each slot use \"range\" as value.\n      - bookingUidToReschedule: When rescheduling an existing booking, provide the booking's unique identifier to exclude its time slot from busy time calculations. This ensures the original booking time appears as available for rescheduling.\n      ",
+        "description": "\n      There are 4 ways to get available slots for event type of an individual user:\n\n      1. By event type id. Event type id can be of user and team event types. Example '/v2/slots?eventTypeId=10&start=2050-09-05&end=2050-09-06&timeZone=Europe/Rome'\n\n      2. By event type slug + username. Example '/v2/slots?eventTypeSlug=intro&username=bob&start=2050-09-05&end=2050-09-06'\n\n      3. By event type slug + username + organization slug when searching within an organization. Example '/v2/slots?organizationSlug=org-slug&eventTypeSlug=intro&username=bob&start=2050-09-05&end=2050-09-06'\n\n      4. By usernames only (used for dynamic event type - there is no specific event but you want to know when 2 or more people are available). Example '/v2/slots?usernames=alice,bob&username=bob&organizationSlug=org-slug&start=2050-09-05&end=2050-09-06'. As you see you also need to provide the slug of the organization to which each user in the 'usernames' array belongs.\n\n      And 3 ways to get available slots for team event type:\n\n      1. By team event type id. Example '/v2/slots?eventTypeId=10&start=2050-09-05&end=2050-09-06&timeZone=Europe/Rome'\n\n      2. By team event type slug + team slug. Example '/v2/slots?eventTypeSlug=intro&teamSlug=team-slug&start=2050-09-05&end=2050-09-06'\n\n      3. By team event type slug + team slug + organization slug when searching within an organization. Example '/v2/slots?organizationSlug=org-slug&eventTypeSlug=intro&teamSlug=team-slug&start=2050-09-05&end=2050-09-06'\n\n      All of them require \"start\" and \"end\" query parameters which define the time range for which available slots should be checked.\n      Optional parameters are:\n      - timeZone: Time zone in which the available slots should be returned. Defaults to UTC.\n      - duration: Only use for event types that allow multiple durations or for dynamic event types. If not passed for multiple duration event types defaults to default duration. For dynamic event types defaults to 30 aka each returned slot is 30 minutes long. So duration=60 means that returned slots will be each 60 minutes long.\n      - format: Format of the slots. By default return is an object where each key is date and value is array of slots as string. If you want to get start and end of each slot use \"range\" as value.\n      - bookingUidToReschedule: When rescheduling an existing booking, provide the booking's unique identifier to exclude its time slot from busy time calculations. This ensures the original booking time appears as available for rescheduling.\n\n       <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>\n      ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-09-04",
+            "description": "Must be set to 2024-09-04. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11871,12 +12225,12 @@
       "post": {
         "operationId": "SlotsController_2024_09_04_reserveSlot",
         "summary": "Reserve a slot",
-        "description": "Make a slot not available for others to book for a certain period of time. If you authenticate using oAuth credentials, api key or access token\n    then you can also specify custom duration for how long the slot should be reserved for (defaults to 5 minutes).",
+        "description": "Make a slot not available for others to book for a certain period of time. If you authenticate using oAuth credentials, api key or access token\n    then you can also specify custom duration for how long the slot should be reserved for (defaults to 5 minutes).\n    \n    <Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>    \n    ",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-09-04",
+            "description": "Must be set to 2024-09-04. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11931,11 +12285,12 @@
       "get": {
         "operationId": "SlotsController_2024_09_04_getReservedSlot",
         "summary": "Get reserved slot",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-09-04",
+            "description": "Must be set to 2024-09-04. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -11968,11 +12323,12 @@
       "patch": {
         "operationId": "SlotsController_2024_09_04_updateReservedSlot",
         "summary": "Update a reserved slot",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-09-04",
+            "description": "Must be set to 2024-09-04. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -12015,11 +12371,12 @@
       "delete": {
         "operationId": "SlotsController_2024_09_04_deleteReservedSlot",
         "summary": "Delete a reserved slot",
+        "description": "<Note>Please make sure to pass in the cal-api-version header value as mentioned in the Headers section. Not passing the correct value will default to an older version of this endpoint.</Note>",
         "parameters": [
           {
             "name": "cal-api-version",
             "in": "header",
-            "description": "Must be set to 2024-09-04",
+            "description": "Must be set to 2024-09-04. If not set to this value, the endpoint will default to an older version.",
             "required": true,
             "schema": {
               "type": "string",
@@ -12681,6 +13038,7 @@
       "get": {
         "operationId": "TeamsMembershipsController_getTeamMemberships",
         "summary": "Get all memberships",
+        "description": "Retrieve team memberships with optional filtering by email addresses. Supports pagination.",
         "parameters": [
           {
             "name": "Authorization",
@@ -12723,6 +13081,19 @@
               "default": 0,
               "type": "number"
             }
+          },
+          {
+            "name": "emails",
+            "required": false,
+            "in": "query",
+            "description": "Filter team memberships by email addresses. If you want to filter by multiple emails, separate them with a comma (max 20 emails for performance).",
+            "example": "?emails=user1@example.com,user2@example.com",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
           }
         ],
         "responses": {
@@ -15278,6 +15649,20 @@
           }
         }
       },
+      "BookerActiveBookingsLimit_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "maximumActiveBookings": {
+            "type": "number",
+            "description": "The maximum number of active bookings a booker can have for this event type.",
+            "example": 3
+          },
+          "offerReschedule": {
+            "type": "boolean",
+            "description": "Whether to offer rescheduling the last active booking to the chosen time slot when limit is reached."
+          }
+        }
+      },
       "Disabled_2024_06_14": {
         "type": "object",
         "properties": {
@@ -15615,6 +16000,19 @@
         },
         "required": ["type"]
       },
+      "EmailSettings_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "disableEmailsToAttendees": {
+            "type": "boolean",
+            "description": "Disables all email communication to attendees for this event type, including booking confirmations, reminders, and cancellations. This DOES NOT include emails sent by custom email workflows."
+          },
+          "disableEmailsToHosts": {
+            "type": "boolean",
+            "description": "Disables all email communication to hosts for this event type, including booking confirmations, reminders, and cancellations. This DOES NOT include emails sent by custom email workflows."
+          }
+        }
+      },
       "CalVideoSettings": {
         "type": "object",
         "properties": {
@@ -15775,6 +16173,17 @@
               }
             ]
           },
+          "bookerActiveBookingsLimit": {
+            "description": "Limit the number of active bookings a booker can make for this event type.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
+              },
+              {
+                "$ref": "#/components/schemas/Disabled_2024_06_14"
+              }
+            ]
+          },
           "onlyShowFirstAvailableSlot": {
             "type": "boolean",
             "description": "This will limit your availability for this event type to one slot per day, scheduled at the earliest available time."
@@ -16832,6 +17241,20 @@
         },
         "required": ["type", "slug", "label", "required", "placeholder", "hidden", "isDefault"]
       },
+      "BookerActiveBookingsLimitOutput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "maximumActiveBookings": {
+            "type": "number",
+            "description": "The maximum number of active bookings a booker can have for this event type.",
+            "example": 3
+          },
+          "offerReschedule": {
+            "type": "boolean",
+            "description": "Whether to offer rescheduling the last active booking to the chosen time slot when limit is reached."
+          }
+        }
+      },
       "EventTypeOutput_2024_06_14": {
         "type": "object",
         "properties": {
@@ -17018,6 +17441,9 @@
           "bookingLimitsCount": {
             "type": "object"
           },
+          "bookerActiveBookingsLimit": {
+            "$ref": "#/components/schemas/BookerActiveBookingsLimitOutput_2024_06_14"
+          },
           "onlyShowFirstAvailableSlot": {
             "type": "boolean"
           },
@@ -17291,11 +17717,22 @@
             "type": "number",
             "description": "If you want that this event has different schedule than user's default one you can specify it here."
           },
-          "bookingLimitsCount": {
-            "description": "Limit how many times this event can be booked",
+          "bookingLimitsCount": {
+            "description": "Limit how many times this event can be booked",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BaseBookingLimitsCount_2024_06_14"
+              },
+              {
+                "$ref": "#/components/schemas/Disabled_2024_06_14"
+              }
+            ]
+          },
+          "bookerActiveBookingsLimit": {
+            "description": "Limit the number of active bookings a booker can make for this event type.",
             "oneOf": [
               {
-                "$ref": "#/components/schemas/BaseBookingLimitsCount_2024_06_14"
+                "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
               },
               {
                 "$ref": "#/components/schemas/Disabled_2024_06_14"
@@ -18873,6 +19310,17 @@
               }
             ]
           },
+          "bookerActiveBookingsLimit": {
+            "description": "Limit the number of active bookings a booker can make for this event type.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
+              },
+              {
+                "$ref": "#/components/schemas/Disabled_2024_06_14"
+              }
+            ]
+          },
           "onlyShowFirstAvailableSlot": {
             "type": "boolean",
             "description": "This will limit your availability for this event type to one slot per day, scheduled at the earliest available time."
@@ -19008,7 +19456,7 @@
             "description": "The scheduling type for the team event - collective, roundRobin or managed."
           },
           "hosts": {
-            "description": "Hosts contain specific team members you want to assign to this event type, but if you want to assign all team members, use `assignAllTeamMembers: true` instead and omit this field. For platform customers the hosts can include userIds only of managed users.",
+            "description": "Hosts contain specific team members you want to assign to this event type, but if you want to assign all team members, use `assignAllTeamMembers: true` instead and omit this field. For platform customers the hosts can include userIds only of managed users. Provide either hosts or assignAllTeamMembers but not both",
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/Host"
@@ -19016,7 +19464,7 @@
           },
           "assignAllTeamMembers": {
             "type": "boolean",
-            "description": "If true, all current and future team members will be assigned to this event type"
+            "description": "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both"
           },
           "locations": {
             "type": "array",
@@ -19049,6 +19497,18 @@
                 }
               ]
             }
+          },
+          "emailSettings": {
+            "description": "Email settings for this event type - only available for organization team event types.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EmailSettings_2024_06_14"
+              }
+            ]
+          },
+          "rescheduleWithSameRoundRobinHost": {
+            "type": "boolean",
+            "description": "Rescheduled events will be assigned to the same host as initially scheduled."
           }
         },
         "required": ["lengthInMinutes", "title", "slug", "schedulingType"]
@@ -19282,6 +19742,9 @@
           "bookingLimitsCount": {
             "type": "object"
           },
+          "bookerActiveBookingsLimit": {
+            "$ref": "#/components/schemas/BookerActiveBookingsLimitOutput_2024_06_14"
+          },
           "onlyShowFirstAvailableSlot": {
             "type": "boolean"
           },
@@ -19384,6 +19847,18 @@
           },
           "team": {
             "$ref": "#/components/schemas/EventTypeTeam"
+          },
+          "emailSettings": {
+            "description": "Email settings for this event type. Only available for organization team event types.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EmailSettings_2024_06_14"
+              }
+            ]
+          },
+          "rescheduleWithSameRoundRobinHost": {
+            "type": "boolean",
+            "description": "Rescheduled events will be assigned to the same host as initially scheduled."
           }
         },
         "required": [
@@ -19672,6 +20147,17 @@
               }
             ]
           },
+          "bookerActiveBookingsLimit": {
+            "description": "Limit the number of active bookings a booker can make for this event type.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
+              },
+              {
+                "$ref": "#/components/schemas/Disabled_2024_06_14"
+              }
+            ]
+          },
           "onlyShowFirstAvailableSlot": {
             "type": "boolean",
             "description": "This will limit your availability for this event type to one slot per day, scheduled at the earliest available time."
@@ -19801,6 +20287,7 @@
             "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users who are the event-type owner or org/team admin/owner can book this event type."
           },
           "hosts": {
+            "description": "Hosts contain specific team members you want to assign to this event type, but if you want to assign all team members, use `assignAllTeamMembers: true` instead and omit this field. For platform customers the hosts can include userIds only of managed users. Provide either hosts or assignAllTeamMembers but not both",
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/Host"
@@ -19808,7 +20295,7 @@
           },
           "assignAllTeamMembers": {
             "type": "boolean",
-            "description": "If true, all current and future team members will be assigned to this event type"
+            "description": "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both"
           },
           "locations": {
             "type": "array",
@@ -19841,6 +20328,18 @@
                 }
               ]
             }
+          },
+          "emailSettings": {
+            "description": "Email settings for this event type. Only available for organization team event types.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EmailSettings_2024_06_14"
+              }
+            ]
+          },
+          "rescheduleWithSameRoundRobinHost": {
+            "type": "boolean",
+            "description": "Rescheduled events will be assigned to the same host as initially scheduled."
           }
         }
       },
@@ -20663,7 +21162,7 @@
           }
         }
       },
-      "WorkflowActivationOutputDto": {
+      "EventTypeWorkflowActivationOutputDto": {
         "type": "object",
         "properties": {
           "isActiveOnAllEventTypes": {
@@ -20696,33 +21195,255 @@
             "example": "hour",
             "enum": ["hour", "minute", "day"]
           }
-        },
-        "required": ["value", "unit"]
+        },
+        "required": ["value", "unit"]
+      },
+      "EventTypeWorkflowTriggerOutputDto": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Trigger type for the workflow",
+            "example": "beforeEvent",
+            "enum": [
+              "beforeEvent",
+              "eventCancelled",
+              "newEvent",
+              "afterEvent",
+              "rescheduleEvent",
+              "afterHostsCalVideoNoShow",
+              "afterGuestsCalVideoNoShow",
+              "bookingRejected",
+              "bookingRequested",
+              "bookingPaymentInitiated",
+              "bookingPaid",
+              "bookingNoShowUpdated"
+            ]
+          },
+          "offset": {
+            "description": "Offset details (present for BEFORE_EVENT/AFTER_EVENT)",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WorkflowTriggerOffsetOutputDto"
+              }
+            ]
+          }
+        },
+        "required": ["type"]
+      },
+      "WorkflowMessageOutputDto": {
+        "type": "object",
+        "properties": {
+          "subject": {
+            "type": "string",
+            "description": "Subject of the message",
+            "example": "Reminder: Your Meeting {EVENT_NAME} - {EVENT_DATE_ddd, MMM D, YYYY h:mma} with Cal.com"
+          },
+          "html": {
+            "type": "string",
+            "description": "HTML content of the message",
+            "example": "<p>Reminder for {EVENT_NAME}.</p>"
+          },
+          "text": {
+            "type": "string",
+            "description": "Text content of the message (used for SMS/WhatsApp)",
+            "example": "Reminder for {EVENT_NAME}."
+          }
+        },
+        "required": ["subject"]
+      },
+      "EventTypeWorkflowStepOutputDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "Unique identifier of the step",
+            "example": 67244
+          },
+          "stepNumber": {
+            "type": "number",
+            "description": "Step number in the workflow sequence",
+            "example": 1
+          },
+          "recipient": {
+            "type": "string",
+            "description": "Intended recipient type",
+            "example": "const",
+            "enum": ["const", "attendee", "email", "phone_number"]
+          },
+          "email": {
+            "type": "string",
+            "description": "Verified Email  if action is EMAIL_ADDRESS",
+            "example": 31214
+          },
+          "phone": {
+            "type": "string",
+            "description": "Verified Phone if action is SMS_NUMBER or WHATSAPP_NUMBER"
+          },
+          "phoneRequired": {
+            "type": "boolean",
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true,
+            "default": false
+          },
+          "template": {
+            "type": "string",
+            "description": "Template type used",
+            "example": "reminder",
+            "enum": ["reminder", "custom", "rescheduled", "completed", "rating", "cancelled"]
+          },
+          "includeCalendarEvent": {
+            "type": "object",
+            "default": false,
+            "description": "Whether a calendar event (.ics) was included (for email actions)",
+            "example": true
+          },
+          "sender": {
+            "type": "string",
+            "description": "Displayed sender name used for this step",
+            "example": "Cal.com Notifications"
+          },
+          "message": {
+            "description": "Message content for this step",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WorkflowMessageOutputDto"
+              }
+            ]
+          },
+          "action": {
+            "type": "string",
+            "description": "Action to perform",
+            "example": "email_host",
+            "enum": [
+              "email_host",
+              "email_attendee",
+              "email_address",
+              "sms_attendee",
+              "sms_number",
+              "whatsapp_attendee",
+              "whatsapp_number",
+              "cal_ai_phone_call"
+            ]
+          }
+        },
+        "required": ["id", "stepNumber", "recipient", "template", "sender", "message", "action"]
+      },
+      "EventTypeWorkflowOutput": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "description": "Unique identifier of the workflow",
+            "example": 101
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the workflow",
+            "example": "Platform Test Workflow"
+          },
+          "userId": {
+            "type": "number",
+            "description": "ID of the user who owns the workflow (if not team-owned)",
+            "example": 2313
+          },
+          "teamId": {
+            "type": "number",
+            "description": "ID of the team owning the workflow",
+            "example": 4214321
+          },
+          "createdAt": {
+            "type": "object",
+            "description": "Timestamp of creation",
+            "example": "2024-05-12T10:00:00.000Z"
+          },
+          "updatedAt": {
+            "type": "object",
+            "description": "Timestamp of last update",
+            "example": "2024-05-12T11:30:00.000Z"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["event-type"],
+            "description": "type of the workflow",
+            "example": "event-type",
+            "default": "event-type"
+          },
+          "activation": {
+            "description": "Activation settings for the workflow",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EventTypeWorkflowActivationOutputDto"
+              }
+            ]
+          },
+          "trigger": {
+            "description": "Trigger configuration",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EventTypeWorkflowTriggerOutputDto"
+              }
+            ]
+          },
+          "steps": {
+            "description": "Steps comprising the workflow",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EventTypeWorkflowStepOutputDto"
+            }
+          }
+        },
+        "required": ["id", "name", "type", "activation", "trigger", "steps"]
+      },
+      "GetEventTypeWorkflowsOutput": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "description": "Indicates the status of the response",
+            "example": "success",
+            "enum": ["success", "error"]
+          },
+          "data": {
+            "description": "List of workflows",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EventTypeWorkflowOutput"
+            }
+          }
+        },
+        "required": ["status", "data"]
+      },
+      "RoutingFormWorkflowActivationOutputDto": {
+        "type": "object",
+        "properties": {
+          "isActiveOnAllRoutingForms": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether the workflow is active for all routing forms associated with the team/user",
+            "example": false
+          },
+          "activeOnRoutingFormIds": {
+            "description": "List of Event Type IDs the workflow is specifically active on (if not active on all)",
+            "example": ["5cacdec7-1234-6e1b-78d9-7bcda8a1b332"],
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
       },
-      "WorkflowTriggerOutputDto": {
+      "RoutingFormWorkflowTriggerOutputDto": {
         "type": "object",
         "properties": {
           "type": {
             "type": "string",
             "description": "Trigger type for the workflow",
-            "example": "beforeEvent",
-            "enum": [
-              "beforeEvent",
-              "eventCancelled",
-              "newEvent",
-              "afterEvent",
-              "rescheduleEvent",
-              "afterHostsCalVideoNoShow",
-              "afterGuestsCalVideoNoShow",
-              "bookingRejected",
-              "bookingRequested",
-              "bookingPaymentInitiated",
-              "bookingPaid",
-              "bookingNoShowUpdated"
-            ]
+            "example": "formSubmitted",
+            "enum": ["formSubmitted", "formSubmittedNoEvent"]
           },
           "offset": {
-            "description": "Offset details (present for BEFORE_EVENT/AFTER_EVENT)",
+            "description": "Offset details (present for BEFORE_EVENT/AFTER_EVENT/FORM_SUBMITTED_NO_EVENT)",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowTriggerOffsetOutputDto"
@@ -20732,28 +21453,7 @@
         },
         "required": ["type"]
       },
-      "WorkflowMessageOutputDto": {
-        "type": "object",
-        "properties": {
-          "subject": {
-            "type": "string",
-            "description": "Subject of the message",
-            "example": "Reminder: Your Meeting {EVENT_NAME} - {EVENT_DATE_ddd, MMM D, YYYY h:mma} with Cal.com"
-          },
-          "html": {
-            "type": "string",
-            "description": "HTML content of the message",
-            "example": "<p>Reminder for {EVENT_NAME}.</p>"
-          },
-          "text": {
-            "type": "string",
-            "description": "Text content of the message (used for SMS/WhatsApp)",
-            "example": "Reminder for {EVENT_NAME}."
-          }
-        },
-        "required": ["subject"]
-      },
-      "WorkflowStepOutputDto": {
+      "RoutingFormWorkflowStepOutputDto": {
         "type": "object",
         "properties": {
           "id": {
@@ -20766,21 +21466,6 @@
             "description": "Step number in the workflow sequence",
             "example": 1
           },
-          "action": {
-            "type": "string",
-            "description": "Action to perform",
-            "example": "email_host",
-            "enum": [
-              "email_host",
-              "email_attendee",
-              "email_address",
-              "sms_attendee",
-              "sms_number",
-              "whatsapp_attendee",
-              "whatsapp_number",
-              "cal_ai_phone_call"
-            ]
-          },
           "recipient": {
             "type": "string",
             "description": "Intended recipient type",
@@ -20796,6 +21481,12 @@
             "type": "string",
             "description": "Verified Phone if action is SMS_NUMBER or WHATSAPP_NUMBER"
           },
+          "phoneRequired": {
+            "type": "boolean",
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true,
+            "default": false
+          },
           "template": {
             "type": "string",
             "description": "Template type used",
@@ -20820,11 +21511,17 @@
                 "$ref": "#/components/schemas/WorkflowMessageOutputDto"
               }
             ]
+          },
+          "action": {
+            "type": "string",
+            "description": "Action to perform",
+            "example": "email_host",
+            "enum": ["email_attendee", "email_address"]
           }
         },
-        "required": ["id", "stepNumber", "action", "recipient", "template", "sender", "message"]
+        "required": ["id", "stepNumber", "recipient", "template", "sender", "message", "action"]
       },
-      "WorkflowOutput": {
+      "RoutingFormWorkflowOutput": {
         "type": "object",
         "properties": {
           "id": {
@@ -20847,11 +21544,28 @@
             "description": "ID of the team owning the workflow",
             "example": 4214321
           },
+          "createdAt": {
+            "type": "object",
+            "description": "Timestamp of creation",
+            "example": "2024-05-12T10:00:00.000Z"
+          },
+          "updatedAt": {
+            "type": "object",
+            "description": "Timestamp of last update",
+            "example": "2024-05-12T11:30:00.000Z"
+          },
+          "type": {
+            "type": "string",
+            "enum": ["routing-form"],
+            "description": "type of the workflow",
+            "example": "routing-form",
+            "default": "routing-form"
+          },
           "activation": {
-            "description": "Activation settings (scope)",
+            "description": "Activation settings for the workflow",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WorkflowActivationOutputDto"
+                "$ref": "#/components/schemas/RoutingFormWorkflowActivationOutputDto"
               }
             ]
           },
@@ -20859,7 +21573,7 @@
             "description": "Trigger configuration",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WorkflowTriggerOutputDto"
+                "$ref": "#/components/schemas/RoutingFormWorkflowTriggerOutputDto"
               }
             ]
           },
@@ -20867,23 +21581,13 @@
             "description": "Steps comprising the workflow",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/WorkflowStepOutputDto"
+              "$ref": "#/components/schemas/RoutingFormWorkflowStepOutputDto"
             }
-          },
-          "createdAt": {
-            "type": "object",
-            "description": "Timestamp of creation",
-            "example": "2024-05-12T10:00:00.000Z"
-          },
-          "updatedAt": {
-            "type": "object",
-            "description": "Timestamp of last update",
-            "example": "2024-05-12T11:30:00.000Z"
           }
         },
-        "required": ["id", "name", "activation", "trigger", "steps"]
+        "required": ["id", "name", "type", "activation", "trigger", "steps"]
       },
-      "GetWorkflowsOutput": {
+      "GetRoutingFormWorkflowsOutput": {
         "type": "object",
         "properties": {
           "status": {
@@ -20896,13 +21600,32 @@
             "description": "List of workflows",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/WorkflowOutput"
+              "$ref": "#/components/schemas/RoutingFormWorkflowOutput"
+            }
+          }
+        },
+        "required": ["status", "data"]
+      },
+      "GetEventTypeWorkflowOutput": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "description": "Indicates the status of the response",
+            "example": "success",
+            "enum": ["success", "error"]
+          },
+          "data": {
+            "description": "workflow",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EventTypeWorkflowOutput"
             }
           }
         },
         "required": ["status", "data"]
       },
-      "GetWorkflowOutput": {
+      "GetRoutingFormWorkflowOutput": {
         "type": "object",
         "properties": {
           "status": {
@@ -20915,7 +21638,7 @@
             "description": "workflow",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/WorkflowOutput"
+              "$ref": "#/components/schemas/RoutingFormWorkflowOutput"
             }
           }
         },
@@ -20942,7 +21665,7 @@
         "type": "object",
         "properties": {
           "offset": {
-            "description": "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+            "description": "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowTriggerOffsetDto"
@@ -20963,7 +21686,7 @@
         "type": "object",
         "properties": {
           "offset": {
-            "description": "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+            "description": "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowTriggerOffsetDto"
@@ -21075,7 +21798,7 @@
         "type": "object",
         "properties": {
           "offset": {
-            "description": "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+            "description": "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowTriggerOffsetDto"
@@ -21096,7 +21819,7 @@
         "type": "object",
         "properties": {
           "offset": {
-            "description": "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+            "description": "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowTriggerOffsetDto"
@@ -21396,6 +22119,12 @@
                 "$ref": "#/components/schemas/TextWorkflowMessageDto"
               }
             ]
+          },
+          "phoneRequired": {
+            "type": "boolean",
+            "default": false,
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true
           }
         },
         "required": ["action", "stepNumber", "recipient", "template", "sender", "message"]
@@ -21569,32 +22298,37 @@
                 "$ref": "#/components/schemas/TextWorkflowMessageDto"
               }
             ]
+          },
+          "phoneRequired": {
+            "type": "boolean",
+            "default": false,
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true
           }
         },
         "required": ["action", "stepNumber", "recipient", "template", "sender", "message"]
       },
-      "BaseWorkflowTriggerDto": {
+      "EventTypeWorkflowTriggerDto": {
         "type": "object",
         "properties": {
           "type": {
             "type": "object",
             "enum": [
-              [
-                "beforeEvent",
-                "eventCancelled",
-                "newEvent",
-                "afterEvent",
-                "rescheduleEvent",
-                "afterHostsCalVideoNoShow",
-                "afterGuestsCalVideoNoShow",
-                "bookingRejected",
-                "bookingRequested",
-                "bookingPaymentInitiated",
-                "bookingPaid",
-                "bookingNoShowUpdated"
-              ]
+              "beforeEvent",
+              "eventCancelled",
+              "newEvent",
+              "afterEvent",
+              "rescheduleEvent",
+              "afterHostsCalVideoNoShow",
+              "afterGuestsCalVideoNoShow",
+              "bookingRejected",
+              "bookingRequested",
+              "bookingPaymentInitiated",
+              "bookingPaid",
+              "bookingNoShowUpdated"
             ],
-            "description": "Trigger type for the workflow"
+            "description": "Trigger type for the event-type workflow",
+            "example": "beforeEvent"
           }
         },
         "required": ["type"]
@@ -21620,7 +22354,7 @@
         },
         "required": ["isActiveOnAllEventTypes"]
       },
-      "CreateWorkflowDto": {
+      "CreateEventTypeWorkflowDto": {
         "type": "object",
         "properties": {
           "name": {
@@ -21637,7 +22371,7 @@
             ]
           },
           "trigger": {
-            "description": "Trigger configuration for the workflow",
+            "description": "Trigger configuration for the event-type workflow, allowed triggers are beforeEvent,eventCancelled,newEvent,afterEvent,rescheduleEvent,afterHostsCalVideoNoShow,afterGuestsCalVideoNoShow,bookingRejected,bookingRequested,bookingPaymentInitiated,bookingPaid,bookingNoShowUpdated",
             "oneOf": [
               {
                 "$ref": "#/components/schemas/OnBeforeEventTriggerDto"
@@ -21679,7 +22413,7 @@
           },
           "steps": {
             "type": "array",
-            "description": "Steps to execute as part of the workflow",
+            "description": "Steps to execute as part of the event-type workflow, allowed steps are email_host,email_attendee,email_address,sms_attendee,sms_number,whatsapp_attendee,whatsapp_number,cal_ai_phone_call",
             "items": {
               "oneOf": [
                 {
@@ -21709,6 +22443,115 @@
         },
         "required": ["name", "activation", "trigger", "steps"]
       },
+      "OnFormSubmittedTriggerDto": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "default": "formSubmitted",
+            "enum": ["formSubmitted"],
+            "description": "Trigger type for the workflow",
+            "example": "formSubmitted"
+          }
+        },
+        "required": ["type"]
+      },
+      "OnFormSubmittedNoEventTriggerDto": {
+        "type": "object",
+        "properties": {
+          "offset": {
+            "description": "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WorkflowTriggerOffsetDto"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "default": "formSubmittedNoEvent",
+            "enum": ["formSubmittedNoEvent"],
+            "description": "Trigger type for the workflow",
+            "example": "formSubmittedNoEvent"
+          }
+        },
+        "required": ["offset", "type"]
+      },
+      "RoutingFormWorkflowTriggerDto": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "object",
+            "enum": ["formSubmitted", "formSubmittedNoEvent"],
+            "description": "Trigger type for the routing-form workflow",
+            "example": "formSubmitted"
+          }
+        },
+        "required": ["type"]
+      },
+      "WorkflowFormActivationDto": {
+        "type": "object",
+        "properties": {
+          "isActiveOnAllRoutingForms": {
+            "type": "boolean",
+            "description": "Whether the workflow is active for all the routing forms",
+            "example": false
+          },
+          "activeOnRoutingFormIds": {
+            "description": "List of routing form IDs the workflow applies to",
+            "example": ["abd1-123edf-a213d-123dfwf"],
+            "type": "array",
+            "items": {
+              "type": "number"
+            }
+          }
+        },
+        "required": ["isActiveOnAllRoutingForms"]
+      },
+      "CreateFormWorkflowDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the workflow",
+            "example": "Platform Test Workflow"
+          },
+          "activation": {
+            "description": "Activation settings for the workflow",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WorkflowFormActivationDto"
+              }
+            ]
+          },
+          "trigger": {
+            "description": "Trigger configuration for the routing-form workflow, allowed triggers are formSubmitted,formSubmittedNoEvent",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/OnFormSubmittedTriggerDto"
+              },
+              {
+                "$ref": "#/components/schemas/OnFormSubmittedNoEventTriggerDto"
+              }
+            ]
+          },
+          "steps": {
+            "type": "array",
+            "description": "Steps to execute as part of the routing-form workflow, allowed steps are email_attendee,email_address",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/WorkflowEmailAddressStepDto"
+                },
+                {
+                  "$ref": "#/components/schemas/WorkflowEmailAttendeeStepDto"
+                }
+              ]
+            }
+          }
+        },
+        "required": ["name", "activation", "trigger", "steps"]
+      },
       "UpdateEmailAddressWorkflowStepDto": {
         "type": "object",
         "properties": {
@@ -21980,6 +22823,12 @@
               }
             ]
           },
+          "phoneRequired": {
+            "type": "boolean",
+            "default": false,
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true
+          },
           "id": {
             "type": "number",
             "description": "Unique identifier of the step you want to update, if adding a new step do not provide this id",
@@ -22100,6 +22949,12 @@
               }
             ]
           },
+          "phoneRequired": {
+            "type": "boolean",
+            "default": false,
+            "description": "whether or not the attendees are required to provide their phone numbers when booking",
+            "example": true
+          },
           "id": {
             "type": "number",
             "description": "Unique identifier of the step you want to update, if adding a new step do not provide this id",
@@ -22172,7 +23027,7 @@
         },
         "required": ["action", "stepNumber", "recipient", "template", "sender", "verifiedPhoneId", "message"]
       },
-      "UpdateWorkflowDto": {
+      "UpdateEventTypeWorkflowDto": {
         "type": "object",
         "properties": {
           "name": {
@@ -22181,7 +23036,7 @@
             "example": "Platform Test Workflow"
           },
           "activation": {
-            "description": "Activation settings for the workflow, the action that will trigger the workflow.",
+            "description": "Activation settings for the workflow",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WorkflowActivationDto"
@@ -22189,7 +23044,7 @@
             ]
           },
           "trigger": {
-            "description": "Trigger configuration for the workflow",
+            "description": "Trigger configuration for the event-type workflow, allowed triggers are beforeEvent,eventCancelled,newEvent,afterEvent,rescheduleEvent,afterHostsCalVideoNoShow,afterGuestsCalVideoNoShow,bookingRejected,bookingRequested,bookingPaymentInitiated,bookingPaid,bookingNoShowUpdated",
             "oneOf": [
               {
                 "$ref": "#/components/schemas/OnBeforeEventTriggerDto"
@@ -22231,7 +23086,7 @@
           },
           "steps": {
             "type": "array",
-            "description": "Steps to execute as part of the workflow",
+            "description": "Steps to execute as part of the event-type workflow, allowed steps are email_host,email_attendee,email_address,sms_attendee,sms_number,whatsapp_attendee,whatsapp_number,cal_ai_phone_call",
             "items": {
               "oneOf": [
                 {
@@ -22260,6 +23115,44 @@
           }
         }
       },
+      "UpdateFormWorkflowDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the workflow",
+            "example": "Rounting-form Test Workflow"
+          },
+          "trigger": {
+            "description": "Trigger configuration for the routing-form workflow, allowed triggers are formSubmitted,formSubmittedNoEvent",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/OnFormSubmittedTriggerDto"
+              },
+              {
+                "$ref": "#/components/schemas/OnFormSubmittedNoEventTriggerDto"
+              }
+            ]
+          },
+          "steps": {
+            "type": "array",
+            "description": "Steps to execute as part of the routing-form workflow, allowed steps are email_attendee,email_address",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/UpdateEmailAddressWorkflowStepDto"
+                },
+                {
+                  "$ref": "#/components/schemas/UpdateEmailAttendeeWorkflowStepDto"
+                }
+              ]
+            }
+          },
+          "activation": {
+            "$ref": "#/components/schemas/WorkflowFormActivationDto"
+          }
+        }
+      },
       "CreatePrivateLinkInput": {
         "type": "object",
         "properties": {
@@ -26147,6 +27040,10 @@
             "type": "string",
             "example": "3be561a9-31f1-4b8e-aefc-9d9a085f0dd1",
             "description": "Uid of the specific seat within booking."
+          },
+          "cancellationReason": {
+            "type": "string",
+            "example": "User requested cancellation"
           }
         },
         "required": ["seatUid"]
diff --git a/docs/images/deploy-northflank.svg b/docs/images/deploy-northflank.svg
new file mode 100644
index 00000000000000..4fcf68b70e1843
--- /dev/null
+++ b/docs/images/deploy-northflank.svg
@@ -0,0 +1,79 @@
+<svg width="229" height="43" viewBox="0 0 229 43" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3331_3738)">
+<rect width="228.293" height="43" rx="2" fill="#060915"/>
+<path d="M73.0788 -122.102C71.852 -125.325 68.2656 -129.524 64.029 -130.964C61.6694 -131.782 59.3139 -131.344 57.2365 -130.964H57.1792C55.4658 -130.669 53.695 -130.363 51.908 -130.624C51.4622 -130.686 51.0124 -130.768 50.5298 -130.866L50.4685 -130.563C50.9551 -130.465 51.4132 -130.383 51.863 -130.322C53.695 -130.052 55.4944 -130.363 57.2324 -130.661H57.2896C59.3343 -131.033 61.6448 -131.45 63.9308 -130.661C68.0775 -129.25 71.5944 -125.136 72.7926 -121.983C73.8476 -119.207 73.3896 -116.14 72.9439 -113.134C72.5676 -110.611 72.1751 -108.006 72.7108 -105.52V-105.47L72.7517 -105.438C76.4853 -102.121 80.9305 -100.8 85.2407 -99.5245L85.3511 -99.4918C88.8803 -98.4449 92.5239 -97.3612 95.6074 -95.1447C99.3369 -92.4703 101.93 -89.9839 103.541 -87.5466C105.087 -85.2075 105.63 -79.8258 103.987 -76.6565C102.993 -74.7386 101.966 -74.2029 100.67 -73.5445H100.637C99.1556 -72.8601 97.8059 -71.9202 96.6501 -70.7678C94.5646 -68.7231 93.1578 -65.243 91.7838 -61.8324C91.4362 -60.9532 91.1049 -60.1476 90.7778 -59.3788C90.1153 -57.8167 89.3465 -56.2341 88.6676 -54.8396V-54.8028C87.3876 -52.1406 86.1813 -49.6256 85.6169 -47.4418C84.521 -43.0989 85.4943 -40.1545 86.353 -37.5537C86.6856 -36.6274 86.9588 -35.6808 87.1709 -34.7197C87.9111 -30.8102 87.1423 -27.3833 86.4675 -24.3571L86.4307 -24.2017C85.8541 -21.6663 85.3552 -19.4744 85.805 -17.4093C86.2549 -15.3441 87.2322 -13.3935 88.1933 -11.5328C89.6941 -8.63748 91.1131 -5.90166 89.7391 -3.03908C87.8579 0.845856 83.1142 1.81913 78.53 2.7556H78.4359C75.1644 3.44262 71.7825 4.15418 69.5333 5.93716C66.0778 8.67706 64.9859 11.6623 63.8081 14.8398C63.0884 16.8354 62.2664 19.0968 60.6716 21.1865L60.6307 21.2152C56.8562 22.8509 53.4211 21.9553 50.5585 20.8839L50.4521 21.1702C52.3229 21.9283 54.3148 22.3439 56.3327 22.397C57.8459 22.4005 59.3436 22.0928 60.7329 21.4932L60.8433 21.4646L60.9169 21.3624C62.5527 19.2359 63.3706 16.954 64.1067 14.9175C65.2476 11.8014 66.3313 8.8529 69.7132 6.17026C71.9052 4.43226 75.2544 3.71661 78.4891 3.05004H78.5832C83.241 2.09721 88.0583 1.10758 90.0049 -2.91231C91.4484 -5.91393 90.0049 -8.71517 88.4386 -11.7168C87.5062 -13.5243 86.5411 -15.3973 86.0954 -17.4829C85.6619 -19.4826 86.1526 -21.6418 86.7211 -24.1404L86.7579 -24.2999C87.4408 -27.3547 88.2178 -30.8143 87.4613 -34.7851C87.2516 -35.7562 86.9784 -36.7125 86.6434 -37.6477C85.7969 -40.2036 84.8399 -43.103 85.9114 -47.36C86.4716 -49.5356 87.6739 -52.0342 88.9457 -54.6801V-54.7169C89.6246 -56.1155 90.3934 -57.7021 91.0599 -59.2725C91.3912 -60.0536 91.7183 -60.8633 92.0823 -61.7752C93.4318 -65.1244 94.8263 -68.5841 96.8628 -70.5715C97.9953 -71.7044 99.3205 -72.6267 100.776 -73.295L100.809 -73.3155C102.159 -74.0066 103.222 -74.5423 104.261 -76.5584C105.949 -79.8299 105.389 -85.3465 103.798 -87.7552C102.163 -90.2088 99.5454 -92.7361 95.7873 -95.4351C92.663 -97.6842 88.9907 -98.772 85.4411 -99.8271L85.3307 -99.8598C81.0818 -101.095 76.6775 -102.403 73.0011 -105.646C72.494 -108.059 72.8744 -110.623 73.2506 -113.138C73.7004 -116.144 74.1625 -119.252 73.0788 -122.102Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M57.7472 28.8133L58.242 29.165L58.2788 29.1936C60.3235 30.6822 62.4213 32.2239 64.4129 32.4079C64.6051 32.4079 64.7973 32.4324 64.9813 32.4324C67.3286 32.4324 68.8867 31.0911 70.7065 29.5412C72.2932 28.1672 74.0884 26.6091 76.7179 26.0284C79.4087 25.4396 82.0096 26.0284 84.2997 26.5233C87.8615 27.3411 90.9368 28.0159 92.7034 23.6607L92.732 23.5911L92.6952 23.5257C90.8591 20.3278 87.8902 18.463 83.8662 17.9805C82.7089 17.8333 81.6579 18.1277 80.5947 18.4222C79.735 18.7127 78.8356 18.8686 77.9284 18.8843C75.8264 18.7902 73.9862 18.0009 73.0211 16.77C72.6914 16.3555 72.4564 15.8738 72.3328 15.3587C72.2092 14.8437 72.1998 14.3079 72.3054 13.7889V13.7438C73.6263 11.3924 75.8019 10.6318 78.1328 9.80984C79.7441 9.23733 81.4044 8.64436 82.8643 7.48297C85.6655 5.25834 90.9122 2.98463 93.8648 5.84721L93.9057 5.90037C94.9566 8.7098 96.4247 11.3311 97.8397 13.8625L97.901 13.9647C98.6903 15.3755 99.4591 16.7578 100.162 18.1441V18.1809V18.2136C98.8293 21.0353 100.048 23.5298 101.639 24.9243C103.405 26.4864 106.546 27.3984 109.237 25.7095L109.29 25.6563C111.249 22.3112 109.748 20.6059 108.018 18.6266L107.9 18.7289L107.99 18.598C106.943 17.3916 105.859 16.1443 105.495 14.4145C105.315 13.5148 105.213 12.8524 105.147 12.3698C105.123 12.2349 105.107 12.1122 105.09 11.9977L105.041 11.6746C104.501 8.59938 102.857 7.24988 101.119 5.82267C99.9416 4.85349 98.723 3.85158 97.9378 2.26898C97.1527 0.686381 97.3489 -0.634497 97.5575 -2.00036V-2.11894C97.6534 -2.68281 97.7108 -3.25255 97.7293 -3.82422C97.762 -5.41091 97.6638 -6.97306 97.5657 -8.48205L97.5411 -8.84602C97.4471 -10.1505 97.3367 -11.6309 97.3285 -13.1154L97.353 -13.1644C99.2955 -15.1764 98.4531 -20.3291 97.9501 -23.3879C97.8642 -23.8991 97.7906 -24.3776 97.7374 -24.762C97.6002 -26.0187 97.592 -27.2862 97.7129 -28.5447V-28.6551C97.8063 -29.5383 97.7912 -30.4296 97.6679 -31.3091C97.1813 -33.82 95.6232 -36.1387 93.9629 -38.5964C91.7342 -41.8925 89.4319 -45.3031 90.0289 -49.1103C90.4338 -51.2858 94.3719 -59.4647 96.3961 -63.2474C98.3672 -66.9278 101.017 -68.0524 103.573 -68.7313H103.602C103.884 -68.7313 104.162 -68.7313 104.444 -68.7313H104.509C105.704 -68.7313 106.939 -68.6944 107.896 -69.5041L107.928 -69.541C109.376 -71.8924 109.278 -74.3583 109.18 -76.7547C109.106 -77.862 109.114 -78.9732 109.204 -80.0794C109.372 -81.3208 109.619 -82.5501 109.944 -83.7598V-83.8171C110.455 -85.9067 110.942 -87.8819 110.46 -90.0861C109.494 -94.4904 106.779 -95.6027 102.984 -97.1403L102.547 -97.3244C101.986 -97.5534 101.414 -97.7906 100.817 -98.0523C99.6595 -98.5675 98.4572 -99.0828 97.2385 -99.6103L96.8296 -99.7862C91.3416 -102.134 85.6655 -104.563 81.6988 -107.666C78.3823 -110.276 79.2738 -112.737 80.1326 -115.117C80.7051 -116.704 81.2939 -118.34 80.8359 -120.156C79.7441 -124.417 68.9031 -133.925 63.7831 -135.119C61.9797 -135.528 59.2848 -135.483 56.688 -135.434H56.5285C54.2221 -135.393 52.0302 -135.356 50.4966 -135.609L50.4476 -135.307C52.0261 -135.049 54.2139 -135.09 56.5326 -135.127H56.6962C59.2766 -135.176 61.947 -135.229 63.7136 -134.82C68.7681 -133.642 79.4619 -124.274 80.5415 -120.098C80.975 -118.373 80.3984 -116.778 79.8463 -115.24C78.9834 -112.729 78.0429 -110.173 81.5352 -107.417C85.5224 -104.289 91.2148 -101.851 96.7233 -99.4958L97.1322 -99.32C98.359 -98.7925 99.5531 -98.2772 100.71 -97.766C101.307 -97.5002 101.884 -97.263 102.444 -97.0299L102.882 -96.85C106.562 -95.3451 109.245 -94.2614 110.177 -90.0125C110.644 -87.8778 110.177 -85.9231 109.662 -83.8784V-83.8212C109.334 -82.6007 109.086 -81.3604 108.918 -80.108C108.822 -78.9817 108.813 -77.8497 108.889 -76.722C108.983 -74.391 109.081 -71.9782 107.695 -69.7168C106.828 -68.9971 105.65 -69.0134 104.53 -69.0298H104.469C104.186 -69.0298 103.9 -69.0298 103.589 -69.0298H103.528C100.89 -68.3305 98.1709 -67.165 96.1426 -63.3905C94.1142 -59.616 90.1352 -51.384 89.7835 -49.1553C89.166 -45.2294 91.5052 -41.7698 93.7625 -38.4247C95.3983 -35.9956 96.9482 -33.7014 97.443 -31.2478C97.5593 -30.3936 97.5716 -29.5286 97.4798 -28.6714V-28.561C97.3583 -27.2834 97.3679 -25.9967 97.5084 -24.7211C97.5575 -24.3367 97.6352 -23.8541 97.7211 -23.3389C98.2159 -20.3168 99.042 -15.2623 97.2099 -13.3648L97.0954 -13.2503V-13.099C97.0954 -11.6023 97.214 -10.1178 97.308 -8.8092L97.3326 -8.44524C97.4307 -6.94034 97.5289 -5.39047 97.4962 -3.81196C97.4786 -3.25397 97.4226 -2.69785 97.3285 -2.14757V-2.02896C97.1118 -0.618118 96.9196 0.715005 97.7374 2.42029C98.5553 4.12557 99.7821 5.08658 101.009 6.07622C102.702 7.46661 104.305 8.78342 104.824 11.7441L104.873 12.0549C104.873 12.1735 104.906 12.3003 104.927 12.4312C104.996 12.9137 105.098 13.5844 105.278 14.4759C105.663 16.2834 106.771 17.5634 107.846 18.7984L107.871 18.8311C109.589 20.7899 110.946 22.3398 109.131 25.4682C106.571 27.0467 103.606 26.1797 101.925 24.6953C100.42 23.3744 99.2669 21.0148 100.522 18.3526L100.612 18.1809L100.526 18.005C99.8189 16.6105 99.0501 15.2283 98.2568 13.8134L98.1995 13.7112C96.7887 11.188 95.337 8.58304 94.2655 5.76135L94.1878 5.65093C91.0717 2.62477 85.6492 4.93527 82.7661 7.22943C81.3512 8.3622 79.7073 8.947 78.0919 9.51951C75.8346 10.3129 73.5036 11.1307 72.1255 13.6089L72.0928 13.6743V13.7152C71.9757 14.2807 71.9842 14.8649 72.1177 15.4267C72.2513 15.9885 72.5066 16.5141 72.8657 16.9663C73.8962 18.2668 75.8223 19.0969 78.0142 19.195C78.9649 19.1822 79.9075 19.0194 80.8073 18.7125C81.8017 18.3656 82.8567 18.2264 83.9071 18.3035C87.8043 18.7738 90.6873 20.565 92.4948 23.6198C90.8223 27.6601 87.9965 27.0262 84.4673 26.2288C82.1445 25.7135 79.511 25.1288 76.7547 25.734C73.9984 26.3392 72.2196 27.9177 70.5961 29.3286C68.7231 30.9398 67.1037 32.3302 64.5601 32.1053C62.6422 31.9294 60.5688 30.4164 58.565 28.9483L58.5241 28.9196L58.0334 28.568L57.5018 28.1836C55.3203 26.6593 52.9962 25.35 50.5621 24.2741L50.4353 24.5522C52.8158 25.6231 55.0865 26.9228 57.2155 28.433C57.3955 28.5557 57.5713 28.6825 57.7472 28.8133Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M270.776 44.2307C273.312 39.487 275.557 30.4412 270.776 26.36C269.983 25.677 268.286 25.2108 266.646 24.7569C264.446 24.1394 261.951 23.436 260.442 22.1152C259.064 20.8883 258.398 19.5347 257.768 18.3079C257.459 17.6124 257.08 16.9505 256.635 16.3327C254.182 13.1553 248.232 8.69783 242.641 10.2682C238.421 11.4582 236.409 14.4148 233.865 18.1566L233.816 18.2302C232.998 19.457 232.042 20.872 230.888 22.3483L230.823 22.4301L230.757 22.3196C226.5 14.9587 220.064 3.80281 208.523 7.13567C208.114 7.3565 207.591 7.58142 206.929 7.85132C204.884 8.71827 202.79 9.61794 202.054 11.7894V11.8262V11.8712C202.937 16.0097 204.033 18.0912 206.397 20.1073C207.816 21.3341 209.533 21.743 211.378 22.152C212.834 22.4791 214.49 22.8513 215.913 23.7877C218.076 25.2272 219.696 28.053 220.489 30.2163C220.801 31.1948 220.961 32.2154 220.963 33.2424V33.3651C221.049 34.8005 221.139 36.285 222.035 37.7653C223.298 39.8632 225.871 40.6279 228.361 41.3681H228.41C229.546 41.6767 230.656 42.0775 231.727 42.5663C234.704 44.0753 236.499 46.6271 238.102 48.9049C239.329 50.6592 240.49 52.3154 242.024 53.2355C243.955 54.32 246.14 54.8691 248.354 54.8263C249.905 54.841 251.447 54.585 252.91 54.0698C254.456 53.4809 255.772 52.3768 257.191 51.2072L257.249 51.1622C258.379 50.1489 259.613 49.2567 260.929 48.5C262.26 47.8414 263.648 47.3062 265.076 46.901L265.342 46.8193C267.239 46.2386 269.202 45.6374 270.723 44.2552L270.776 44.2307ZM265.268 46.5412L265.006 46.627C263.56 47.0414 262.156 47.589 260.811 48.2628C259.475 49.0243 258.223 49.9249 257.077 50.9496L257.02 50.9986C255.633 52.1477 254.325 53.2314 252.828 53.7999C249.986 54.8672 245.426 54.9326 242.196 52.982C240.715 52.0946 239.574 50.4629 238.343 48.7127C236.74 46.4308 234.925 43.8422 231.878 42.3005C230.792 41.7987 229.666 41.3883 228.512 41.0736H228.459C226.03 40.3498 223.515 39.6015 222.325 37.6017C221.47 36.1868 221.385 34.7392 221.299 33.3447V33.2302C221.296 32.1721 221.129 31.1209 220.804 30.114C219.986 27.9058 218.35 25.0145 216.113 23.5383C214.641 22.5691 212.956 22.1888 211.443 21.8494C209.668 21.4404 207.988 21.0315 206.626 19.8742C204.328 17.9154 203.256 15.8829 202.393 11.8467C203.097 9.83469 205.121 8.98408 207.08 8.13349C207.746 7.86359 208.262 7.63049 208.671 7.41784C219.953 4.14632 226.312 15.1877 230.528 22.4791L230.819 22.9699L231.162 22.5364C232.324 21.0519 233.268 19.6452 234.103 18.402L234.152 18.3284C236.663 14.6479 238.65 11.724 242.76 10.5585C248.203 9.02908 254.03 13.3965 256.427 16.5127C256.862 17.1208 257.235 17.7716 257.539 18.4551C258.152 19.682 258.848 21.0928 260.275 22.336C261.833 23.706 264.364 24.4175 266.597 25.0432C268.204 25.4889 269.869 25.9469 270.609 26.5849C275.238 30.5434 273.026 39.3888 270.543 44.0548C269.067 45.3839 267.231 45.9482 265.284 46.5412H265.268Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M265.514 47.2686C267.476 46.6675 269.505 46.0418 271.1 44.5696L271.149 44.5205L271.177 44.4837C273.795 39.6051 276.085 30.273 271.096 26.0037C270.278 25.2962 268.74 24.8587 266.969 24.3679L266.793 24.3189C264.634 23.7177 262.193 23.0348 260.766 21.7793C259.453 20.6343 258.795 19.3257 258.206 18.1193C257.881 17.3993 257.483 16.7142 257.02 16.0746C254.493 12.8031 248.326 8.23115 242.539 9.85873C238.147 11.0856 236.082 14.1403 233.465 17.9966C232.61 19.2644 231.829 20.4176 230.901 21.6362C226.881 14.6842 220.191 3.31569 208.409 6.73034H208.376C207.816 7.00024 207.293 7.22925 206.777 7.43781C204.626 8.35384 202.406 9.29849 201.633 11.7194L201.604 11.8053V11.9116C202.508 16.1891 203.649 18.3483 206.103 20.4748C207.62 21.7671 209.481 22.1924 211.28 22.6095C212.777 22.9448 214.326 23.2924 215.664 24.1758C217.729 25.5498 219.287 28.2652 220.056 30.3835C220.357 31.3164 220.511 32.2903 220.514 33.2706V33.3646C220.6 34.8573 220.69 36.4031 221.646 37.9857C223.004 40.2266 225.658 41.02 228.226 41.7888L228.472 41.8624C229.52 42.1522 230.544 42.5241 231.535 42.9747C234.397 44.4306 236.168 46.9374 237.726 49.1579C238.981 50.9572 240.18 52.6543 241.815 53.6276C243.809 54.7567 246.068 55.3314 248.358 55.292C249.974 55.3063 251.58 55.0363 253.102 54.4946C254.701 53.8934 256.047 52.7729 257.47 51.5911L257.629 51.4562C258.724 50.4883 259.917 49.6359 261.187 48.9126C262.533 48.2477 263.938 47.7083 265.383 47.3013L265.514 47.2686ZM261.04 48.6508C259.752 49.3825 258.543 50.2459 257.433 51.2271L257.269 51.3621C255.867 52.5276 254.538 53.6317 252.988 54.2247C250.15 55.292 245.496 55.4842 241.975 53.3782C240.4 52.4417 239.235 50.7691 237.992 48.9862C236.421 46.7493 234.643 44.2056 231.694 42.7171C230.688 42.2595 229.648 41.882 228.582 41.5884L228.337 41.5107C225.822 40.7583 223.225 39.9813 221.929 37.8303C221.013 36.3131 220.927 34.8082 220.841 33.3319V33.2174C220.838 32.2065 220.678 31.2022 220.366 30.2403C219.577 28.0975 217.982 25.3003 215.868 23.8854C214.486 22.9694 212.838 22.5972 211.37 22.2742C209.607 21.8652 207.787 21.4563 206.328 20.2049C203.923 18.1275 202.811 16.0133 201.923 11.8176V11.7767C202.655 9.4866 204.81 8.57057 206.892 7.68726C207.415 7.4787 207.943 7.24561 208.528 6.97571C220.17 3.60604 226.803 15.085 230.762 21.947L230.876 22.1474L231.015 21.9634C232.009 20.6711 232.831 19.4606 233.735 18.1234C236.311 14.3244 238.352 11.3187 242.637 10.1123C248.281 8.52968 254.313 13.0199 256.791 16.2219C257.247 16.8526 257.635 17.5297 257.948 18.242C258.545 19.4402 259.22 20.7979 260.578 21.9838C262.054 23.2883 264.536 23.9794 266.732 24.5929L266.896 24.6378C268.634 25.1326 270.135 25.562 270.912 26.2245C275.762 30.3712 273.5 39.5069 270.912 44.3079L270.883 44.3365C269.345 45.7637 267.44 46.3444 265.419 46.9619L265.28 47.0028C263.819 47.4221 262.4 47.9751 261.04 48.6549V48.6508Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M264.16 54.4338C265.771 53.6995 267.436 53.0911 269.141 52.614C272.556 51.5753 275.504 50.6797 277.295 47.1587C277.897 45.9769 278.064 44.382 278.248 42.6604L278.285 42.3373C278.367 41.638 278.449 40.9183 278.579 40.2149C278.731 39.3398 278.927 38.5015 279.127 37.6549C279.5 36.0928 279.888 34.4816 279.753 33.0912C279.651 31.9707 279.017 30.4535 278.35 28.8505L278.322 28.785C277.88 27.7136 277.422 26.6054 277.075 25.5135C276.854 24.7897 276.666 24.025 276.424 23.0353C275.696 19.9724 275.071 17.3102 271.309 15.8134C269.861 15.2327 268.577 15.3554 267.219 15.4863C265.861 15.6171 264.491 15.7398 262.811 15.245C260.443 14.0182 258.406 12.2761 256.439 10.5831L256.329 10.489C253.16 7.74913 250.166 5.17281 246.13 4.64119C243.717 4.32631 241.595 4.98469 239.346 5.67989C237.166 6.35464 234.917 7.04576 232.312 6.874H232.263C224.121 3.50024 214.85 3.5166 207.681 3.91328L207.612 3.93372C206.328 4.73933 204.165 5.14827 202.075 5.49996H202.014C197.924 6.2565 193.262 7.11528 192.162 10.6731C191.385 13.1635 193.798 15.7235 196.342 18.4429C198.885 21.1624 201.511 23.9595 201.543 27.1288C201.543 28.8627 200.766 30.1795 199.908 31.5944C199.021 32.9646 198.325 34.4491 197.838 36.0069C196.714 39.8632 197.184 47.126 200.496 50.1849C202.856 52.3564 207.526 52.8839 209.922 51.2522C211.076 50.4752 211.558 49.4161 212.147 48.1524C212.693 46.792 213.486 45.5442 214.486 44.472L214.527 44.4434C216.453 43.5069 218.567 44.1816 220.612 44.8523L220.829 44.9218C221.463 45.1222 222.117 45.3308 222.751 45.4698C223.94 45.7297 225.143 45.9195 226.354 46.0382H226.435C228.795 46.2999 231.024 46.5453 233.064 48.1197C234.074 48.8926 234.913 50.2462 235.723 51.5548L235.747 51.5957C236.575 53.0706 237.588 54.4338 238.761 55.6524C241.264 58.0774 248.24 61.9337 251.438 62.3181C251.781 62.3625 252.127 62.3857 252.473 62.3877C255.221 62.3877 256.689 60.8337 258.513 58.9076C259.944 57.4027 261.563 55.6974 264.16 54.4338ZM258.271 58.7195C256.313 60.7887 254.763 62.3999 251.479 62.0155C248.33 61.6352 241.448 57.828 238.978 55.4316C237.824 54.2308 236.828 52.8882 236.013 51.4362L235.984 51.3954C235.166 50.0622 234.308 48.6841 233.257 47.8744C231.146 46.2386 228.877 46.0014 226.472 45.7315H226.39C225.192 45.6159 224.001 45.4288 222.825 45.1713C222.199 45.0363 221.553 44.8278 220.927 44.6274L220.706 44.5579C219.365 44.1285 217.995 43.6909 216.645 43.6909C215.862 43.6822 215.086 43.8543 214.38 44.1939L214.294 44.2552C213.249 45.3642 212.417 46.6562 211.84 48.0666C211.292 49.2525 210.822 50.2749 209.738 51.0069C207.444 52.569 202.962 52.0537 200.693 49.9681C197.466 46.987 197.012 39.8796 198.12 36.101C198.6 34.5615 199.288 33.0949 200.165 31.7417C201.032 30.3104 201.85 28.9568 201.83 27.1329C201.793 23.8614 199.122 20.9988 196.513 18.2426C194.035 15.5967 191.696 13.0981 192.424 10.7794C193.467 7.39744 198.018 6.55912 202.038 5.81894H202.095C204.197 5.44681 206.373 5.0583 207.722 4.26087C214.85 3.85193 224.06 3.85194 232.157 7.20934L232.255 7.22978C234.933 7.40971 237.215 6.70633 239.419 6.02749C241.624 5.34865 243.725 4.69435 246.073 4.99697C250.019 5.50814 252.976 8.06402 256.112 10.7712L256.223 10.8693C258.202 12.5746 260.255 14.3372 262.68 15.5803C264.442 16.1038 265.861 15.9893 267.231 15.8421C268.601 15.6948 269.8 15.5967 271.178 16.1488C274.793 17.6005 275.402 20.1768 276.109 23.1621C276.338 24.1517 276.543 24.9246 276.764 25.6607C277.115 26.7485 277.582 27.8608 278.023 28.9322L278.048 28.9977C278.71 30.5762 279.332 32.0729 279.43 33.1484C279.561 34.4897 279.181 36.0764 278.813 37.61C278.608 38.4647 278.404 39.3071 278.26 40.1904C278.13 40.9019 278.048 41.6298 277.966 42.3332L277.925 42.6686C277.749 44.3289 277.578 45.8951 277.005 47.0279C275.271 50.4343 272.384 51.3095 269.035 52.3441C267.311 52.8268 265.627 53.4407 263.997 54.1802C261.371 55.448 259.735 57.1737 258.271 58.7195Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M277.729 47.3552C278.354 46.1284 278.547 44.4926 278.718 42.8037L278.739 42.6237C278.829 41.859 278.919 41.0698 279.05 40.3255C279.205 39.4299 279.405 38.5752 279.594 37.786C279.978 36.1829 280.371 34.5144 280.231 33.0627C280.121 31.8972 279.495 30.3882 278.833 28.7934L278.792 28.6993C278.346 27.632 277.884 26.4992 277.532 25.4278C277.291 24.6467 277.124 23.882 276.895 22.9741C276.167 19.9194 275.484 17.0363 271.497 15.4333C269.934 14.8117 268.544 14.9507 267.182 15.0816C265.886 15.2002 264.549 15.3229 262.995 14.873C260.684 13.6707 258.639 11.9082 256.652 10.1947C253.421 7.40986 250.371 4.78037 246.204 4.23648C243.721 3.9175 241.558 4.57999 239.252 5.29155L239.157 5.32426C237.06 5.9663 234.892 6.62879 232.418 6.4693C224.215 3.09145 214.862 3.10781 207.612 3.50039L207.452 3.55764C206.246 4.31009 204.099 4.69449 202.018 5.06663C197.765 5.83952 192.947 6.70239 191.749 10.5546C191.635 10.9185 191.577 11.2978 191.577 11.6792C191.577 14.0347 193.728 16.3248 196.002 18.7457L196.035 18.7825C198.517 21.4243 201.081 24.1519 201.114 27.1494C201.114 28.7443 200.406 29.9507 199.564 31.3492C198.647 32.7595 197.926 34.288 197.421 35.8926C196.272 39.8675 196.779 47.3633 200.214 50.5326C202.75 52.8718 207.608 53.3952 210.209 51.6409C211.435 50.7944 212 49.633 212.576 48.4021L212.597 48.3611C213.115 47.0652 213.868 45.8758 214.817 44.8525C216.559 44.0346 218.473 44.6398 220.506 45.3023L220.956 45.4372C221.52 45.6131 222.101 45.7889 222.677 45.9198C223.882 46.1853 225.101 46.3764 226.329 46.4923H226.411C228.799 46.754 230.864 46.9789 232.823 48.4757C233.735 49.1831 234.516 50.4427 235.358 51.7963L235.428 51.9107C236.274 53.3921 237.297 54.7653 238.475 56.0002C241.026 58.4538 248.146 62.3919 251.405 62.7845C251.762 62.8287 252.121 62.8519 252.481 62.854C255.433 62.854 257.032 61.1733 258.852 59.2594L258.75 59.1449L258.631 59.0509C256.656 61.1242 254.951 62.9113 251.446 62.4819C248.232 62.0934 241.223 58.2125 238.687 55.7793C237.53 54.5648 236.524 53.2151 235.69 51.7594L235.608 51.6286C234.765 50.2709 233.972 48.9868 233.007 48.2467C230.983 46.6927 228.779 46.4555 226.464 46.202H226.378C225.162 46.0834 223.953 45.8936 222.759 45.6335C222.195 45.5068 221.618 45.3268 221.062 45.1592L220.612 45.0201C219.308 44.6112 217.97 44.1613 216.686 44.1613C215.992 44.1501 215.304 44.3013 214.678 44.603L214.633 44.6316C213.647 45.6819 212.868 46.9082 212.335 48.2467L212.315 48.2835C211.754 49.4735 211.227 50.6021 210.053 51.3996C207.555 53.1008 202.88 52.5733 200.439 50.32C197.09 47.2284 196.603 39.892 197.732 36.0071C198.23 34.4281 198.942 32.9243 199.846 31.5374C200.709 30.0979 201.457 28.8547 201.437 27.1739C201.4 24.0578 198.795 21.2852 196.276 18.5862L196.243 18.5494C194.01 16.1735 191.9 13.9284 191.9 11.6915C191.9 11.3421 191.952 10.9947 192.056 10.6609C193.201 7.00092 197.924 6.13806 202.087 5.38152C204.197 5.0012 206.377 4.61271 207.62 3.83572H207.661C214.871 3.42678 224.19 3.42678 232.345 6.78827H232.39C234.925 6.96003 237.129 6.28527 239.264 5.63097L239.386 5.59416C241.644 4.89896 243.774 4.24875 246.191 4.55545C250.281 5.09116 253.286 7.69203 256.492 10.4524C258.48 12.1699 260.537 13.9447 262.913 15.1756C264.549 15.65 265.914 15.5273 267.26 15.4006C268.605 15.2738 269.918 15.1429 271.411 15.7359C275.251 17.2776 275.909 20.087 276.625 23.06C276.833 23.976 277.034 24.7448 277.271 25.5136C277.622 26.6137 278.089 27.7506 278.538 28.8261L278.575 28.9201C279.23 30.4945 279.847 31.9831 279.953 33.0995C280.092 34.5103 279.7 36.142 279.328 37.7205C279.131 38.5384 278.919 39.3563 278.776 40.2805C278.645 41.037 278.551 41.8304 278.461 42.5951L278.44 42.7791C278.26 44.4558 278.085 46.0507 277.483 47.2284C275.655 50.823 272.682 51.7267 269.243 52.7654C267.528 53.2367 265.853 53.8424 264.234 54.577C261.678 55.8039 260.079 57.4969 258.668 58.9854L258.627 59.0263L258.738 59.1326L258.848 59.239L258.889 59.1981C260.283 57.7259 261.862 56.0574 264.369 54.851C265.964 54.1246 267.613 53.5217 269.301 53.0476C272.797 51.9885 275.827 51.0724 277.729 47.3552Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M134.89 -1.44795V-1.08808C134.89 0.298229 134.918 1.72952 135.033 3.09129C135.082 3.69244 135.119 4.29358 135.156 4.89472L135.201 5.61446C135.421 8.83691 135.65 12.1575 136.464 15.1223C136.782 16.1968 137.157 17.2534 137.589 18.2875C138.081 19.4403 138.505 20.6216 138.856 21.8249C139.102 22.7082 139.265 23.5956 139.413 24.4543L139.449 24.6629C139.748 26.2986 140.026 27.824 140.832 28.9118C142.721 31.4595 147.837 33.4101 151.681 33.4101C152.552 33.4289 153.419 33.2975 154.245 33.0216C156.339 32.2528 157.676 31.1323 158.334 29.607C159.712 26.4213 157.872 22.0866 156.249 18.2671L156.196 18.1403C155.787 17.1916 155.423 16.3001 155.096 15.4495C153.325 10.6853 151.824 6.04385 153.051 1.934C153.467 0.749163 154.045 -0.37243 154.768 -1.39888L154.867 -1.55428C155.398 -2.3425 155.881 -3.16185 156.314 -4.00792C156.632 -4.71928 156.906 -5.45 157.132 -6.19574C157.368 -7.02444 157.698 -7.8231 158.118 -8.57578C160.162 -11.8228 164.354 -15.8835 168.341 -18.4476C170.656 -19.9321 173.068 -20.8317 175.632 -21.7845C179.113 -23.0768 182.707 -24.41 186.236 -27.4198C188.232 -29.1291 190.326 -31.1002 192.518 -33.2144L193.217 -33.8769C194.955 -35.5577 197.233 -37.7373 199.449 -39.7166C200.566 -40.6747 201.733 -41.573 202.946 -42.4074L203.216 -42.5955C206.299 -44.7588 208.965 -46.6318 209.542 -50.21V-50.255C209.006 -53.9886 204.904 -55.7102 200.921 -57.3787C199.263 -58.031 197.653 -58.8004 196.104 -59.6811C195.147 -60.2658 194.26 -60.9324 193.397 -61.5785L193.278 -61.6644C190.661 -63.6355 188.191 -65.4962 184.363 -64.7437C180.438 -64.666 179.583 -61.1123 178.679 -57.3542L178.659 -57.2683C178.188 -55.3381 177.706 -53.3425 176.737 -51.9521C175.767 -50.5617 173.805 -49.3799 171.895 -48.2348L171.748 -48.1449C169.752 -46.918 167.49 -45.5399 165.834 -43.7038C164.715 -42.3744 163.74 -40.9295 162.927 -39.3935L162.763 -39.1114C162.088 -37.8314 161.284 -36.6242 160.363 -35.5086C159.719 -34.8514 159.023 -34.2482 158.281 -33.7052C157.054 -32.7442 155.529 -31.5501 154.458 -30.0247C153.3 -28.3889 152.507 -26.4751 151.738 -24.6267C150.691 -22.0872 149.693 -19.6867 147.984 -18.6848C145.833 -17.4252 142.517 -17.3803 138.116 -18.5539C137.242 -18.8112 136.394 -19.1479 135.581 -19.5599L135.45 -19.6213C133.634 -20.4596 131.921 -21.257 129.987 -20.7009L129.921 -20.6804L129.888 -20.6191C128.514 -17.6788 129.995 -15.7118 131.561 -13.6057L131.614 -13.5403C132.543 -12.3845 133.316 -11.1113 133.912 -9.75353C134.824 -7.47982 134.857 -4.54772 134.89 -1.44795ZM131.843 -13.7816C130.277 -15.8713 128.923 -17.6829 130.171 -20.4146C131.97 -20.8972 133.614 -20.1365 135.38 -19.3186L135.483 -19.2737C136.312 -18.8541 137.179 -18.5118 138.071 -18.2513C142.549 -17.0531 145.948 -17.1104 148.172 -18.4108C149.976 -19.4659 150.986 -21.9154 152.057 -24.504C152.818 -26.3361 153.603 -28.2294 154.74 -29.8407C155.783 -31.3129 157.292 -32.4906 158.502 -33.4393C159.259 -33.9931 159.969 -34.6086 160.624 -35.2796C161.567 -36.408 162.39 -37.6319 163.078 -38.9314L163.242 -39.2177C164.042 -40.7341 165.002 -42.1611 166.104 -43.4747C167.74 -45.2782 169.973 -46.6481 171.948 -47.8586L172.095 -47.9486C174.029 -49.1099 176.033 -50.3122 177.031 -51.7558C178.029 -53.1994 178.524 -55.2154 178.998 -57.1702L179.019 -57.256C179.894 -60.8997 180.72 -64.3389 184.408 -64.4125H184.47C188.15 -65.1404 190.575 -63.3206 193.152 -61.3782L193.254 -61.3046C194.121 -60.6543 195.016 -59.9837 195.985 -59.3907C197.548 -58.5006 199.173 -57.7243 200.848 -57.0679C204.729 -55.4322 208.736 -53.7555 209.264 -50.21C208.704 -46.7749 206.09 -44.9428 203.064 -42.8204L202.798 -42.6323C201.575 -41.7927 200.399 -40.8876 199.273 -39.9211C197.053 -37.9377 194.775 -35.754 193.033 -34.0732L192.338 -33.4107C190.134 -31.3129 188.056 -29.3213 186.065 -27.6283C182.58 -24.6553 179.006 -23.3303 175.543 -22.0422C172.97 -21.0853 170.545 -20.1856 168.202 -18.6807C164.178 -16.0962 159.933 -11.9945 157.884 -8.71073C157.448 -7.93667 157.106 -7.11287 156.866 -6.25709C156.641 -5.52299 156.368 -4.80444 156.048 -4.10606C155.622 -3.27386 155.145 -2.46815 154.621 -1.69332L154.519 -1.53382C153.782 -0.482639 153.193 0.664979 152.769 1.87674C151.542 6.097 153.034 10.7712 154.813 15.5885C155.14 16.4391 155.517 17.3388 155.917 18.2875L155.971 18.4143C157.57 22.1806 159.381 26.45 158.056 29.5129C157.426 30.9606 156.146 32.0238 154.134 32.7845C150.577 34.0808 143.375 31.8643 141.073 28.7605C140.312 27.7299 140.038 26.2291 139.748 24.6384L139.711 24.4339C139.556 23.5669 139.396 22.6754 139.147 21.7799C138.797 20.5629 138.371 19.3692 137.871 18.2057C137.443 17.1837 137.07 16.1394 136.755 15.0773C135.937 12.1534 135.724 8.83282 135.503 5.62263L135.458 4.90699C135.421 4.30585 135.385 3.70062 135.336 3.09539C135.221 1.74588 135.205 0.322769 135.192 -1.05945V-1.41932C135.16 -4.54771 135.127 -7.50435 134.227 -9.82304C133.624 -11.2075 132.837 -12.5045 131.888 -13.6794L131.843 -13.7816Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M140.734 10.8441C141.552 12.4142 142.223 14.057 142.738 15.7514C143.095 17.1912 143.339 18.6571 143.465 20.1352C143.744 22.5071 144.005 24.744 145.032 26.0158C145.524 26.667 146.155 27.1999 146.88 27.5756C147.604 27.9513 148.404 28.1603 149.219 28.1873C149.835 28.1875 150.443 28.0593 151.006 27.811C152.789 27.03 154.507 24.834 153.983 21.0185C153.791 19.6854 152.879 17.9515 151.722 15.7555L151.657 15.6328C150.507 13.5265 149.49 11.3508 148.61 9.11837C148.176 7.95698 147.833 6.69744 147.518 5.49925C146.774 2.70209 146.074 0.0562501 144.181 -0.941565C143.093 -1.51408 141.756 -1.5018 140.092 -0.904749L139.973 -0.863865L139.904 -0.749362C139.015 0.603724 138.532 2.18327 138.513 3.80215C138.513 6.20263 139.572 8.40682 140.693 10.7541L140.734 10.8441ZM140.153 -0.60623V-0.630766C141.74 -1.19919 143.016 -1.21555 144.005 -0.68393C145.78 0.248454 146.459 2.82887 147.191 5.56877C147.496 6.79976 147.863 8.01451 148.291 9.20834C149.179 11.4606 150.206 13.6555 151.366 15.78L151.428 15.9027C152.573 18.0701 153.472 19.7835 153.66 21.0676C154.159 24.7113 152.544 26.7928 150.863 27.5371C148.974 28.3549 146.774 27.6884 145.248 25.8277C144.279 24.6254 144.022 22.4294 143.752 20.1025C143.54 16.8087 142.596 13.6036 140.987 10.7214L140.938 10.6151C139.83 8.31276 138.787 6.1372 138.787 3.80624C138.808 2.24534 139.278 0.723513 140.141 -0.577602L140.153 -0.60623Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M142.369 65.6715L142.275 65.422C142.025 64.7473 141.764 64.048 141.437 63.3242C140.678 61.6612 139.791 60.0601 138.783 58.5355L138.734 58.4578C137.769 57.0411 136.958 55.5264 136.313 53.939C135.847 52.4811 135.572 50.9691 135.495 49.4406L135.47 49.1994C135.398 48.2709 135.261 47.3485 135.061 46.439C134.904 45.8315 134.698 45.2379 134.444 44.6642C133.969 43.511 133.52 42.4191 133.982 41.1473L134.002 41.1105C135.527 38.8777 138.214 40.1454 141.06 41.4867L141.183 41.544C142.203 42.047 143.252 42.4894 144.324 42.869C145.943 43.3723 147.607 43.7214 149.292 43.9118C152.224 44.3411 154.76 44.7296 156.567 47.3469C157.012 48.0554 157.302 48.8497 157.418 49.6778V49.7269C157.655 50.876 157.88 51.9638 159.324 52.7326C160.702 53.0802 162.027 52.5322 163.556 51.9147C164.324 51.5749 165.112 51.2826 165.916 51.0396C166.807 50.8191 167.711 50.6525 168.623 50.5407L168.787 50.5162C170.238 50.3117 171.735 50.1072 172.917 49.4652C177.338 47.0811 179.754 40.3131 177.894 35.5367C177.337 34.1422 176.307 33.173 175.215 32.1507L175.072 32.0157C174.515 31.5062 173.993 30.9597 173.51 30.3799C172.726 29.3386 172.012 28.2456 171.375 27.1084L171.195 26.8058C170.338 25.2628 169.361 23.7901 168.271 22.4015C167.464 21.4519 166.599 20.5519 165.683 19.7066L165.601 19.6289C162.632 16.7663 159.565 13.8506 160.473 7.89639C160.943 4.80071 163.568 -2.89964 165.135 -5.18971C167.498 -8.6657 171.788 -10.9517 176.753 -13.6016L176.875 -13.667C179.026 -14.8162 181.251 -16.0021 183.504 -17.3925C187.467 -19.8093 190.489 -23.1177 193.409 -26.3074L193.462 -26.3646C197.584 -30.863 201.473 -35.1323 207.681 -36.9971C214.04 -38.915 215.622 -36.6577 218.775 -32.1552L219.413 -31.2597C219.634 -30.9489 219.863 -30.6299 220.1 -30.2905C221.137 -28.9639 222.267 -27.7134 223.482 -26.5487L223.687 -26.3401C224.366 -25.6572 225.004 -25.011 225.552 -24.369C226.1 -23.727 226.648 -23.0318 227.187 -22.3243C228.525 -20.5291 229.58 -19.11 232.025 -18.1981C239.21 -15.5114 247.503 -21.2161 250.117 -28.1149C250.755 -29.7916 250.571 -31.4191 250.382 -33.1408C250.258 -34.134 250.19 -35.1334 250.178 -36.1342C250.178 -36.6045 250.178 -37.1034 250.178 -37.5941V-37.6759C250.178 -41.3809 250.178 -45.9897 250.808 -49.3675C251.348 -52.1279 252.403 -54.2748 253.421 -56.3645L253.49 -56.5117C254.319 -58.1283 255.023 -59.8057 255.596 -61.5294V-61.5785V-61.6276C253.818 -66.6698 249.798 -66.1259 245.541 -65.5411H245.471C242.829 -65.1894 240.098 -64.8255 238.069 -66.0278C236.658 -66.8456 235.501 -68.5591 234.27 -70.3666C231.882 -73.8876 229.412 -77.5272 224.517 -76.0918C221.953 -75.2412 217.07 -72.9021 213.643 -70.6038C212.619 -69.8487 211.661 -69.0073 210.781 -68.0888C208.425 -65.7783 205.759 -63.1611 201.759 -64.3102C200.062 -64.7887 198.639 -66.0196 197.261 -67.2096C196.246 -68.1681 195.112 -68.9927 193.887 -69.6633C189.961 -71.5648 182.846 -72.4318 177.992 -71.5894C177.482 -71.479 176.985 -71.3188 176.507 -71.1109L176.438 -71.0864C175.95 -70.867 175.442 -70.6944 174.921 -70.5711C173.704 -70.3617 172.474 -70.2374 171.24 -70.199H171.101C169.617 -70.1131 168.21 -70.0354 166.938 -69.5569C165.452 -68.9351 164.039 -68.1536 162.722 -67.226C161.986 -66.7434 161.127 -66.1873 160.268 -65.7006C159.692 -65.3776 159.062 -65.1036 158.457 -64.8378L158.404 -64.8173C156.903 -64.1712 155.353 -63.5005 154.281 -62.0774L154.249 -62.0406V-61.9874C154.191 -58.9981 155.32 -56.5158 156.412 -54.1113L156.477 -53.964C157.847 -50.9747 159.14 -48.1448 158.142 -44.6606C157.283 -41.5854 154.461 -39.3444 151.734 -37.2097L151.325 -36.8826C150.339 -36.0933 149.415 -35.3532 148.614 -34.568C147.944 -33.8932 147.309 -33.1848 146.712 -32.4456C145.485 -30.957 144.307 -29.5462 142.815 -28.941C137.723 -26.8758 129.152 -31.2147 125.987 -34.1181C124.899 -35.1758 123.877 -36.2998 122.928 -37.4837L122.863 -37.5614C120.589 -40.2686 118.233 -43.078 115.8 -42.9799C114.537 -42.9349 113.346 -42.1211 112.177 -40.4976C111.748 -39.9087 111.134 -36.5023 111.478 -34.5271C111.972 -31.6236 113.911 -29.1045 115.976 -26.4342L116.058 -26.3278C117.739 -24.1277 119.481 -21.8295 120.352 -19.3063C121.415 -16.2556 121.194 -12.9923 120.994 -10.0766V-9.99476C120.851 -7.81919 120.712 -5.76631 121.165 -4.151C121.75 -2.10629 123.153 -0.356035 124.4 1.21021C125.304 2.35933 126.159 3.44302 126.617 4.48173C127.249 5.93749 127.652 7.48258 127.811 9.06187C127.882 10.3587 127.832 11.6594 127.659 12.9468L127.639 13.1349C127.455 14.8279 127.23 16.7458 127.639 18.5084C127.992 19.8716 128.47 21.1995 129.066 22.4751C129.606 23.7019 130.023 24.6875 130.072 25.4645C130.207 27.5092 128.436 35.3322 127.21 37.3565C126.445 38.5833 125.218 39.4012 124.016 40.219C123.21 40.719 122.458 41.2999 121.771 41.9529C120.776 43.0488 119.914 44.258 119.203 45.5557C117.612 48.1688 115.972 50.8719 112.578 51.2155H112.549L112.508 51.1786C110.418 49.3916 106.922 46.3981 104.223 46.8561C103.201 47.0238 102.387 47.674 101.733 48.7741C101.025 49.9763 100.825 51.0273 101.119 51.9924C101.7 53.8735 104.104 55.0104 106.239 56.0246C107.466 56.6094 108.631 57.1655 109.265 57.7871C110.84 59.382 111.105 61.9011 111.339 64.1216V64.2647C111.397 65.1134 111.517 65.9567 111.698 66.7879C111.897 67.486 112.144 68.1692 112.439 68.8326C112.734 69.4724 112.967 70.1394 113.134 70.8241L113.432 70.7628C113.265 70.0589 113.027 69.3738 112.721 68.7181C112.432 68.0706 112.189 67.4037 111.993 66.7225C111.82 65.8957 111.702 65.0582 111.641 64.2157V64.1011C111.4 61.8315 111.13 59.2552 109.478 57.5826C108.807 56.9201 107.621 56.3558 106.354 55.7547C104.288 54.7732 101.949 53.665 101.405 51.9147C101.14 51.0355 101.332 50.0663 101.99 48.9417C102.6 47.903 103.344 47.306 104.268 47.171C106.824 46.7375 110.255 49.6696 112.312 51.4322L112.439 51.5426H112.598C116.148 51.1827 117.833 48.4142 119.468 45.7234C120.165 44.4511 121.009 43.2652 121.983 42.1901C122.662 41.5461 123.405 40.9733 124.2 40.4808C125.427 39.6629 126.653 38.8164 127.471 37.5323C128.723 35.4876 130.534 27.5419 130.399 25.4604C130.346 24.6425 129.921 23.612 129.369 22.3647C128.78 21.1061 128.307 19.7961 127.958 18.4511C127.549 16.7377 127.77 14.8484 127.958 13.1799V12.9877C128.134 11.6815 128.186 10.3615 128.113 9.04551C127.948 7.43482 127.534 5.85946 126.887 4.3754C126.412 3.28353 125.545 2.18349 124.617 1.00574C123.39 -0.5237 122.016 -2.26579 121.448 -4.23688C121.01 -5.79903 121.145 -7.82738 121.288 -9.96205V-10.0806C121.484 -12.9882 121.697 -16.2843 120.626 -19.3922C119.738 -21.9849 117.98 -24.2995 116.283 -26.5037L116.205 -26.61C114.16 -29.2477 112.263 -31.7381 111.78 -34.568C111.457 -36.4368 112.03 -39.7615 112.426 -40.2932C113.539 -41.8349 114.647 -42.6037 115.812 -42.6487C118.094 -42.7223 120.401 -39.9905 122.646 -37.3324L122.691 -37.2793C123.65 -36.0853 124.682 -34.9504 125.778 -33.881C128.997 -30.9325 137.723 -26.5405 142.929 -28.6506C144.491 -29.2845 145.686 -30.7199 146.949 -32.2411C147.513 -32.9159 148.151 -33.6806 148.826 -34.339C149.684 -35.1485 150.582 -35.9142 151.517 -36.6331L151.926 -36.9603C154.69 -39.144 157.553 -41.3973 158.44 -44.5707C159.467 -48.1612 158.15 -51.0401 156.756 -54.0826L156.69 -54.2298C155.619 -56.5894 154.51 -59.0267 154.555 -61.9261C155.582 -63.2552 157.079 -63.9013 158.53 -64.5311H158.579C159.189 -64.8021 159.784 -65.1038 160.362 -65.4348C161.25 -65.9255 162.113 -66.4817 162.853 -66.9683C164.149 -67.8844 165.539 -68.659 166.999 -69.2788C168.226 -69.741 169.613 -69.8186 171.089 -69.9004H171.228C172.483 -69.9377 173.733 -70.0648 174.97 -70.2808C175.509 -70.4047 176.035 -70.5814 176.54 -70.8083L176.61 -70.8369C177.069 -71.0338 177.545 -71.1871 178.033 -71.2949C182.817 -72.1128 189.867 -71.2745 193.74 -69.3934C194.941 -68.7358 196.052 -67.9277 197.048 -66.9888C198.451 -65.762 199.911 -64.5351 201.661 -64.0281C205.832 -62.8299 208.568 -65.5166 210.981 -67.8844C211.854 -68.7893 212.802 -69.6183 213.815 -70.3625C217.192 -72.5781 220.807 -74.4092 224.591 -75.8219C229.269 -77.1878 231.673 -73.6382 233.996 -70.2031C235.223 -68.371 236.413 -66.6412 237.885 -65.7783C240.008 -64.5229 242.793 -64.895 245.479 -65.2549H245.553C249.671 -65.8192 253.56 -66.3508 255.261 -61.5949C254.695 -59.9003 254.004 -58.2504 253.192 -56.659L253.122 -56.5158C252.096 -54.4139 251.037 -52.2465 250.489 -49.4411C249.83 -46.0347 249.843 -41.4096 249.851 -37.6923V-37.6105C249.851 -37.1157 249.851 -36.6209 249.851 -36.1506C249.864 -35.1389 249.933 -34.1287 250.055 -33.1244C250.243 -31.4396 250.419 -29.8529 249.81 -28.2376C247.246 -21.4778 239.132 -15.8753 232.111 -18.5007C229.751 -19.3799 228.721 -20.7663 227.412 -22.5247C226.881 -23.2444 226.386 -23.8946 225.776 -24.5939C225.167 -25.2932 224.578 -25.8944 223.899 -26.5814L223.67 -26.8104C222.474 -27.9559 221.362 -29.1859 220.342 -30.4908L219.659 -31.46L219.021 -32.3556C215.786 -36.9807 214.163 -39.3076 207.57 -37.312C201.285 -35.4227 197.347 -31.1329 193.213 -26.5896L193.163 -26.5323C190.256 -23.3548 187.25 -20.071 183.324 -17.6747C181.075 -16.2883 178.855 -15.1024 176.708 -13.9574L176.589 -13.892C171.588 -11.2257 167.269 -8.91925 164.861 -5.386C163.274 -3.05913 160.62 4.71482 160.15 7.83913C159.217 13.9487 162.342 16.9421 165.368 19.8374L165.45 19.9151C166.357 20.7533 167.213 21.645 168.014 22.5855C169.093 23.9612 170.061 25.4202 170.909 26.9489L171.093 27.2556C171.736 28.4067 172.457 29.5121 173.252 30.564C173.744 31.1504 174.274 31.7036 174.839 32.2202L174.982 32.3592C176.049 33.357 177.055 34.3017 177.587 35.6307C179.399 40.2763 177.047 46.8561 172.749 49.1748C171.621 49.7841 170.148 49.9927 168.725 50.1931L168.558 50.2135C167.635 50.3287 166.72 50.4994 165.818 50.7247C165.002 50.9717 164.201 51.268 163.421 51.6121C161.941 52.2255 160.665 52.7571 159.418 52.43C158.134 51.7389 157.946 50.8147 157.7 49.6369V49.596C157.581 48.7233 157.276 47.8865 156.805 47.1424C154.919 44.3943 152.306 44.014 149.288 43.5724C147.636 43.394 146.004 43.0613 144.414 42.5786C143.353 42.2016 142.315 41.7633 141.306 41.2659L141.179 41.2087C138.214 39.8101 135.413 38.4851 133.74 40.9429L133.699 41.0124C133.184 42.4273 133.654 43.5682 134.153 44.7828C134.401 45.342 134.602 45.9206 134.755 46.5126C134.953 47.4073 135.09 48.3145 135.163 49.228L135.184 49.4734C135.274 51.0261 135.561 52.561 136.039 54.0412C136.695 55.6476 137.518 57.1813 138.492 58.6173L138.545 58.695C139.532 60.2081 140.401 61.7954 141.142 63.4428C141.469 64.1584 141.727 64.8536 141.96 65.5243L142.054 65.7737C142.815 67.8184 143.473 69.585 145.072 70.7096C145.195 70.7955 145.326 70.8691 145.456 70.9427L145.608 70.6769C145.485 70.6074 145.362 70.5379 145.252 70.4602C143.759 69.3888 143.117 67.6671 142.369 65.6715Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M131.005 15.6539C131.238 17.2897 131.88 18.7087 132.641 20.2709V20.3077C133.146 21.2635 133.556 22.266 133.868 23.3011C134.179 24.5279 134.093 26.0369 134.023 27.2842C133.917 29.2798 133.819 31.1609 134.776 32.5636C136.563 35.1604 145.817 37.9494 150.238 39.2907L150.647 39.4093C152.201 39.8714 153.8 40.2271 155.174 40.5134L155.345 40.5543C157.662 41.0134 159.939 41.6561 162.154 42.4763C162.616 42.644 163.168 42.8853 163.757 43.1674C165.679 44.0466 168.084 45.1467 170.268 45.1467C171.282 45.1734 172.278 44.8738 173.11 44.292C174.414 43.3637 176.169 39.9573 175.122 37.1765C174.606 35.8188 173.281 34.6942 171.997 33.6064L171.756 33.402C171.022 32.8305 170.353 32.1805 169.76 31.4636C169.156 30.5465 168.657 29.5643 168.272 28.5355C167.779 27.2385 167.137 26.0033 166.358 24.8551C165.455 23.6929 164.458 22.6069 163.377 21.6081L163.295 21.5263C162.263 20.5936 161.334 19.5515 160.527 18.4184C157.828 14.329 156.793 10.8489 157.255 7.50783C157.464 6.01928 158.261 4.34264 159.046 2.69869C159.484 1.76631 159.946 0.780764 160.306 -0.163889C160.58 -0.899982 160.813 -1.65652 161.042 -2.38853L161.148 -2.74022C161.696 -4.5232 162.211 -6.21212 163.213 -7.68431C164.849 -10.0725 168.914 -13.7407 171.331 -15.2988C172.774 -16.223 174.635 -16.9754 176.602 -17.777L176.79 -17.8506C179.072 -18.7707 181.661 -19.8094 184.012 -21.302C187.913 -23.7884 191.328 -27.199 194.645 -30.4991C198.059 -33.9178 201.286 -37.1444 204.843 -39.1768C205.882 -39.7377 206.957 -40.2282 208.062 -40.6449H208.103C210.221 -41.4955 212.413 -42.3747 213.926 -43.9164C215.108 -45.1105 215.721 -46.5541 216.265 -47.83C216.605 -48.7337 217.036 -49.6009 217.549 -50.4186C218.09 -51.1575 218.691 -51.8509 219.345 -52.4919C220.804 -54.0009 222.313 -55.5631 222.784 -58.3193L222.816 -58.397L222.788 -58.4747C222.052 -62.0979 220.334 -63.1939 219.107 -63.7051C216.621 -64.7519 214.045 -63.3207 211.558 -61.9384L211.481 -61.918C209.767 -60.9692 208.148 -60.0696 206.635 -59.9551C202.697 -59.677 199.429 -61.918 195.953 -64.2939C191.819 -67.1238 187.541 -70.0436 182.07 -68.3833C180.385 -68.2279 178.925 -67.3651 177.379 -66.449L177.285 -66.3959C176.199 -65.7071 175.047 -65.1276 173.846 -64.6661C172.767 -64.3175 171.666 -64.0442 170.55 -63.8482L170.214 -63.7787C167.123 -63.1653 164.448 -62.6377 162.853 -58.8387C162.036 -56.9126 162.445 -54.9742 162.853 -53.1135L162.894 -52.9172C163.198 -51.7886 163.336 -50.6218 163.303 -49.4535C163.115 -46.9998 160.85 -42.5792 158.952 -40.1337C158.061 -38.9969 156.756 -37.9132 155.374 -36.7722L155.214 -36.6373C153.726 -35.435 151.878 -33.9342 150.516 -32.1717C149.96 -31.4082 149.463 -30.6029 149.031 -29.763L148.892 -29.5176C148.033 -27.9309 147.146 -26.2911 145.968 -25.4855C144.177 -24.2587 141.744 -23.9274 138.734 -24.5081C136.256 -24.9907 133.463 -26.1889 130.997 -27.2439C127.317 -28.8061 123.522 -30.4255 120.074 -30.3723H119.665L119.718 -29.9634C119.972 -27.657 120.868 -25.5918 121.73 -23.5962C122.168 -22.5902 122.618 -21.5515 122.994 -20.4719C123.587 -18.5932 124.071 -16.6816 124.442 -14.7467L124.462 -14.6322C124.844 -12.629 125.349 -10.6514 125.975 -8.71075C126.525 -7.28202 127.217 -5.91203 128.04 -4.62135C128.826 -3.38893 129.496 -2.08714 130.044 -0.732322C130.904 1.80938 131.377 4.46579 131.447 7.14797C131.457 8.36441 131.374 9.57985 131.197 10.7834C130.923 12.3918 130.858 14.029 131.005 15.6539V15.6539ZM131.455 10.8898C131.632 9.67113 131.716 8.4407 131.704 7.20931C131.634 4.49474 131.154 1.80636 130.281 -0.765032C129.721 -2.13855 129.037 -3.45809 128.237 -4.70722C127.422 -5.97529 126.737 -7.32202 126.192 -8.7271C125.569 -10.6566 125.068 -12.6234 124.691 -14.6158L124.667 -14.7263C124.294 -16.6764 123.808 -18.603 123.211 -20.4964C122.83 -21.5842 122.393 -22.6311 121.939 -23.6453C121.084 -25.6204 120.197 -27.6651 119.952 -29.9266V-30.0084H120.033C123.436 -30.0697 127.194 -28.4544 130.833 -26.9045C133.316 -25.8413 136.125 -24.639 138.636 -24.1483C141.728 -23.5553 144.239 -23.8988 146.099 -25.1747C147.326 -26.0253 148.246 -27.6978 149.121 -29.3132L149.256 -29.5585C149.684 -30.3828 150.172 -31.1742 150.716 -31.9263C152.057 -33.6602 153.894 -35.1487 155.366 -36.3429L155.525 -36.4778C156.924 -37.631 158.245 -38.7229 159.153 -39.8884C161.087 -42.3666 163.377 -46.8731 163.569 -49.3717C163.605 -50.5684 163.467 -51.764 163.16 -52.9213L163.115 -53.1176C162.727 -54.9456 162.326 -56.8349 163.115 -58.6751C164.653 -62.3228 167.25 -62.8381 170.288 -63.4393L170.591 -63.5006C171.721 -63.7042 172.836 -63.9871 173.928 -64.3471C175.148 -64.8151 176.319 -65.4028 177.424 -66.1015L177.522 -66.1587C179.035 -67.0543 180.467 -67.9008 182.11 -68.0562C187.476 -69.692 191.688 -66.8294 195.777 -64.0159C199.286 -61.6154 202.598 -59.3458 206.639 -59.632C208.225 -59.7547 209.869 -60.6666 211.632 -61.644L211.685 -61.6726C214.11 -63.018 216.621 -64.4084 218.968 -63.4188C220.134 -62.9403 221.765 -61.8975 222.481 -58.4093C222.027 -55.7307 220.551 -54.2013 219.103 -52.7046C218.443 -52.0565 217.837 -51.3548 217.292 -50.6067C216.768 -49.7718 216.328 -48.8869 215.979 -47.9649C215.419 -46.6563 214.846 -45.2986 213.701 -44.1495C212.237 -42.6692 210.074 -41.8022 207.976 -40.9639L207.935 -40.9434C206.813 -40.5211 205.72 -40.0252 204.664 -39.459C201.073 -37.4143 197.834 -34.1632 194.403 -30.7322C191.132 -27.4607 187.713 -24.046 183.84 -21.576C181.509 -20.0997 178.933 -19.0651 176.667 -18.1532L176.479 -18.0755C174.64 -17.3943 172.861 -16.5585 171.163 -15.5769C168.71 -13.9983 164.62 -10.2934 162.96 -7.87651C161.933 -6.35934 161.41 -4.65406 160.854 -2.84246L160.747 -2.49485C160.523 -1.76694 160.289 -1.01448 160.02 -0.290659C159.664 0.637635 159.202 1.61909 158.756 2.57192C157.975 4.20769 157.165 5.91296 156.952 7.45058C156.466 10.8693 157.517 14.4026 160.257 18.5697C161.076 19.7221 162.018 20.782 163.066 21.7308L163.148 21.8126C164.218 22.7989 165.204 23.8727 166.096 25.0227C166.864 26.1523 167.495 27.3684 167.978 28.646C168.372 29.6956 168.883 30.6982 169.499 31.6353C170.105 32.3728 170.79 33.0407 171.543 33.6269L171.781 33.8313C173.036 34.8946 174.332 35.9905 174.815 37.2746C175.813 39.9164 174.153 43.1552 172.913 44.0344C170.386 45.8583 166.616 44.1366 163.855 42.873C163.275 42.6072 162.719 42.3536 162.248 42.1778C160.02 41.3545 157.729 40.7091 155.398 40.2476L155.223 40.2067C153.853 39.9164 152.262 39.5647 150.724 39.1067L150.315 38.9881C146.255 37.7612 136.743 34.8987 135.017 32.3837C134.117 31.0669 134.199 29.2348 134.318 27.2638C134.387 26.0369 134.473 24.4829 134.15 23.2193C133.842 22.1646 133.431 21.1427 132.923 20.1686V20.1277C132.179 18.5942 131.549 17.1915 131.32 15.6049C131.162 14.0284 131.207 12.4382 131.455 10.8734V10.8898Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M134.436 -1.44835V-0.986243C134.436 0.383708 134.469 1.79864 134.579 3.13996C134.636 3.88424 134.681 4.61624 134.73 5.3646V5.67131C134.951 8.9142 135.176 12.2675 135.998 15.2691C136.32 16.3355 136.696 17.3851 137.123 18.4139L137.143 18.4671C137.628 19.6068 138.044 20.7743 138.39 21.9635C138.628 22.8512 138.819 23.7508 138.963 24.6584C139.27 26.3801 139.564 28.0035 140.443 29.1895C142.406 31.8394 147.718 33.8841 151.71 33.8841C152.615 33.901 153.517 33.7627 154.376 33.4752C156.551 32.6859 158.02 31.455 158.739 29.7947C160.203 26.4414 158.33 22.0248 156.654 18.0908L156.56 17.87C156.179 16.9703 155.819 16.1156 155.513 15.3059C153.775 10.599 152.315 6.04344 153.468 2.06854C153.893 0.885773 154.48 -0.231888 155.214 -1.25205L155.247 -1.30112C155.779 -2.10078 156.264 -2.931 156.699 -3.78749C157.043 -4.51703 157.331 -5.27164 157.561 -6.04483L157.586 -6.11436C157.81 -6.88157 158.12 -7.62099 158.51 -8.31854C160.51 -11.5287 164.644 -15.5282 168.591 -18.0391C170.815 -19.4744 173.15 -20.3496 175.62 -21.2779L175.817 -21.3515C179.338 -22.6601 182.977 -24.0178 186.539 -27.0766C188.645 -28.8637 190.841 -30.9697 193.168 -33.2107L193.536 -33.5624C195.536 -35.4845 197.662 -37.521 199.752 -39.3857C200.946 -40.4107 202.198 -41.3664 203.502 -42.2483C206.573 -44.3339 209.436 -46.3786 210.037 -50.1491V-50.2104V-50.2554C209.489 -54.2548 205.277 -56.0296 201.204 -57.7513L201.134 -57.7799C199.498 -58.4225 197.907 -59.1767 196.374 -60.0372C195.438 -60.6179 194.558 -61.2641 193.704 -61.9184L193.577 -62.0165C190.882 -64.0408 188.338 -65.9505 184.368 -65.1735C180.102 -65.0754 179.17 -61.1904 178.266 -57.4323V-57.3669C177.808 -55.4776 177.33 -53.5228 176.418 -52.1938C175.506 -50.8647 173.584 -49.7401 171.711 -48.5951C169.752 -47.4133 167.311 -45.9411 165.54 -43.9863C164.37 -42.602 163.355 -41.0935 162.514 -39.488L162.448 -39.3776C161.784 -38.108 160.991 -36.9103 160.081 -35.8034C159.447 -35.1665 158.763 -34.5812 158.036 -34.0532L158.003 -34.0286C156.695 -32.9981 155.206 -31.8326 154.126 -30.295C152.94 -28.6347 152.135 -26.6881 151.358 -24.8029C150.34 -22.3493 149.375 -20.0224 147.788 -19.0778C145.743 -17.8755 142.553 -17.8509 138.276 -18.9919C137.39 -19.2599 136.529 -19.6061 135.704 -20.0265H135.659C133.827 -20.8689 131.929 -21.7441 129.786 -21.0898L129.623 -21.0489L129.549 -20.8894C129.148 -20.0972 128.93 -19.2252 128.911 -18.3376C128.911 -16.4033 130.089 -14.833 131.226 -13.3117C132.161 -12.1713 132.933 -10.9065 133.52 -9.55355C134.37 -7.38208 134.403 -4.49904 134.436 -1.44835ZM129.214 -18.3498C129.233 -19.1923 129.441 -20.0198 129.823 -20.7708V-20.7994H129.852C131.896 -21.421 133.728 -20.5704 135.507 -19.7525L135.552 -19.7321C136.395 -19.3048 137.274 -18.9518 138.178 -18.677C142.537 -17.5115 145.817 -17.5524 147.927 -18.7997C149.599 -19.7893 150.581 -22.1571 151.607 -24.668C152.38 -26.5328 153.178 -28.4629 154.343 -30.0987C155.398 -31.5954 156.866 -32.7486 158.163 -33.7792L158.191 -33.8037C158.929 -34.3431 159.622 -34.9407 160.265 -35.5908C161.188 -36.7128 161.994 -37.927 162.669 -39.214L162.735 -39.3285C163.565 -40.9194 164.567 -42.4142 165.724 -43.7859C167.462 -45.708 169.883 -47.1638 171.825 -48.3375C173.768 -49.5111 175.69 -50.6643 176.626 -52.0179C177.563 -53.3715 178.054 -55.3794 178.52 -57.2932V-57.3628C179.395 -61.0064 180.303 -64.7728 184.355 -64.8709C188.22 -65.6234 190.71 -63.7504 193.372 -61.7507L193.475 -61.673C194.333 -61.031 195.221 -60.3644 196.17 -59.7796C197.716 -58.9069 199.322 -58.1431 200.975 -57.4936L201.04 -57.4691C205.035 -55.7802 209.162 -54.0381 209.685 -50.2145C209.1 -46.5627 206.287 -44.5752 203.289 -42.4446C201.984 -41.5609 200.73 -40.6052 199.531 -39.582C197.437 -37.7132 195.307 -35.6767 193.307 -33.7505L192.939 -33.3989C190.616 -31.1701 188.441 -29.0682 186.322 -27.2852C182.805 -24.2754 179.19 -22.93 175.69 -21.6214L175.518 -21.5559C173.032 -20.6236 170.68 -19.7443 168.427 -18.2844C164.46 -15.749 160.277 -11.7127 158.257 -8.46985C157.852 -7.75242 157.531 -6.9909 157.3 -6.20023L157.275 -6.12663C157.046 -5.36693 156.761 -4.62482 156.425 -3.90608C155.998 -3.05881 155.519 -2.2393 154.989 -1.45244L154.961 -1.40336C154.21 -0.35811 153.61 0.787151 153.178 1.99902C151.992 6.06389 153.472 10.6686 155.222 15.4286C155.529 16.2465 155.893 17.1012 156.273 18.009L156.367 18.2299C158.003 22.0862 159.864 26.4577 158.453 29.6802C157.77 31.2423 156.359 32.4201 154.27 33.1766C150.565 34.5302 143.077 32.2197 140.685 28.9891C139.867 27.8604 139.564 26.2696 139.261 24.5889C139.115 23.6719 138.923 22.7629 138.685 21.8654C138.332 20.666 137.912 19.4877 137.425 18.3362V18.283C136.999 17.2663 136.628 16.2274 136.313 15.171C135.495 12.198 135.27 8.86104 135.053 5.6345V5.33189C135.004 4.57944 134.955 3.84334 134.902 3.09907C134.792 1.76592 134.775 0.359167 134.759 -0.990336V-1.43608C134.726 -4.5154 134.694 -7.42706 133.818 -9.66396C133.221 -11.0418 132.435 -12.3299 131.483 -13.4916C130.359 -14.9884 129.214 -16.526 129.214 -18.3498V-18.3498Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M133.041 20.074C133.561 21.0689 133.982 22.1126 134.297 23.1901C134.628 24.4496 134.546 25.8891 134.472 27.2795V27.3736C134.378 29.2588 134.293 31.054 135.159 32.3054C136.848 34.7795 146.373 37.6461 150.437 38.873L150.769 38.9629C152.229 39.4046 153.701 39.7277 155.124 40.0426L155.398 40.1039C157.755 40.5667 160.071 41.2163 162.325 42.0463C162.8 42.2222 163.352 42.4798 163.961 42.7661C165.83 43.6167 168.177 44.684 170.259 44.684C171.177 44.7128 172.08 44.4462 172.835 43.9234C174.009 43.081 175.649 39.8626 174.692 37.3354C174.217 36.0799 172.925 34.988 171.657 33.9207C170.823 33.2831 170.065 32.5503 169.4 31.737C168.797 30.8216 168.294 29.8441 167.899 28.8212L167.854 28.7149C167.373 27.4489 166.747 26.2427 165.99 25.1203C165.108 23.9691 164.128 22.8964 163.061 21.9142L162.992 21.8447C161.93 20.8891 160.978 19.8178 160.154 18.6509C157.394 14.4511 156.334 10.881 156.825 7.42137C157.042 5.87558 157.839 4.18665 158.612 2.55089L158.641 2.48546C159.087 1.56534 159.545 0.587975 159.896 -0.33623C160.215 -1.19501 160.481 -2.06605 160.714 -2.8185C161.254 -4.57695 161.81 -6.39264 162.873 -7.95479C164.538 -10.4084 168.672 -14.1298 171.118 -15.6919C172.639 -16.6693 174.577 -17.4545 176.626 -18.2846L176.569 -18.4237L176.675 -18.301C179.059 -19.262 181.525 -20.2516 183.795 -21.6993C187.672 -24.1529 191.058 -27.5553 194.341 -30.8391C197.776 -34.2742 201.019 -37.5171 204.622 -39.5904C205.688 -40.1579 206.789 -40.6564 207.918 -41.083H207.963C210.036 -41.9255 212.183 -42.7924 213.611 -44.2319C214.723 -45.3565 215.291 -46.6855 215.848 -48.0105L215.888 -48.1005C216.24 -48.9959 216.674 -49.857 217.185 -50.6727C217.675 -51.3609 218.222 -52.0066 218.821 -52.6029L218.996 -52.7869C220.411 -54.2428 221.859 -55.7517 222.329 -58.373V-58.4303C221.638 -61.7591 220.145 -62.7732 218.919 -63.2803C216.625 -64.2413 214.13 -62.8714 211.701 -61.5055L211.664 -61.4851C209.996 -60.5609 208.266 -59.604 206.655 -59.4813C202.565 -59.1868 199.081 -61.571 195.683 -63.8897C191.634 -66.6664 187.443 -69.5412 182.147 -67.9055C180.511 -67.7623 179.055 -66.879 177.628 -66.0284L177.587 -66.0039C176.455 -65.2905 175.255 -64.6905 174.005 -64.2127C172.803 -63.8136 171.573 -63.5074 170.324 -63.2967H170.283C167.2 -62.6833 164.763 -62.1966 163.258 -58.6307C162.497 -56.8273 162.894 -54.9707 163.258 -53.1754L163.286 -53.0568C163.549 -52.0192 163.703 -50.957 163.744 -49.8875C163.744 -49.7199 163.744 -49.5359 163.744 -49.3723C163.532 -46.8 161.262 -42.3508 159.279 -39.8031C158.334 -38.5763 156.956 -37.4639 155.5 -36.2698L155.467 -36.2412C153.918 -34.9817 152.159 -33.5504 150.842 -31.841C150.245 -31.0154 149.716 -30.1429 149.26 -29.232C148.376 -27.5962 147.46 -25.9277 146.201 -25.069C144.303 -23.7685 141.752 -23.4087 138.611 -24.0057C136.137 -24.5005 133.426 -25.6415 130.788 -26.7661L130.747 -26.7865C127.23 -28.2873 123.595 -29.8372 120.303 -29.874H120.127L120.151 -29.6981C120.45 -27.5267 121.288 -25.5842 122.102 -23.7113C122.535 -22.7175 122.989 -21.6666 123.37 -20.5502C123.978 -18.6523 124.467 -16.7183 124.834 -14.7596C125.218 -12.7411 125.728 -10.7485 126.359 -8.79312C126.897 -7.39011 127.583 -6.0481 128.404 -4.78959L128.481 -4.65464C129.25 -3.44008 129.906 -2.15743 130.44 -0.822871C131.313 1.762 131.788 4.46471 131.847 7.19236C131.862 8.43323 131.78 9.67337 131.602 10.9015V10.9015C131.352 12.4495 131.303 14.0234 131.459 15.5838C131.696 17.2605 132.411 18.7572 133.041 20.074ZM131.904 10.9383C132.083 9.69791 132.164 8.4454 132.146 7.19236C132.076 4.43328 131.589 1.70061 130.702 -0.912838C130.161 -2.26458 129.497 -3.56367 128.719 -4.79368L128.637 -4.92864C127.838 -6.17207 127.169 -7.49446 126.641 -8.87491C126.015 -10.8185 125.51 -12.7988 125.128 -14.8045C124.758 -16.7759 124.265 -18.7221 123.652 -20.6319C123.267 -21.7524 122.809 -22.8198 122.372 -23.8176C121.591 -25.621 120.785 -27.498 120.47 -29.5427C123.656 -29.4569 127.193 -27.9438 130.62 -26.4839L130.677 -26.4553C133.311 -25.3388 136.039 -24.1856 138.546 -23.6867C141.768 -23.0733 144.402 -23.4455 146.369 -24.795C147.685 -25.6946 148.618 -27.4081 149.53 -29.0807C149.976 -29.9718 150.495 -30.8252 151.08 -31.6324C152.372 -33.3173 154.114 -34.7322 155.651 -35.9836L155.688 -36.0122C157.156 -37.2145 158.551 -38.3513 159.512 -39.5945C161.524 -42.1749 163.822 -46.7019 164.039 -49.3314C164.039 -49.5031 164.059 -49.6953 164.059 -49.8671C164.018 -50.9587 163.862 -52.043 163.593 -53.1018L163.569 -53.2204C163.196 -54.9666 162.812 -56.7782 163.532 -58.4916C164.975 -61.9104 167.343 -62.3807 170.373 -62.99C171.632 -63.2046 172.871 -63.515 174.082 -63.9183C175.351 -64.4026 176.569 -65.0107 177.718 -65.734L177.759 -65.7585C179.157 -66.5764 180.601 -67.4597 182.167 -67.5988H182.22C187.389 -69.1895 191.516 -66.3719 195.527 -63.6116C198.946 -61.2765 202.479 -58.8597 206.675 -59.1623C208.352 -59.2932 210.11 -60.2665 211.807 -61.207L211.86 -61.2356C214.208 -62.5402 216.641 -63.8897 218.812 -62.99C219.961 -62.5115 221.364 -61.5546 222.031 -58.3853C221.585 -55.8785 220.162 -54.4104 218.784 -52.9914L218.608 -52.8074C217.251 -51.5399 216.219 -49.9648 215.598 -48.215L215.549 -48.1087C215.013 -46.8369 214.453 -45.5242 213.386 -44.4282C211.999 -43.0337 209.885 -42.1749 207.84 -41.3489L207.898 -41.2057L207.795 -41.3284C206.653 -40.899 205.539 -40.3949 204.463 -39.8194C200.823 -37.7256 197.564 -34.4664 194.104 -31.0109C190.833 -27.7393 187.471 -24.3737 183.619 -21.9201C181.374 -20.4888 178.924 -19.5033 176.552 -18.5504H176.503C174.459 -17.7326 172.488 -16.9147 170.946 -15.9332C168.492 -14.3547 164.296 -10.5965 162.612 -8.11019C161.524 -6.51123 160.976 -4.671 160.412 -2.89211C160.191 -2.14375 159.929 -1.27679 159.594 -0.438465C159.25 0.473472 158.776 1.44675 158.367 2.36278L158.338 2.42821C157.557 4.06397 156.747 5.79379 156.527 7.38866C156.024 10.926 157.095 14.5615 159.9 18.839C160.733 20.0211 161.693 21.1085 162.763 22.0819L162.837 22.1555C163.893 23.1225 164.864 24.1803 165.736 25.3166C166.48 26.4199 167.093 27.6056 167.564 28.8499L167.609 28.9562C168.012 29.9993 168.526 30.9961 169.142 31.9292C169.827 32.7677 170.606 33.5239 171.465 34.1824C172.692 35.213 173.952 36.2762 174.397 37.454C175.301 39.8422 173.759 42.8888 172.647 43.6821C170.337 45.3424 166.722 43.6821 164.059 42.4798C163.466 42.2058 162.906 41.9482 162.424 41.7683C160.161 40.9346 157.837 40.281 155.472 39.8136L155.193 39.7522C153.774 39.4373 152.331 39.1143 150.855 38.6767L150.527 38.5867C146.847 37.4744 137.032 34.5219 135.397 32.1418C134.579 30.9559 134.669 29.2302 134.759 27.3981V27.3041C134.832 25.9545 134.914 24.4415 134.575 23.1206C134.253 22.0239 133.826 20.9611 133.299 19.9472C132.677 18.6509 131.974 17.1787 131.741 15.5511C131.596 14.0129 131.651 12.4624 131.904 10.9383V10.9383Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M307.242 19.8453C305.84 19.7144 304.56 19.6735 303.37 19.6408C298.928 19.4977 295.424 19.3832 292.328 15.0729C291.132 13.4545 290.282 11.6073 289.83 9.64628C289.63 8.5363 289.665 7.39688 289.932 6.30115L289.964 6.15393C290.116 5.52699 290.195 4.88495 290.202 4.24009C290.169 0.2611 289.461 -1.46463 287.785 -4.05731C287.183 -4.88497 286.491 -5.6422 285.72 -6.31466L285.683 -6.34737C284.613 -7.31969 283.636 -8.38886 282.763 -9.54121C278.674 -15.1723 282.252 -20.8525 285.417 -25.862C286.321 -27.2851 287.118 -28.561 287.752 -29.7919C288.979 -30.4381 289.977 -30.6303 290.823 -30.3726C292.369 -29.8901 293.379 -27.8658 294.451 -25.7189C294.618 -25.4081 294.786 -25.085 294.962 -24.7497L295.125 -24.4307C297.17 -20.5417 297.346 -19.2495 297.28 -14.931C297.28 -14.5753 297.28 -14.2154 297.252 -13.8596V-13.4507C297.137 -10.355 297.015 -7.15708 300.008 -4.92017C301.349 -3.94867 302.907 -3.32034 304.547 -3.09009C306.186 -2.85983 307.857 -3.03466 309.414 -3.5993C312.154 -4.55622 314.166 -6.5314 314.791 -8.88281C315.899 -13.0622 313.315 -21.4373 311.929 -23.2203C310.624 -24.8969 309.332 -25.2854 307.365 -25.8784L306.985 -25.9929C306.801 -26.046 306.612 -26.1033 306.416 -26.1687C302.903 -27.2647 300.364 -28.4792 297.796 -31.4481C297.326 -32.0104 296.89 -32.6004 296.491 -33.2148L296.291 -33.5051C295.526 -34.6052 294.733 -35.7461 293.837 -36.3145C288.411 -39.8846 284.935 -36.0651 281.569 -32.356C280.459 -31.0571 279.239 -29.8571 277.921 -28.7696C276.583 -27.8232 275.126 -27.0586 273.586 -26.4959L273.521 -26.4672C271.456 -25.6003 269.321 -24.7006 267.579 -22.5741C266.908 -21.6777 266.376 -20.6851 266.001 -19.6298L265.972 -19.5562C265.745 -18.9177 265.435 -18.3115 265.052 -17.7527C262.942 -14.8656 256.378 -8.98095 251.966 -8.0363C249.312 -7.46787 246.989 -8.33891 244.298 -9.35309C242.412 -10.1164 240.462 -10.7116 238.471 -11.132C237.614 -11.2731 236.75 -11.3578 235.882 -11.3855H235.637C234.946 -11.4223 234.165 -11.4632 233.441 -11.5695C228.37 -12.3261 224.959 -13.9905 221.663 -17.2947C220.799 -18.2142 219.993 -19.1867 219.25 -20.2064L219.12 -20.3781C218.447 -21.3111 217.706 -22.1927 216.903 -23.0158L216.494 -23.4247C212.438 -27.4364 207.387 -32.4214 201.065 -26.2178C199.902 -24.9684 198.827 -23.6403 197.847 -22.2429L197.384 -21.6213C196.204 -19.9238 195.18 -18.1225 194.326 -16.2396L194.305 -16.1947C193.05 -13.6388 191.851 -11.2219 189.946 -9.58618C187.517 -7.50877 184.36 -6.41281 181.305 -5.34957L181.084 -5.27595C177.26 -3.95098 173.314 -2.58104 170.517 0.694571C168.711 2.73824 167.703 5.36509 167.679 8.09231C167.685 8.71281 167.737 9.33202 167.834 9.94481C168.542 14.2469 171.674 18.4671 176.226 21.252C176.794 22.4788 177.968 23.8038 179.088 25.092L179.15 25.1615C180.237 26.337 181.229 27.5978 182.115 28.9319C183.853 31.7372 183.603 35.7326 183.317 40.3822C183.133 43.2448 182.908 46.4795 183.247 49.8492C183.587 53.3007 184.29 60.4817 181.722 62.8862C181.15 63.426 180.123 63.9372 179.031 64.477L178.933 64.5261C177.334 65.3113 175.527 66.1987 174.3 67.5154L174.226 67.6013H174.206L174.148 67.7035L174.058 67.8099C173.883 68.0634 173.351 68.7832 172.856 69.4456L172.795 69.4211L172.729 69.5397C172.701 69.5929 172.668 69.6379 172.635 69.691C172.404 70.0365 172.194 70.3957 172.006 70.7665L172.28 70.9056C172.464 70.5439 172.669 70.193 172.893 69.8546L172.926 69.8055H172.958L173.028 69.7115C173.326 69.3025 174.296 68.0103 174.382 67.8549L174.512 67.6995C175.694 66.4277 177.477 65.5525 179.052 64.7796L179.15 64.7306C180.262 64.1826 181.313 63.6591 181.918 63.0948C184.593 60.5839 183.881 53.3048 183.554 49.8042C183.231 46.4591 183.44 43.2326 183.624 40.3986C183.914 35.7162 184.163 31.6718 182.397 28.7888C181.502 27.4395 180.501 26.1636 179.403 24.9734L179.342 24.9039C178.205 23.6198 177.036 22.2907 176.479 21.0966L176.459 21.0557L176.422 21.0312C171.924 18.2913 168.828 14.1364 168.133 9.91209C168.036 9.3157 167.986 8.71279 167.982 8.10866C168.006 5.45415 168.989 2.89798 170.75 0.911322C173.482 -2.30295 177.395 -3.65654 181.182 -4.96924L181.399 -5.04286C184.482 -6.11429 187.668 -7.22251 190.138 -9.33674C192.101 -11.0134 193.303 -13.4589 194.575 -16.0434V-16.0883C195.424 -17.9476 196.438 -19.7268 197.605 -21.4046L198.071 -22.0343C199.041 -23.418 200.105 -24.7325 201.257 -25.9683C207.363 -31.9675 212.299 -27.0929 216.277 -23.1507L216.646 -22.7704C217.453 -21.9715 218.2 -21.1146 218.882 -20.2064L219.009 -20.0387C219.765 -19.0121 220.584 -18.0342 221.463 -17.1107C224.808 -13.7369 228.272 -12.048 233.412 -11.2792C234.148 -11.1729 234.942 -11.1279 235.637 -11.0911H235.882C236.736 -11.0631 237.587 -10.9798 238.43 -10.8416C240.4 -10.4198 242.329 -9.8259 244.196 -9.06683C246.928 -8.04039 249.291 -7.1489 252.035 -7.73778C256.509 -8.70288 263.163 -14.653 265.293 -17.5728C265.686 -18.147 266.002 -18.7697 266.234 -19.4253L266.262 -19.4989C266.622 -20.5269 267.139 -21.4926 267.796 -22.3615C269.485 -24.4307 271.583 -25.314 273.615 -26.1687L273.68 -26.1973C275.244 -26.7692 276.725 -27.5461 278.085 -28.5079C279.422 -29.6124 280.66 -30.8316 281.786 -32.1515C285.057 -35.7461 288.447 -39.4675 293.645 -36.0405C294.463 -35.5048 295.244 -34.4048 295.992 -33.3129L296.193 -33.0267C296.596 -32.4009 297.038 -31.8012 297.518 -31.2314C300.135 -28.2052 302.711 -26.9702 306.277 -25.862L306.854 -25.6821L307.238 -25.5676C309.14 -24.9951 310.399 -24.6147 311.642 -23.0158C313.008 -21.2655 315.548 -13.0458 314.46 -8.94415C313.859 -6.69088 311.92 -4.7934 309.275 -3.87329C307.765 -3.32247 306.143 -3.15075 304.552 -3.37322C302.96 -3.59568 301.448 -4.20552 300.147 -5.14918C297.285 -7.28794 297.395 -10.2691 297.514 -13.422V-13.831C297.514 -14.1909 297.542 -14.5548 297.542 -14.9106C297.608 -19.2903 297.428 -20.603 295.354 -24.5575L295.187 -24.8765C295.015 -25.2118 294.847 -25.539 294.68 -25.8457C293.58 -28.0458 292.537 -30.1273 290.868 -30.6466C289.932 -30.937 288.824 -30.7284 287.519 -30.0209H287.478L287.458 -29.976C286.824 -28.7491 286.022 -27.461 285.11 -26.0297C281.896 -20.9384 278.248 -15.1641 282.469 -9.36535C283.353 -8.1987 284.343 -7.1159 285.425 -6.13063L285.462 -6.09792C286.216 -5.44149 286.894 -4.70208 287.482 -3.89373C289.118 -1.35421 289.817 0.338795 289.85 4.236C289.842 4.86029 289.764 5.4817 289.617 6.0885L289.588 6.23982C289.311 7.37292 289.276 8.55193 289.486 9.69945C289.945 11.7009 290.812 13.586 292.034 15.2365C295.219 19.6735 298.789 19.788 303.316 19.9352C304.502 19.9679 305.77 20.0088 307.169 20.1397C309.888 20.4014 312.657 20.5036 315.728 20.6018L318.864 20.7245V20.8717L317.862 20.8308C317.147 20.8063 316.431 20.7817 315.724 20.7449C312.775 20.655 309.9 20.5527 307.136 20.2869C305.762 20.1561 304.486 20.1152 303.296 20.0825C298.732 19.9271 295.117 19.8085 291.907 15.3183C290.67 13.6512 289.794 11.7445 289.335 9.71989C289.112 8.52599 289.152 7.29786 289.453 6.12122L289.486 5.94946C289.616 5.39011 289.686 4.81843 289.695 4.24418C289.641 0.35516 288.958 -1.31332 287.347 -3.81195C286.785 -4.59887 286.13 -5.31553 285.397 -5.94662L285.348 -5.99569C284.243 -6.98938 283.234 -8.0847 282.334 -9.26721C278.056 -15.1478 281.732 -20.967 284.979 -26.1033L285.053 -26.2219C285.912 -27.5755 286.717 -28.8555 287.343 -30.0986L287.376 -30.1191C288.754 -30.8838 289.907 -31.1046 290.905 -30.7979C292.627 -30.2581 293.637 -28.2502 294.806 -25.9274L295.072 -25.4122C295.203 -25.1546 295.334 -24.8969 295.481 -24.6352C297.571 -20.6603 297.755 -19.319 297.698 -14.9188L297.644 -13.422C297.522 -10.1505 297.419 -7.35746 300.221 -5.26777C301.503 -4.33784 302.994 -3.73733 304.563 -3.51912C306.132 -3.30091 307.73 -3.47169 309.217 -4.01642C311.826 -4.92427 313.716 -6.78086 314.305 -8.97687C315.392 -13.0295 312.881 -21.1797 311.52 -22.9217C310.293 -24.4962 309.132 -24.8438 307.181 -25.4245C307.038 -25.4735 306.886 -25.5185 306.731 -25.5635L306.232 -25.7148C302.642 -26.8353 300.049 -28.0785 297.403 -31.1333C296.887 -31.7435 296.412 -32.387 295.98 -33.0594C295.248 -34.1349 294.418 -35.3576 293.563 -35.9219C288.451 -39.2793 285.262 -35.7747 281.867 -32.0452C280.74 -30.719 279.498 -29.4955 278.154 -28.3893C276.778 -27.4195 275.283 -26.6319 273.705 -26.046C271.583 -25.1668 269.575 -24.3367 267.898 -22.2715C267.246 -21.4155 266.734 -20.4618 266.381 -19.4457L266.32 -19.2985C266.09 -18.6598 265.784 -18.0515 265.408 -17.4869C262.954 -14.1663 256.39 -8.53112 252.056 -7.59874C249.267 -6.9976 246.887 -7.89317 244.13 -8.93188L243.869 -9.03003C242.081 -9.73895 240.233 -10.2864 238.348 -10.6658C237.515 -10.8068 236.673 -10.8929 235.829 -10.9234H235.592C234.847 -10.9643 234.075 -11.0052 233.351 -11.1074C228.174 -11.8844 224.689 -13.5856 221.32 -16.9798C220.512 -17.8247 219.758 -18.7193 219.062 -19.6584L218.809 -19.9855C218.121 -20.9433 217.365 -21.8507 216.547 -22.7009L216.179 -23.0567C212.262 -26.9498 207.383 -31.7957 201.376 -25.8784C200.234 -24.6455 199.175 -23.3381 198.206 -21.9648L197.736 -21.3391C196.598 -19.6984 195.61 -17.9589 194.784 -16.1415L194.722 -16.027C193.438 -13.4139 192.224 -10.9439 190.224 -9.22632C187.701 -7.07529 184.466 -5.95479 181.334 -4.88337H181.268C177.481 -3.57476 173.564 -2.22116 170.848 0.97266C169.781 2.16835 168.994 3.58767 168.546 5.12666C168.099 6.66565 168.001 8.28535 168.26 9.86711C168.951 14.071 172.046 18.1972 176.533 20.9085L176.569 20.9494C177.097 22.1762 178.328 23.5584 179.432 24.7934C180.562 26.0046 181.591 27.3052 182.511 28.6825C184.315 31.6064 184.065 35.6794 183.779 40.3945V40.4722C183.595 43.4697 183.403 46.5695 183.718 49.7879C184.27 55.4353 184.45 60.9683 182.049 63.197C181.407 63.7982 180.319 64.338 179.142 64.9187C177.506 65.7365 175.686 66.624 174.521 67.9571C174.103 68.616 173.642 69.2471 173.142 69.8464L173.044 69.965L172.954 70.0713C172.811 70.2962 172.68 70.5171 172.545 70.7502L172.815 70.8974C172.942 70.6725 173.069 70.4557 173.187 70.2635C173.222 70.2294 173.253 70.1925 173.281 70.1531L173.371 70.0427C173.881 69.4385 174.347 68.7989 174.766 68.1289C175.874 66.8734 177.682 65.9819 179.297 65.1845C180.471 64.6038 181.583 64.0517 182.254 63.422C184.752 61.0992 184.576 55.4844 184.02 49.7593C183.705 46.5654 183.898 43.4779 184.082 40.4886V40.415C184.376 35.6467 184.63 31.5246 182.769 28.523C181.844 27.1278 180.804 25.8119 179.661 24.589C178.59 23.3621 177.375 21.9922 176.868 20.8226L176.823 20.7286L176.721 20.6509C172.296 17.9927 169.253 13.9483 168.579 9.83031C168.325 8.29236 168.421 6.71715 168.857 5.2209C169.294 3.72464 170.061 2.34552 171.102 1.1853C173.756 -1.94718 177.645 -3.28442 181.387 -4.58076L181.338 -4.72389L181.452 -4.6012C184.609 -5.68898 187.872 -6.81357 190.449 -9.0014C192.494 -10.7598 193.72 -13.2544 195.017 -15.8961L195.074 -16.0147C195.895 -17.8146 196.875 -19.5377 198.002 -21.1633L198.468 -21.789C199.427 -23.1505 200.476 -24.4457 201.609 -25.6657C207.399 -31.3704 212.155 -26.6472 215.983 -22.8481L216.347 -22.4883C217.156 -21.6511 217.902 -20.7558 218.58 -19.8097L218.837 -19.4785C219.54 -18.5295 220.3 -17.6254 221.115 -16.7713C224.538 -13.3239 228.067 -11.5982 233.322 -10.813C234.062 -10.7108 234.839 -10.6658 235.592 -10.6249H235.825C236.657 -10.5941 237.486 -10.5094 238.307 -10.3714C240.178 -9.99746 242.012 -9.45686 243.787 -8.75604L244.049 -8.65789C246.85 -7.60283 249.267 -6.69089 252.142 -7.31248C256.546 -8.25713 263.208 -13.9578 265.678 -17.3152C266.072 -17.9005 266.392 -18.5323 266.63 -19.1963L266.688 -19.3435C267.029 -20.3307 267.526 -21.257 268.16 -22.0875C269.796 -24.0954 271.758 -24.9092 273.885 -25.768C275.481 -26.3596 276.993 -27.157 278.383 -28.1398C279.745 -29.2662 281.007 -30.5086 282.154 -31.853C285.425 -35.4639 288.545 -38.8745 293.432 -35.6643C294.25 -35.1327 295.068 -33.9386 295.767 -32.8876C296.205 -32.2024 296.688 -31.5479 297.215 -30.9288C299.906 -27.8208 302.531 -26.5572 306.179 -25.4245L306.682 -25.2691L307.144 -25.13C309.025 -24.5698 310.162 -24.2303 311.319 -22.7336C312.652 -21.0242 315.118 -13.0295 314.051 -9.05457C313.499 -6.9567 311.671 -5.18189 309.144 -4.30676C307.703 -3.7823 306.156 -3.61989 304.638 -3.83381C303.119 -4.04774 301.677 -4.63144 300.437 -5.53358C297.767 -7.52512 297.869 -10.2609 297.984 -13.4302L298.037 -14.9269C298.094 -19.4253 297.91 -20.7543 295.788 -24.7947C295.649 -25.0564 295.518 -25.314 295.379 -25.5676L295.113 -26.0828C293.911 -28.467 292.876 -30.528 291.024 -31.1087C289.94 -31.44 288.705 -31.211 287.257 -30.4053L287.147 -30.3481L287.098 -30.254C286.476 -29.0272 285.671 -27.7513 284.82 -26.4018L284.742 -26.2791C281.446 -21.0611 277.709 -15.1519 282.109 -9.10364C283.02 -7.90007 284.042 -6.78549 285.164 -5.77486L285.208 -5.72988C285.924 -5.11519 286.563 -4.41784 287.114 -3.65245C288.693 -1.19881 289.363 0.436948 289.412 4.24418C289.403 4.79494 289.336 5.34318 289.212 5.87995L289.175 6.06805C288.869 7.27172 288.829 8.52763 289.057 9.74852C289.523 11.819 290.418 13.769 291.682 15.4737C294.99 20.0906 298.663 20.2133 303.312 20.381C304.498 20.4137 305.766 20.4546 307.132 20.5854C309.896 20.8513 312.779 20.9535 315.72 21.0435C316.427 21.0803 317.143 21.1048 317.858 21.1293L319.02 21.1743H319.179V20.4423L315.748 20.3074C312.714 20.2092 309.953 20.107 307.242 19.8453Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M176.091 54.6299L176.136 54.6054C177.195 53.8856 178.18 53.2027 178.839 52.1027C179.497 51.0026 179.657 49.7349 179.82 48.5531V48.4958C179.882 47.9846 179.943 47.5307 180.025 47.1095L180.241 46.0994C181.018 42.3453 181.82 38.4645 181.292 34.1952L181.256 34.0766C178.557 29.3737 174.995 25.2803 171.551 21.3258L171.478 21.2399C170.59 20.2217 169.707 19.2157 168.848 18.2097C165.986 14.8359 164.137 12.2964 164.55 7.87576C164.894 4.09306 166.149 -1.08413 170.157 -4.25342C172.496 -6.11001 174.602 -7.05466 176.851 -8.06474L176.913 -8.08928C179.403 -9.22204 181.979 -10.3916 185.198 -12.9107C189.43 -16.2272 192.477 -19.9813 195.188 -23.3182C198.95 -27.976 202.201 -31.9959 207.297 -32.7607C211.55 -33.4068 212.744 -31.9837 214.404 -30.0167C214.584 -29.8122 214.772 -29.5873 214.969 -29.3583C215.921 -28.2582 216.882 -27.0478 217.901 -25.7678L218.093 -25.5265C221.802 -20.8114 226.006 -15.4707 231.461 -14.0435C232.688 -13.7286 234.393 -13.7327 236.041 -13.7408C237.42 -13.7698 238.799 -13.7166 240.172 -13.5813C241.433 -13.3827 242.675 -13.0776 243.885 -12.6694C245.897 -12.0601 247.794 -11.4794 249.863 -11.8515C254.848 -12.788 260.112 -18.0224 261.13 -23.0565C262.148 -28.0906 260.676 -32.2577 259.245 -36.2407L259.22 -36.3021C257.854 -40.1502 256.562 -43.7857 257.478 -48.1123C258.034 -50.6968 259.384 -52.5207 260.692 -54.2832C262.582 -56.8309 264.373 -59.2396 263.305 -63.329C261.67 -69.6348 255.323 -71.8226 249.201 -73.9369C246.461 -74.8815 243.885 -75.773 241.754 -77.0366C241.137 -78.3104 240.826 -79.7108 240.846 -81.126V-81.2487C240.837 -82.1237 240.729 -82.9948 240.523 -83.8455C239.791 -86.5813 238.593 -88.3029 236.843 -89.1086C233.69 -90.5807 229.547 -88.626 225.896 -86.9044C224.215 -86.111 222.473 -85.2931 221.135 -85.011C218.829 -84.5243 214.813 -84.553 211.996 -85.0682C210.36 -85.3371 208.801 -85.9537 207.424 -86.8764C206.047 -87.7992 204.884 -89.0066 204.013 -90.4172C201.216 -94.8051 200.95 -100.612 201.887 -104.149C203.383 -109.875 205.363 -109.875 209.697 -109.805H209.845C212.255 -109.742 214.666 -109.903 217.046 -110.288C223.618 -111.404 228.059 -116.831 229.232 -125.161C230.799 -136.227 230.758 -145.326 229.102 -152.241C228.554 -153.468 228.476 -154.47 228.868 -155.291C229.633 -156.903 232.099 -157.553 234.279 -158.121L234.659 -158.224C234.917 -158.289 235.166 -158.354 235.399 -158.424L235.518 -158.461L235.591 -158.551C236.651 -159.863 236.692 -161.749 235.698 -163.458C234.814 -164.979 233.023 -166.366 230.991 -166.038L230.885 -166.002C229.122 -165 228.639 -162.922 228.214 -161.094C228.181 -160.963 228.153 -160.837 228.124 -160.71C228.067 -160.469 228.014 -160.231 227.952 -160.011C225.675 -157.766 222.248 -158.244 219.491 -158.628L219.295 -158.657C218.629 -158.751 217.999 -158.845 217.426 -158.886C216.658 -158.947 215.885 -159.005 215.12 -159.054L214.674 -159.091C210.02 -159.45 205.203 -159.827 201.997 -160.694C198.586 -161.626 197.004 -163.965 195.454 -166.28C193.732 -168.823 192.109 -171.228 188.257 -171.637C185.627 -171.919 181.885 -171.592 179.26 -169.817L179.178 -169.76L179.121 -169.649C176.954 -164.775 178.683 -161.152 180.205 -157.958C181.174 -155.913 182.172 -153.827 181.885 -151.652C181.615 -149.607 179.076 -147.391 177.039 -145.604L176.831 -145.42C176.048 -144.769 175.311 -144.067 174.623 -143.318C173.768 -142.284 173.005 -141.179 172.341 -140.013C171.482 -138.623 170.672 -137.306 169.437 -136.333C167.601 -134.873 165.151 -134.362 162.518 -133.818L162.391 -133.789C159.807 -133.25 157.136 -132.689 155.083 -131.09L154.997 -131.017L154.973 -130.915C152.928 -125.455 150.687 -121.329 147.874 -117.931L147.743 -117.783L147.796 -117.583C148.367 -115.551 149.25 -113.619 150.413 -111.858L150.458 -111.784C151.485 -110.169 152.159 -109.106 151.812 -106.558C151.497 -104.198 149.452 -101.467 147.473 -98.825C144.492 -94.8296 141.412 -90.6952 142.827 -86.7858C144.132 -83.1789 149.959 -80.8316 153.562 -80.1323C153.971 -80.0628 154.482 -80.0015 155.271 -79.9278C157.271 -79.7356 160.003 -79.4698 161.05 -78.0304C161.508 -77.3883 161.614 -76.6236 161.385 -75.6135C160.53 -71.7777 154.515 -70.8616 151.382 -71.426C150.307 -71.6596 149.269 -72.0379 148.295 -72.5506L148.242 -72.5751C146.704 -73.2948 145.248 -73.9778 143.429 -73.5606C143.07 -73.4308 142.746 -73.219 142.483 -72.9422C142.221 -72.6653 142.026 -72.331 141.915 -71.9658C141.827 -71.3176 141.82 -70.6609 141.895 -70.011V-69.9538L141.973 -69.8066C143.719 -67.7619 145.559 -64.3758 147.338 -61.1002C148.606 -58.7611 149.845 -56.4956 151.121 -54.4999C152.941 -51.6128 153.873 -49.4291 154.131 -47.4089C154.805 -42.1663 144.459 -35.1407 139.58 -34.47C133.107 -33.5663 129.737 -37.2835 126.167 -41.2175C123.48 -44.1865 120.704 -47.2576 116.479 -48.1327C116.267 -48.1777 116.03 -48.2268 115.772 -48.2881C114.312 -48.6194 112.5 -49.0324 111.081 -48.513C108.018 -47.3517 106.17 -42.6775 106.383 -39.0174C106.689 -33.8403 109.552 -27.8288 112.214 -24.5737C112.5 -24.2138 112.787 -23.8744 113.077 -23.5268C115.203 -20.9627 117.04 -18.7504 116.757 -15.3725C116.595 -14.0171 116.307 -12.6797 115.899 -11.3772C115.31 -9.27112 114.647 -6.87882 115.032 -4.34748C115.6 -0.667014 117.269 1.91749 119.039 4.64921L119.416 5.22991L119.71 5.68792L120.254 6.5058C120.998 7.60994 121.931 8.98808 122.299 10.5216C122.429 11.3454 122.451 12.1826 122.364 13.012C122.29 13.7432 122.283 14.4797 122.344 15.2121C122.572 16.9926 122.957 18.7496 123.493 20.4629V20.5038C124.286 23.3378 125.108 26.2699 124.511 29.2265C123.558 34.0929 117.833 39.6381 113.13 38.8816C111.903 38.6853 110.677 37.9329 109.63 37.2458L109.523 37.1845C108.6 36.5418 107.58 36.0516 106.501 35.7328C104.8 35.3238 102.551 35.467 100.367 35.5856H100.204C99.1771 35.6469 97.983 35.7123 96.932 35.7123C95.9751 35.7123 94.8873 35.7123 93.6605 35.6714H93.4111C89.8819 35.6101 86.545 35.5528 84.6965 36.248C82.1325 37.2172 81.3514 38.624 80.6071 39.9817L80.5622 40.0635C80.23 40.7281 79.7922 41.3344 79.2658 41.8587C78.1249 42.9179 76.8122 43.5395 74.9229 43.932C72.5306 44.4228 70.1832 43.9566 67.8973 43.5231H67.8441C65.918 43.1428 64.1023 42.7788 62.4543 43.1142C59.1173 43.748 56.77 46.4797 54.4963 49.1215L54.3532 49.2891C54.026 49.6654 53.6907 50.0498 53.3553 50.426L53.5884 50.6305C53.9238 50.2542 54.255 49.8698 54.5863 49.4895L54.7294 49.3219C56.9663 46.721 59.2809 44.0302 62.4993 43.4168C64.0859 43.1101 65.873 43.4658 67.7664 43.8257H67.84C70.1383 44.2796 72.5183 44.7499 74.9678 44.2347C76.9308 43.8257 78.2721 43.1837 79.4662 42.0836C80.0152 41.5378 80.4723 40.9066 80.8198 40.2148L80.8648 40.133C81.5968 38.8203 82.3533 37.4626 84.811 36.5343C86.6022 35.8595 89.9105 35.9168 93.3988 35.9781H93.6442C94.8955 36.0068 95.9669 36.019 96.9157 36.019C97.9912 36.019 99.1935 35.9536 100.22 35.8923H100.383C102.539 35.7737 104.771 35.651 106.428 36.0313C107.473 36.3472 108.462 36.8246 109.36 37.4462L109.466 37.5076C110.554 38.1864 111.785 38.9593 113.077 39.1638C113.383 39.2115 113.692 39.2347 114.001 39.2333C118.659 39.2333 123.873 33.9457 124.805 29.2797C125.419 26.2535 124.589 23.2846 123.787 20.418L123.636 20.4588L123.775 20.3771C123.245 18.6797 122.864 16.9392 122.638 15.1753C122.582 14.4537 122.588 13.7284 122.658 13.008C122.746 12.1551 122.721 11.2944 122.585 10.448C122.221 8.86129 121.272 7.45864 120.512 6.32996L119.972 5.51208L119.677 5.05815C119.551 4.86186 119.428 4.64921 119.297 4.47337C117.551 1.77436 115.899 -0.773336 115.338 -4.39655C114.962 -6.87064 115.592 -9.11981 116.205 -11.324C116.617 -12.637 116.904 -13.9855 117.064 -15.3521C117.35 -18.8526 115.477 -21.1099 113.294 -23.7476C113.016 -24.0748 112.733 -24.4101 112.451 -24.77C109.814 -27.9924 106.988 -33.9261 106.685 -39.0379C106.481 -42.5957 108.256 -47.1186 111.225 -48.1859C112.545 -48.6725 114.32 -48.2718 115.743 -47.9487C115.997 -47.8874 116.238 -47.8383 116.455 -47.7933C120.581 -46.9345 123.325 -43.9043 125.979 -40.9681C129.602 -36.9727 133.025 -33.1982 139.658 -34.1265C144.631 -34.8095 155.165 -42.0191 154.47 -47.4089C154.204 -49.4536 153.243 -51.6987 151.415 -54.6226C150.147 -56.6101 148.908 -58.8715 147.645 -61.2025C145.858 -64.474 144.009 -67.9009 142.255 -69.9497L142.23 -69.9906C142.152 -70.6015 142.152 -71.2199 142.23 -71.8308C142.326 -72.1463 142.494 -72.4353 142.72 -72.6751C142.947 -72.9149 143.225 -73.0991 143.535 -73.213C145.232 -73.5974 146.639 -72.939 148.127 -72.2398L148.189 -72.2111C149.184 -71.6871 150.246 -71.3018 151.346 -71.0661C154.58 -70.4854 160.804 -71.475 161.7 -75.4908C161.949 -76.5745 161.823 -77.4456 161.316 -78.153C160.187 -79.707 157.373 -79.9769 155.292 -80.1977C154.535 -80.2632 154.024 -80.3245 153.632 -80.39C150.102 -81.077 144.394 -83.3629 143.134 -86.8471C141.776 -90.6053 144.803 -94.6701 147.735 -98.6001C149.828 -101.397 151.824 -104.039 152.131 -106.472C152.495 -109.134 151.795 -110.239 150.732 -111.907L150.691 -111.977C149.546 -113.713 148.675 -115.617 148.111 -117.62V-117.661L148.135 -117.685C150.974 -121.112 153.247 -125.271 155.292 -130.771V-130.8C157.279 -132.35 159.917 -132.902 162.465 -133.438L162.628 -133.47C165.262 -134.018 167.748 -134.534 169.642 -136.039C170.918 -137.065 171.74 -138.402 172.619 -139.821C173.273 -140.974 174.026 -142.069 174.868 -143.093C175.548 -143.83 176.276 -144.521 177.048 -145.162L177.256 -145.346C179.329 -147.166 181.914 -149.435 182.2 -151.582C182.503 -153.848 181.48 -155.991 180.495 -158.06C178.998 -161.197 177.305 -164.75 179.407 -169.49L179.444 -169.531C182 -171.261 185.664 -171.575 188.236 -171.301C191.945 -170.893 193.532 -168.562 195.221 -166.063C196.783 -163.736 198.398 -161.332 201.923 -160.366C205.142 -159.495 209.971 -159.14 214.646 -158.755L215.087 -158.722C215.856 -158.668 216.625 -158.611 217.394 -158.551C217.958 -158.51 218.58 -158.42 219.242 -158.322L219.442 -158.293C222.272 -157.884 225.801 -157.406 228.19 -159.79L228.226 -159.855C228.296 -160.097 228.353 -160.35 228.415 -160.612C228.443 -160.739 228.472 -160.865 228.509 -161.021C228.918 -162.787 229.384 -164.795 230.995 -165.719H231.052C232.921 -166.014 234.594 -164.709 235.424 -163.266C236.352 -161.659 236.319 -159.908 235.346 -158.698L235.301 -158.669C235.072 -158.6 234.827 -158.534 234.573 -158.469L234.193 -158.371C231.952 -157.782 229.408 -157.115 228.582 -155.373C228.153 -154.465 228.226 -153.386 228.803 -152.102C230.439 -145.252 230.484 -136.19 228.918 -125.161C227.768 -116.982 223.417 -111.641 216.989 -110.549C214.627 -110.172 212.235 -110.016 209.845 -110.083H209.701C205.342 -110.136 203.158 -110.161 201.596 -104.198C200.639 -100.6 200.913 -94.6865 203.76 -90.225C204.65 -88.7784 205.842 -87.5401 207.253 -86.594C208.664 -85.6479 210.262 -85.016 211.938 -84.7411C214.801 -84.2135 218.854 -84.189 221.193 -84.6797C222.567 -84.9701 224.325 -85.7961 226.022 -86.5977C229.613 -88.2907 233.686 -90.2168 236.712 -88.8019C238.348 -88.0371 239.501 -86.3809 240.208 -83.7392C240.407 -82.9097 240.511 -82.0606 240.519 -81.2078V-81.081C240.5 -79.6127 240.829 -78.1608 241.48 -76.8444L241.501 -76.8076L241.537 -76.7831C243.693 -75.4908 246.31 -74.5871 249.078 -73.6342C255.127 -71.5446 261.383 -69.3854 262.982 -63.239C264.009 -59.2927 262.263 -56.9413 260.414 -54.4549C259.151 -52.7497 257.719 -50.8154 257.143 -48.1654C256.206 -43.753 257.511 -40.0766 258.893 -36.1876L258.917 -36.1262C260.336 -32.18 261.805 -28.1028 260.79 -23.1056C259.797 -18.1983 254.656 -13.0538 249.769 -12.1419C247.778 -11.7779 245.913 -12.3464 243.938 -12.9598C242.712 -13.3702 241.453 -13.6779 240.176 -13.8799C238.79 -14.0182 237.397 -14.0728 236.005 -14.0435C234.369 -14.0435 232.688 -14.0435 231.506 -14.3379C226.202 -15.7078 222.015 -21.0241 218.334 -25.7023L218.146 -25.9395C217.128 -27.2236 216.163 -28.4382 215.206 -29.5423L214.641 -30.1966C212.92 -32.2413 211.677 -33.7176 207.256 -33.0592C202.042 -32.2781 198.758 -28.2132 194.931 -23.4818C192.252 -20.1817 189.205 -16.4439 185.014 -13.1479C181.824 -10.6492 179.264 -9.48785 176.79 -8.36736L176.712 -8.33055C174.463 -7.32047 172.341 -6.36765 169.969 -4.49061C165.879 -1.25589 164.599 4.00717 164.244 7.8553C163.835 12.3945 165.699 14.979 168.615 18.4101C169.479 19.4188 170.356 20.4302 171.245 21.4444L171.322 21.5303C174.757 25.4765 178.307 29.5537 180.973 34.2074V34.2688C181.489 38.4645 180.691 42.3208 179.922 46.0503L179.702 47.0563C179.62 47.4939 179.558 47.956 179.497 48.4672V48.5081C179.354 49.6572 179.207 50.8431 178.552 51.9391C177.898 53.035 176.974 53.6403 175.939 54.3396L175.903 54.3682C175.088 54.8777 174.321 55.4579 173.608 56.1021C172.353 57.2839 171.421 58.8952 170.509 60.4614C169.999 61.3931 169.438 62.2955 168.828 63.1645C168.48 63.6225 168.137 64.0764 167.806 64.5222C166.362 66.4156 165.004 68.2026 164.276 70.7626L164.571 70.8485C165.282 68.3458 166.615 66.5791 168.051 64.7144C168.382 64.2686 168.726 63.8188 169.077 63.3526C169.695 62.471 170.264 61.5564 170.783 60.6127C171.674 59.0751 172.598 57.4843 173.817 56.3352C174.524 55.7024 175.285 55.1319 176.091 54.6299V54.6299Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M284.582 30.3267C283.61 29.1102 282.767 27.7959 282.067 26.4049C281.451 24.9216 281.038 23.3617 280.84 21.7675V21.6735C280.671 20.4319 280.361 19.2136 279.916 18.0421C279.131 16.1937 277.512 14.5293 275.798 12.7709L275.463 12.4233C274.858 11.7976 274.236 11.1514 273.635 10.489C273.021 9.77611 272.448 9.0293 271.917 8.25206L271.823 8.12529C271.226 7.22025 270.526 6.38729 269.738 5.64302C269.648 5.56532 269.554 5.49989 269.464 5.42628C266.331 2.80497 262.896 2.27743 258.332 3.71282H258.287C256.673 3.43711 255.085 3.02673 253.54 2.48599L253.376 2.43283C251.605 1.79847 249.777 1.33828 247.917 1.0588C246.678 0.923396 245.43 0.896025 244.187 0.977003H243.95C242.249 1.02608 240.486 1.07515 238.814 0.568063C237.693 0.183195 236.62 -0.328572 235.616 -0.957277C233.383 -2.24135 231.269 -3.45182 228.431 -2.25362L228.378 -2.2209C228.32 -2.15956 228.255 -2.10641 228.198 -2.04915H228.173L228.087 -1.97963C227.936 -1.82423 227.785 -1.6811 227.629 -1.54206C224.595 0.981103 220.845 0.772539 216.551 0.523085H216.51C213.883 0.29751 211.241 0.29751 208.613 0.523085C204.786 0.932026 199.87 2.45737 196.018 3.74144C193.536 4.55933 190.003 5.73708 188.248 7.26243C187.754 7.61866 187.337 8.07065 187.021 8.59148C186.522 9.44725 186.252 10.4181 186.24 11.4091C186.24 14.2717 188.551 16.7253 190.78 19.1462L190.849 19.2198C193.368 21.9352 195.977 24.7405 195.605 28.0366C195.499 28.4455 195.384 28.8545 195.266 29.2839L195.065 30.0077C193.838 34.3588 192.28 39.7773 192.898 47.2322C193.618 55.6932 195.646 57.7584 203.743 58.2736C207.489 58.519 210.028 58.4536 211.734 58.0651C213.271 57.7011 215.238 56.8833 217.32 56.0204L217.459 55.9631C222.092 54.0125 227.347 51.8042 230.479 53.2927C231.976 54.0084 232.806 55.4438 233.612 56.8301L233.632 56.871C234.023 57.623 234.486 58.3352 235.015 58.9975C236.492 60.6694 238.055 62.2637 239.697 63.7739C241.66 65.6264 243.279 67.2008 244.801 68.857C245.361 69.4704 246.027 70.182 246.719 70.9017L246.939 70.6891C246.244 69.9612 245.586 69.2496 245.03 68.6444C243.5 66.9759 241.877 65.4015 239.91 63.5408C238.275 62.0474 236.722 60.468 235.256 58.8094C234.735 58.1646 234.282 57.4685 233.902 56.732L233.882 56.691C233.064 55.2638 232.197 53.7876 230.61 53.0106C227.339 51.4648 222.023 53.7017 217.34 55.6769L217.201 55.7341C215.132 56.597 213.173 57.4149 211.664 57.7788C209.987 58.1592 207.477 58.2246 203.759 57.9792C195.879 57.4762 193.904 55.4642 193.205 47.2159C192.812 42.2973 193.306 37.3482 194.664 32.6045C193.415 37.164 192.971 41.9066 193.352 46.6188C194.055 54.8549 195.904 56.7401 203.776 57.2513C207.456 57.4926 210.004 57.4271 211.623 57.0509C213.104 56.7033 214.981 55.9304 217.279 54.9571C222.006 52.9738 227.359 50.7246 230.668 52.3072C232.303 53.0801 233.154 54.5768 233.992 56.0245L234.095 56.2003C234.458 56.8783 234.881 57.5228 235.358 58.1264C236.833 59.7788 238.39 61.3552 240.024 62.8497C241.881 64.6245 243.549 66.2357 245.144 67.9614C245.757 68.628 246.518 69.4582 247.361 70.3251L247.581 70.1125C246.763 69.2496 245.982 68.4195 245.369 67.7529C243.77 66.019 242.097 64.4078 240.237 62.6289C238.616 61.1438 237.071 59.5783 235.608 57.9383C235.145 57.3463 234.735 56.7155 234.381 56.0531L234.283 55.8773C233.42 54.3887 232.532 52.8511 230.823 52.0373C227.392 50.4015 221.969 52.6753 217.185 54.6832C214.899 55.6523 213.034 56.4171 211.578 56.7606C209.992 57.1286 207.452 57.1695 203.808 56.9528C196.153 56.4661 194.354 54.63 193.671 46.6066C193.061 39.2906 194.587 33.9294 195.809 29.656C195.932 29.2471 196.047 28.8136 196.157 28.4046L196.378 27.5868C196.787 23.8572 194.043 20.921 191.389 18.083C188.461 14.9546 185.696 11.9939 187.708 8.37475C187.923 8.01842 188.2 7.70389 188.526 7.44644C190.162 6.21962 192.984 5.19318 195.977 4.17492C200.124 2.80497 204.872 1.34914 208.609 0.952468C211.203 0.735674 213.81 0.735674 216.404 0.952468H216.526C221.127 1.23464 224.807 1.45137 227.825 -1.2967C228.014 -1.45619 228.202 -1.62385 228.386 -1.80379C231.293 -3.03061 233.53 -1.74653 235.71 -0.499266C236.698 0.122896 237.756 0.625335 238.863 0.997458C240.527 1.49228 242.208 1.4432 243.987 1.4064H244.204C245.451 1.33169 246.702 1.35493 247.945 1.47591C249.814 1.7667 251.651 2.23222 253.433 2.86632C255.001 3.40613 256.607 3.82716 258.238 4.12585H258.275H258.308C262.72 2.75181 266.209 3.23845 269.259 5.65938C269.952 6.31441 270.567 7.0456 271.095 7.83902L271.284 8.09258C271.832 8.89315 272.426 9.66183 273.062 10.3949C273.696 11.1065 274.351 11.7812 274.984 12.4396L275.226 12.6891C276.898 14.4025 278.477 16.0219 279.205 17.7558C279.636 18.8894 279.933 20.0698 280.088 21.2727V21.3095C280.307 22.9653 280.743 24.585 281.384 26.1268C282.099 27.5696 282.967 28.9311 283.973 30.1876C285.016 31.5944 286.099 33.0502 286.251 34.1993C286.472 35.8596 285.584 37.8798 284.799 39.6955L284.709 39.9122C284.339 40.7343 284.019 41.5783 283.752 42.4395C283.159 44.5292 282.701 46.7702 282.255 48.9335L282.141 49.4896C281.393 53.1701 280.685 56.6338 279.45 59.2183C278.301 59.4503 277.129 59.5464 275.958 59.5046H275.884C273.475 59.5414 270.977 59.5782 268.973 61.5493C267.431 63.0623 266.969 65.0743 266.519 67.0168C266.303 68.085 265.993 69.1319 265.591 70.1452L265.873 70.2679C266.285 69.2386 266.601 68.1736 266.818 67.0863C267.255 65.1848 267.709 63.2178 269.186 61.7701C271.116 59.8726 273.541 59.8399 275.888 59.8031H275.962C277.182 59.8493 278.403 59.7435 279.597 59.4882H279.663L279.695 59.4228C280.967 56.7974 281.683 53.2887 282.444 49.5591L282.558 49.003C283 46.8438 283.458 44.6109 284.047 42.5294C284.312 41.6813 284.627 40.8496 284.991 40.039L285.081 39.8223C285.879 37.9902 286.786 35.9128 286.553 34.1707C286.553 34.138 286.553 34.1012 286.533 34.0685C286.611 34.2833 286.669 34.5052 286.705 34.731C286.938 36.4771 286.071 38.5014 285.228 40.4561C284.829 41.3278 284.48 42.2222 284.186 43.1347C283.572 45.3225 283.098 47.6739 282.64 49.9435L282.591 50.1725C281.814 53.9389 281.082 57.4926 279.777 60.163V60.1916H279.757C278.516 60.4686 277.245 60.5868 275.974 60.5433C273.635 60.5433 271.214 60.576 269.312 62.453C267.869 63.8761 267.439 65.7246 266.981 67.6956C266.768 68.7271 266.474 69.7402 266.102 70.7259L266.384 70.8445C266.763 69.8432 267.063 68.8136 267.28 67.7652C267.726 65.8472 268.147 64.0315 269.529 62.6698C271.341 60.8827 273.696 60.8663 275.978 60.85C277.274 60.8924 278.57 60.7701 279.835 60.486L280.002 60.441L280.072 60.2856C281.393 57.5866 282.116 54.0125 282.91 50.2257L282.955 49.9967C283.413 47.7312 283.887 45.3879 284.496 43.2124C284.788 42.3045 285.135 41.4154 285.535 40.5502C286.386 38.5545 287.269 36.4935 287.024 34.6614C286.827 33.3651 285.74 31.9011 284.582 30.3267ZM191.168 18.3079C193.769 21.0969 196.46 23.9799 196.075 27.5459L195.859 28.3228L195.822 28.4578C195.85 28.3474 195.883 28.2329 195.912 28.1184C196.321 24.6587 193.65 21.8003 191.082 19.0358L191.013 18.9622C188.821 16.6026 186.555 14.1612 186.555 11.4336C186.557 10.8894 186.648 10.3493 186.825 9.83465C186.167 12.959 188.702 15.6743 191.168 18.3079ZM280.382 21.2236C280.268 20.5734 280.158 19.9396 280.014 19.3262C280.231 20.095 280.374 20.8965 280.522 21.7307V21.8166C280.648 22.5977 280.779 23.346 280.955 24.0821C280.711 23.1538 280.516 22.2133 280.37 21.2645L280.382 21.2236Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M60.1721 37.0005C62.9897 37.6343 65.9831 38.1864 68.6208 38.1864C70.6164 38.1864 72.4117 37.8674 73.7693 37.025C75.0446 36.2553 76.1317 35.2102 76.9509 33.9661C77.2524 33.4739 77.6419 33.0414 78.1 32.6902C80.3328 31.1894 83.1504 31.5861 86.1562 32.0114H86.2298C88.3031 32.2977 90.4459 32.6003 92.6542 32.3345C93.7829 32.2159 94.9402 31.9869 96.0607 31.7661L96.351 31.7088C98.9519 31.1976 101.643 30.6701 104.391 31.079C105.703 31.3513 106.988 31.7456 108.227 32.2568C110.619 33.1564 113.334 34.1706 115.465 33.7003C116.218 33.5583 116.934 33.262 117.568 32.8298C118.201 32.3977 118.738 31.8392 119.145 31.1894C120.515 29.022 120.744 25.5542 119.787 21.4321C118.798 17.0728 116.757 13.2901 114.782 9.63419C112.218 4.87412 109.793 0.379865 109.875 -4.90774C109.906 -6.72193 110.058 -8.53205 110.329 -10.3262C110.437 -10.9802 110.583 -11.6274 110.766 -12.2646L110.811 -12.4363C111.322 -14.4074 111.96 -16.857 111.58 -18.6563C111.384 -19.6378 110.762 -20.7256 110.124 -21.7765L110.096 -21.8297C110.018 -21.9687 109.936 -22.1037 109.858 -22.2386C109.715 -22.484 109.572 -22.7294 109.449 -22.9706C108.223 -25.2852 106.996 -28.4014 105.928 -31.1494C105.569 -32.1064 105.168 -33.1369 104.73 -34.2124C104.137 -35.6969 103.483 -37.075 102.849 -38.4449L102.653 -38.8539C101.63 -41.0376 100.661 -43.0946 100.199 -45.082C99.2422 -49.2001 99.5121 -54.8271 101.876 -57.6161C105.241 -61.5869 111.633 -59.0228 115.179 -57.1172C116.156 -54.7903 118.258 -53.9765 120.29 -53.1954L120.397 -53.1545C121.484 -52.7865 122.516 -52.2748 123.468 -51.6333C124.695 -50.7295 125.541 -49.3841 126.371 -48.0837L126.404 -48.0305C126.939 -47.1571 127.529 -46.3185 128.171 -45.5196C132.403 -40.4692 137.883 -38.2773 142.831 -39.6595C146.225 -40.6001 148.908 -42.6897 150.008 -45.2415C150.875 -47.2617 150.716 -49.4822 149.55 -51.666C148.111 -54.139 146.414 -56.4529 144.487 -58.5689C143.13 -60.0615 141.375 -60.9121 139.825 -61.6646L139.613 -61.7709C138.649 -62.1889 137.741 -62.7246 136.91 -63.3658C134.35 -65.6231 133.974 -70.007 133.638 -73.896C133.543 -75.5451 133.329 -77.1852 132.996 -78.8033C132.726 -79.9892 132.424 -81.0525 132.15 -82.0135C131.144 -85.5549 130.416 -88.1108 132.068 -92.237L132.121 -92.3965L132.047 -92.56C131.947 -92.7269 131.856 -92.8989 131.773 -93.0753L131.749 -93.1285L131.671 -93.2184C131.021 -93.7419 130.207 -93.6887 129.422 -93.5947H129.32L129.254 -93.5374C128.952 -93.3207 128.653 -93.0957 128.363 -92.8749L127.884 -92.5191C125.337 -90.5971 123.325 -89.0799 120.932 -90.7443C119.706 -91.5868 118.557 -94.1385 117.334 -96.8457C115.314 -101.344 113.028 -106.407 109.314 -106.407H109.192L109.085 -106.382C104.178 -104.612 100.027 -104.873 96.7804 -107.151C92.691 -110.014 92.7278 -113.592 94.2532 -119.162L94.3145 -119.317L94.2286 -119.464C93.1286 -121.509 91.182 -122.736 89.121 -124.04L89.0555 -124.081C87.9495 -124.746 86.8843 -125.477 85.8658 -126.269C81.8909 -129.508 77.9814 -132.219 74.0065 -134.943C69.5082 -138.026 65.4474 -138.541 61.5216 -139.032L61.0186 -139.102C59.7468 -139.273 58.4341 -139.449 57.1255 -139.723C55.8906 -139.965 54.6816 -140.324 53.5145 -140.795L53.3959 -140.512C54.5852 -140.032 55.8176 -139.666 57.0764 -139.421C58.3973 -139.151 59.7182 -138.971 60.994 -138.799L61.5011 -138.729C65.3861 -138.235 69.41 -137.728 73.8511 -134.685C77.8301 -131.966 81.7355 -129.258 85.7104 -126.028C86.7372 -125.227 87.812 -124.489 88.9288 -123.819L88.9942 -123.779C91.0185 -122.499 92.9323 -121.288 93.9996 -119.309V-119.284V-119.256C92.4334 -113.53 92.3884 -109.85 96.6414 -106.893C99.9742 -104.554 104.207 -104.284 109.216 -106.076H109.257H109.351C112.864 -106.076 115.109 -101.095 117.092 -96.6944C118.319 -93.9504 119.501 -91.3577 120.773 -90.4663C123.341 -88.6751 125.435 -90.2536 128.105 -92.2656L128.559 -92.605C128.85 -92.8258 129.144 -93.0467 129.455 -93.2716H129.475C130.219 -93.3656 130.935 -93.4106 131.479 -92.969L131.508 -92.9322C131.59 -92.7502 131.684 -92.574 131.79 -92.4046V-92.3637V-92.3269C130.097 -88.1026 130.837 -85.5017 131.872 -81.8785C132.137 -80.9461 132.436 -79.887 132.689 -78.7051C133.018 -77.0975 133.231 -75.4685 133.327 -73.8306C133.663 -69.9047 134.043 -65.4514 136.697 -63.1163C137.548 -62.4574 138.478 -61.9079 139.466 -61.4806L139.682 -61.3783C141.204 -60.6381 142.929 -59.7957 144.246 -58.3481C146.159 -56.2526 147.842 -53.9591 149.268 -51.5065C150.388 -49.4086 150.54 -47.2821 149.714 -45.3519C148.65 -42.8983 146.033 -40.8536 142.737 -39.9417C137.908 -38.5922 132.546 -40.7595 128.392 -45.7036C127.758 -46.4929 127.176 -47.322 126.649 -48.1859L126.617 -48.235C125.77 -49.5599 124.895 -50.9299 123.64 -51.8664C122.666 -52.5256 121.608 -53.051 120.495 -53.4285L120.389 -53.4694C118.401 -54.2341 116.344 -55.0275 115.428 -57.2726V-57.3216L115.379 -57.3462C111.764 -59.3009 105.156 -61.9549 101.651 -57.8001C99.2218 -54.9375 98.9355 -49.1919 99.9088 -45.0003C100.387 -42.9842 101.361 -40.9109 102.391 -38.7108L102.587 -38.3018C103.217 -36.9564 103.871 -35.566 104.464 -34.0856C104.898 -33.0101 105.282 -31.9837 105.659 -31.0268C106.734 -28.2705 107.953 -25.1421 109.196 -22.8152C109.323 -22.5699 109.47 -22.3245 109.605 -22.071C109.682 -21.9401 109.764 -21.8052 109.842 -21.662L109.875 -21.6048C110.48 -20.5743 111.102 -19.511 111.294 -18.5786C111.658 -16.8488 111.028 -14.436 110.525 -12.4977L110.48 -12.3259C110.296 -11.6761 110.147 -11.0167 110.034 -10.3507C109.765 -8.544 109.614 -6.72178 109.58 -4.89547C109.486 0.469831 111.928 5.00088 114.512 9.79367C116.475 13.4332 118.507 17.1955 119.489 21.518C120.425 25.5624 120.213 28.9444 118.884 31.0422C118.5 31.6561 117.994 32.1838 117.396 32.5921C116.799 33.0003 116.123 33.2802 115.412 33.4141C113.367 33.868 110.701 32.8702 108.345 31.9869C107.087 31.4659 105.782 31.0647 104.448 30.7887C101.647 30.3797 98.9314 30.9073 96.302 31.4225L96.0116 31.4798C94.8993 31.7006 93.7502 31.9296 92.6297 32.0482C90.4623 32.3059 88.3358 32.0073 86.2829 31.7211H86.1848C83.1464 31.2917 80.2756 30.8827 77.9446 32.4531C77.4546 32.8235 77.0384 33.2827 76.7178 33.8067C75.9211 35.0151 74.8649 36.0308 73.6262 36.7796C70.5673 38.6812 65.1489 37.8143 60.2539 36.7183C56.8065 35.9454 55.2484 34.4282 53.5718 32.5226L53.3387 32.7271C55.0481 34.6573 56.6388 36.2276 60.1721 37.0005Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M314.914 22.9408C313.159 23.0635 311.299 23.0758 309.475 23.0921C307.066 23.1167 304.567 23.1453 302.142 23.3906C295.563 24.049 293.317 23.542 290.054 18.7246C287.478 14.8929 285.875 11.5273 285.286 8.71787C285.09 7.83456 284.963 7.02894 284.844 6.26422L284.795 5.95343C284.313 2.66146 283.977 0.285511 280.203 -2.55663C276.931 -5.0348 269.444 -9.53724 266.201 -9.68445C263.256 -9.81531 261.097 -8.55169 258.979 -7.3126C257.646 -6.45084 256.209 -5.76366 254.701 -5.2679C249.479 -3.77936 245.889 -5.18203 242.089 -6.66648H242.036C240.435 -7.31892 238.796 -7.87605 237.129 -8.33496C234.79 -8.92792 232.463 -9.30824 229.883 -9.70491C226.202 -10.2815 222.428 -10.8745 218.052 -12.318C216.339 -16.432 213.476 -23.2245 207.649 -21.6991L207.44 -21.6419L207.383 -21.4415C206.994 -19.9655 206.72 -18.4615 206.565 -16.9431C206.27 -14.7349 205.988 -12.6534 204.954 -11.3161C203.919 -9.9789 200.57 -7.28807 198.652 -5.92221C195.724 -3.80963 192.305 -2.48075 188.719 -2.06181C188.023 -1.99229 187.332 -1.94322 186.674 -1.89414H186.47C182.221 -1.57108 178.205 -1.26438 174.676 2.5265C172.66 4.66935 171.69 6.86945 171.813 9.06955C171.936 11.2696 173.04 13.2775 175.17 15.175C176.168 16.0366 177.221 16.8317 178.323 17.5551L178.507 17.6818C180.143 18.8228 181.718 19.9024 183.116 21.7099L183.349 22.0166C184.359 23.3007 185.889 25.235 186.519 27.1692C187.312 29.5615 186.846 32.4855 186.351 35.5648V35.6098C186.025 37.4439 185.807 39.2955 185.697 41.155C185.59 44.083 186.081 46.7125 186.514 49.0353L186.637 49.7223C186.756 50.3684 186.874 51.0391 186.977 51.7016C187.095 52.5195 187.181 53.3987 187.267 54.3188V54.466C187.594 57.9543 187.962 61.9087 190.665 64.3583C191.892 65.4788 193.528 65.7896 195.164 66.0963C197.159 66.4807 199.044 66.8406 200.185 68.6522C200.31 69.3942 200.148 70.1559 199.731 70.7827L199.993 70.9422C200.455 70.2408 200.629 69.3886 200.48 68.5622V68.5131C199.253 66.5707 197.306 66.1944 195.221 65.7937C193.667 65.4992 192.064 65.1925 190.898 64.1293C188.281 61.7615 187.917 57.8684 187.594 54.4333V54.2902C187.504 53.366 187.422 52.4908 187.3 51.6566C187.197 50.9859 187.079 50.3153 186.96 49.6692L186.838 48.978C186.408 46.6716 185.926 44.0708 186.02 41.1673C186.131 39.3202 186.348 37.4811 186.67 35.6588V35.6139C187.169 32.4896 187.639 29.537 186.825 27.0711C186.175 25.0877 184.625 23.1248 183.603 21.8285L183.374 21.5218C181.943 19.6775 180.364 18.5856 178.696 17.4324L178.512 17.3056C177.421 16.587 176.377 15.7988 175.387 14.946C173.322 13.1058 172.226 11.1265 172.116 9.05319C172.005 6.97986 172.934 4.82884 174.913 2.74733C178.36 -0.953578 182.319 -1.2562 186.527 -1.57926H186.711C187.377 -1.62834 188.073 -1.6774 188.755 -1.74692C192.389 -2.19992 195.846 -3.5707 198.803 -5.73001C200.733 -7.10405 204.095 -9.79487 205.17 -11.1853C206.246 -12.5757 206.54 -14.7103 206.839 -16.9636C206.998 -18.464 207.271 -19.9501 207.657 -21.4088V-21.4456H207.698C213.296 -22.9096 216.093 -16.1907 217.766 -12.1749L217.79 -12.1095L217.86 -12.089C222.285 -10.6209 226.108 -10.0239 229.805 -9.44318C232.377 -9.03424 234.712 -8.67028 237.019 -8.07732C238.674 -7.62293 240.3 -7.06988 241.889 -6.42112L241.942 -6.56425V-6.40066C245.79 -4.89576 249.43 -3.47674 254.746 -4.99391C256.289 -5.49569 257.761 -6.1939 259.126 -7.07133C261.171 -8.26544 263.301 -9.50452 266.152 -9.38184C269.329 -9.23871 276.731 -4.77718 279.982 -2.31945C283.642 0.449082 283.981 2.77595 284.456 6.01067L284.505 6.30511C284.623 7.09027 284.75 7.90408 284.946 8.79557C285.544 11.6581 287.167 15.0442 289.764 18.9087C293.117 23.8609 295.411 24.3803 302.134 23.7096C304.559 23.4643 307.041 23.4356 309.467 23.4111C311.27 23.4111 313.147 23.3825 314.901 23.2598C316.223 23.1532 317.552 23.1642 318.872 23.2925V23.4479C317.556 23.3202 316.232 23.3052 314.914 23.4029C313.278 23.5174 311.573 23.5379 309.769 23.5624H309.36C306.988 23.591 304.535 23.6156 302.155 23.8527C295.456 24.5193 293.003 23.9632 289.637 18.9904C287.032 15.1382 285.404 11.7195 284.791 8.83237C284.574 7.78548 284.435 6.84901 284.309 6.00659C283.838 2.82912 283.491 0.534967 279.876 -2.20902C276.739 -4.58088 269.243 -9.09149 266.143 -9.23871C263.334 -9.36548 261.314 -8.18365 259.191 -6.9282L259.13 -6.8914C257.78 -6.02916 256.327 -5.34208 254.803 -4.84669C249.418 -3.32544 245.758 -4.75264 241.873 -6.26981L241.783 -6.30661C240.22 -6.95217 238.618 -7.49851 236.986 -7.94238C234.581 -8.55988 232.152 -8.94019 229.801 -9.30414C226.055 -9.89302 222.182 -10.5023 217.725 -11.9868H217.684L217.647 -12.0849C215.913 -16.2848 213.288 -22.6356 207.861 -21.327H207.775L207.751 -21.2411C207.401 -19.8251 207.153 -18.3861 207.006 -16.935C206.7 -14.6613 206.414 -12.5143 205.301 -11.0749C204.189 -9.63539 200.926 -7.03861 198.914 -5.59505C195.914 -3.43561 192.414 -2.07733 188.743 -1.64878C188.06 -1.57926 187.377 -1.53019 186.699 -1.4852H186.47C182.131 -1.14987 178.385 -0.859528 174.962 2.79231C173.044 4.86155 172.099 6.94716 172.214 9.00004C172.328 11.0529 173.396 12.9831 175.416 14.7784C176.426 15.6544 177.494 16.4606 178.614 17.1911C180.331 18.373 181.955 19.4934 183.423 21.3746L183.676 21.7017C184.764 23.0921 186.249 24.9732 186.903 26.9689C187.721 29.4798 187.251 32.4446 186.752 35.5811C186.432 37.418 186.223 39.2725 186.126 41.1346C186.032 43.9972 186.486 46.4958 186.944 48.9044C187.099 49.7591 187.267 50.667 187.402 51.583C187.533 52.4213 187.615 53.2965 187.704 54.2166V54.3679C188.028 57.7825 188.4 61.6511 190.956 63.9739C192.101 65.0085 193.61 65.2948 195.221 65.6096C197.241 65.9981 199.331 66.3948 200.582 68.4191L200.602 68.4518C200.763 69.2381 200.629 70.056 200.226 70.75L200.5 70.8932C200.941 70.1214 201.079 69.2135 200.889 68.3455L200.848 68.2678C199.523 66.1167 197.364 65.7078 195.266 65.307C193.712 65.0126 192.24 64.7345 191.176 63.7572C188.723 61.5162 188.342 57.7089 188.019 54.3515V54.2002C187.929 53.2719 187.844 52.3968 187.717 51.5503C187.578 50.6302 187.41 49.7182 187.251 48.8595C186.813 46.459 186.359 43.9767 186.433 41.1509C186.54 39.3019 186.758 37.4611 187.087 35.6384C187.594 32.465 188.073 29.4675 187.226 26.883C186.555 24.8628 185.05 22.9326 183.955 21.5054L183.713 21.1987C182.217 19.2808 180.577 18.148 178.826 16.9417C177.72 16.2231 176.665 15.4278 175.669 14.5616C173.711 12.8236 172.668 10.9507 172.57 8.99594C172.471 7.04121 173.387 5.02104 175.236 3.01724C178.573 -0.552815 182.266 -0.834988 186.564 -1.16623H186.768C187.435 -1.21121 188.122 -1.26028 188.813 -1.3298C192.538 -1.765 196.09 -3.14293 199.134 -5.33333C201.179 -6.78916 204.504 -9.46772 205.583 -10.8745C206.749 -12.3794 207.039 -14.5549 207.35 -16.8818C207.504 -18.2816 207.752 -19.6696 208.09 -21.0366C213.202 -22.1939 215.746 -16.0394 217.43 -11.9582L217.512 -11.7455L217.688 -11.6719C222.186 -10.1752 226.063 -9.56178 229.821 -8.9729C232.165 -8.60894 234.59 -8.23272 236.978 -7.61522C238.599 -7.17869 240.19 -6.63916 241.742 -5.99991L241.836 -5.96311C245.766 -4.42958 249.471 -2.97784 254.955 -4.53181C256.495 -5.04565 257.963 -5.75188 259.326 -6.63376L259.388 -6.67056C261.481 -7.89739 263.453 -9.06287 266.184 -8.94019C269.235 -8.79706 276.637 -4.32734 279.745 -1.9882C283.262 0.678087 283.597 2.91908 284.063 6.0393C284.186 6.85718 284.325 7.81411 284.542 8.86917C285.163 11.7972 286.811 15.2527 289.449 19.1377C292.904 24.2453 295.411 24.8178 302.249 24.1349C304.621 23.8977 307.062 23.8732 309.43 23.8446H309.839C311.646 23.82 313.351 23.7996 314.999 23.6851C316.362 23.5817 317.73 23.6022 319.089 23.7464H319.257V22.9776H319.122C317.723 22.8348 316.314 22.8225 314.914 22.9408Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M317.649 25.3909C315.783 25.4292 313.922 25.5986 312.08 25.898L311.671 25.9511C310.914 26.0534 310.129 26.1597 309.417 26.2292L309.066 26.266C308.837 26.2906 308.612 26.3151 308.383 26.3315H308.289C307.426 26.3951 306.569 26.5125 305.721 26.6831C304.062 27.13 302.467 27.7854 300.973 28.6338C298.973 29.6684 297.243 30.5599 295.391 30.2205C293.894 29.9465 292.316 28.7728 291.162 27.9141L290.897 27.726C287.318 25.1169 285.638 21.2688 283.855 17.1917V17.1589C283.067 15.2923 282.184 13.4674 281.209 11.6914C280.551 10.4211 279.963 9.11601 279.446 7.78193L279.422 7.7165C278.706 5.96214 278.027 4.30593 277.087 2.98915C273.815 -1.53782 267.064 -4.58853 262.005 -3.81563C260.772 -3.60698 259.562 -3.27685 258.394 -2.83008L258.279 -2.78918C257.415 -2.4483 256.523 -2.18152 255.613 -1.99174C248.952 -0.813996 243.799 -2.44158 238.814 -4.01191L238.757 -4.03237C234.667 -5.30417 230.835 -6.50645 226.488 -6.09751H226.382L226.309 -6.03617C222.395 -3.37397 219.25 -2.42932 214.682 -2.56018C213.615 -2.58471 212.499 -2.7074 211.599 -2.80554H211.542C209.71 -2.99775 207.816 -3.21448 205.956 -2.89142C202.966 -2.40887 199.932 -1.33744 196.996 -0.302819L196.926 -0.278283C193.516 0.928091 189.974 2.17536 186.384 2.5843C184.159 2.82557 181.64 3.09957 180.155 4.31003C178.929 5.33647 178.258 6.49377 178.184 7.76149V7.9864C178.184 10.7059 180.843 13.4376 182.981 15.6336L183.026 15.6827C183.689 16.3533 184.22 16.9095 184.662 17.4125C185.046 17.8214 185.398 18.2304 185.701 18.5984C189.054 22.3893 191.7 25.3868 191.017 30.6744C190.877 31.5677 190.688 32.4524 190.449 33.3244L190.395 33.5411C190.074 34.6933 189.822 35.8636 189.639 37.0457C188.936 42.5491 189.131 48.13 190.215 53.571C190.604 55.4071 191.193 58.1879 192.894 59.7501C194.595 61.3122 197.462 61.4717 200.03 61.6516C201.256 61.7112 202.477 61.8478 203.686 62.0606C208.184 62.9562 215.799 66.608 217.692 70.8651L217.974 70.7383C216.036 66.3872 208.331 62.6658 203.743 61.7416C202.526 61.5276 201.297 61.391 200.063 61.3327C197.548 61.1568 194.697 60.9605 193.111 59.5129C191.524 58.0652 190.907 55.2926 190.522 53.4892C189.446 48.0746 189.256 42.521 189.962 37.0457C190.142 35.8745 190.392 34.7151 190.71 33.5738L190.763 33.353C191.005 32.469 191.196 31.572 191.336 30.6662C192.019 25.2437 189.332 22.2012 185.926 18.3449C185.631 17.9973 185.275 17.5842 184.891 17.163C184.445 16.6518 183.91 16.0998 183.255 15.4209L183.21 15.376C181.116 13.2208 178.503 10.5341 178.503 7.94141V7.72467C178.569 6.5551 179.194 5.47142 180.364 4.50223C181.775 3.34902 184.245 3.0832 186.429 2.84602C190.068 2.43707 193.614 1.21025 197.061 -0.016568L197.131 -0.0411034C200.055 -1.07163 203.077 -2.13896 206.037 -2.61742C207.857 -2.92004 209.718 -2.71966 211.542 -2.52746H211.599C212.503 -2.42522 213.644 -2.30254 214.707 -2.27801C219.344 -2.14715 222.542 -3.09589 226.525 -5.81534C230.823 -6.22428 234.643 -5.02609 238.687 -3.77064H238.744C243.762 -2.18804 248.968 -0.548188 255.687 -1.72594C256.614 -1.92072 257.522 -2.19434 258.402 -2.54382L258.513 -2.58471C259.664 -3.02351 260.856 -3.34813 262.07 -3.5539C267.027 -4.31453 273.66 -1.32109 276.862 3.12409C277.778 4.40816 278.448 6.05211 279.156 7.78602L279.197 7.88416C279.714 9.21788 280.302 10.5229 280.959 11.7936C281.918 13.5723 282.786 15.3985 283.56 17.2653V17.3061C285.36 21.416 287.061 25.3009 290.708 27.9631L290.97 28.1472C292.144 29.0223 293.755 30.2246 295.325 30.5108C297.28 30.8666 299.051 29.9547 301.128 28.8751C302.592 28.0472 304.154 27.4056 305.778 26.9653C306.612 26.7972 307.456 26.6811 308.305 26.6177H308.395C308.624 26.6177 308.853 26.5768 309.086 26.5523L309.434 26.5155C310.154 26.4419 310.939 26.3396 311.699 26.2374L312.108 26.1802C313.92 25.9389 316.173 25.6322 317.641 25.6772C318.05 25.6772 318.439 25.7099 318.909 25.7508V25.9021C318.467 25.8571 318.05 25.8326 317.641 25.8244C315.797 25.8674 313.958 26.0368 312.137 26.3315C311.295 26.4419 310.313 26.5686 309.45 26.6627L308.416 26.7649L308.15 26.7936C307.363 26.8513 306.581 26.9565 305.807 27.1085C304.22 27.5498 302.692 28.18 301.255 28.9855L301.169 29.0305C299.182 30.061 297.305 31.0302 295.297 30.6662C293.698 30.3759 292.066 29.1695 290.872 28.2862L290.61 28.1022C286.93 25.395 285.212 21.4814 283.401 17.3389C282.558 15.3841 281.765 13.6257 280.816 11.8713C280.142 10.5893 279.544 9.26887 279.025 7.91687C278.305 6.15843 277.626 4.50223 276.715 3.23451C273.95 -0.621795 267.407 -4.20412 262.062 -3.39442C260.862 -3.19327 259.685 -2.8713 258.549 -2.43341L258.435 -2.3966C257.542 -2.04645 256.622 -1.77283 255.683 -1.57872C248.919 -0.384617 243.713 -2.02856 238.646 -3.62343C234.63 -4.87887 230.835 -6.07707 226.578 -5.66813H226.538L226.505 -5.64767C222.538 -2.94867 219.328 -1.98765 214.674 -2.11852C213.607 -2.15123 212.515 -2.26983 211.55 -2.37207C209.652 -2.57654 207.869 -2.78101 206.029 -2.4743C203.195 -2.02038 200.439 -1.05528 197.523 -0.0206614L197.151 0.110203C193.695 1.33702 190.125 2.60883 186.433 3.00959C184.274 3.24268 181.828 3.50441 180.446 4.64535C179.289 5.60227 178.7 6.62463 178.646 7.77375C178.499 10.3664 181.17 13.09 183.317 15.3187L183.349 15.3514C184.065 16.0548 184.576 16.6068 185.01 17.0976L185.545 17.7028L186.056 18.2794C189.475 22.1562 192.191 25.2314 191.487 30.7153C191.345 31.6353 191.148 32.5461 190.898 33.4429L190.845 33.6474C190.536 34.7807 190.291 35.9302 190.109 37.0907C189.408 42.5442 189.596 48.0753 190.665 53.4687V53.5342C191.046 55.309 191.622 57.9876 193.201 59.4434C194.71 60.8256 197.417 61.0301 200.03 61.2264H200.185C201.391 61.292 202.591 61.4285 203.78 61.6353C208.622 62.5963 216.326 66.3422 218.195 70.8855L218.477 70.7669C216.568 66.1255 208.749 62.306 203.837 61.3368C202.637 61.1284 201.426 60.9919 200.21 60.9278H200.055C197.49 60.7356 194.841 60.5189 193.409 59.2266C191.9 57.8362 191.336 55.2149 190.956 53.4769V53.4115C189.89 48.0535 189.704 42.5577 190.404 37.1398C190.582 35.9901 190.825 34.8514 191.131 33.7292L191.185 33.5247C191.437 32.6172 191.635 31.6954 191.778 30.7644C192.485 25.1292 189.733 22.0212 186.261 18.0872L185.766 17.527C185.586 17.3225 185.41 17.118 185.23 16.9177C184.821 16.4269 184.274 15.8667 183.558 15.1592L183.525 15.1265C181.419 12.9632 178.802 10.2724 178.941 7.81056C178.99 6.75549 179.542 5.80266 180.63 4.90708C181.938 3.83565 184.339 3.57801 186.453 3.3531C190.183 2.94416 193.769 1.67236 197.237 0.437362L197.613 0.306498C200.517 -0.711763 203.261 -1.66868 206.066 -2.11852C207.857 -2.40886 209.628 -2.21666 211.505 -2.01628C212.474 -1.90996 213.57 -1.79137 214.654 -1.75866C219.365 -1.63189 222.62 -2.57653 226.632 -5.31643C230.815 -5.68039 234.569 -4.49856 238.577 -3.25129C243.643 -1.65233 248.882 0.0202351 255.724 -1.20659C256.679 -1.39855 257.616 -1.67219 258.525 -2.02447L258.635 -2.06127C259.753 -2.49348 260.912 -2.81002 262.095 -3.00592C267.329 -3.79927 273.742 -0.286462 276.453 3.49215C277.344 4.71897 278.019 6.37518 278.731 8.11726C279.255 9.47854 279.857 10.8084 280.534 12.1003C281.491 13.8424 282.268 15.5968 283.11 17.5392C284.934 21.7268 286.66 25.6772 290.418 28.4334L290.68 28.6174C291.907 29.5171 293.542 30.748 295.231 31.0466C297.341 31.4555 299.263 30.4454 301.32 29.3822L301.386 29.3494C302.805 28.5531 304.315 27.9324 305.884 27.501C306.646 27.3481 307.416 27.243 308.191 27.1862L308.456 27.1616L309.491 27.0594C310.358 26.9612 311.339 26.8345 312.186 26.7241C313.981 26.4787 316.214 26.1761 317.641 26.2211C318.095 26.2211 318.557 26.2619 319.052 26.3151H319.224V25.5463H319.085C318.541 25.4277 318.087 25.3991 317.649 25.3909Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M168.73 63.0789C169.278 62.3264 169.76 61.5004 170.271 60.6252L170.406 60.3962C171.306 58.8341 172.234 57.2147 173.523 56.0042C174.233 55.3585 174.999 54.7769 175.813 54.2662L175.845 54.2417C176.925 53.5219 177.857 52.8963 178.454 51.8698C179.088 50.778 179.231 49.6002 179.37 48.4593V48.3448C179.424 47.9031 179.481 47.4451 179.567 47.028L179.771 46.0874C180.544 42.3701 181.341 38.5261 180.843 34.3386V34.2813C178.18 29.648 174.676 25.5954 171.261 21.6941L171.138 21.5551C170.836 21.2034 170.529 20.8558 170.226 20.5082C169.65 19.8416 169.073 19.1832 168.509 18.5167C165.565 15.057 163.671 12.4439 164.092 7.85149C164.448 3.97882 165.728 -1.32104 169.879 -4.58847C172.271 -6.47778 174.377 -7.45106 176.659 -8.46523C179.612 -9.68925 182.39 -11.2995 184.92 -13.2539C189.095 -16.5254 192.113 -20.2386 194.775 -23.5142L194.832 -23.5838C198.668 -28.3193 201.981 -32.4087 207.24 -33.1939C211.738 -33.8768 213.071 -32.2983 214.756 -30.3027C214.92 -30.0982 215.104 -29.8937 215.279 -29.6851L215.312 -29.6483C216.355 -28.4542 217.39 -27.1415 218.445 -25.792C222.125 -21.1342 226.276 -15.8548 231.588 -14.4644C232.692 -14.1781 234.254 -14.174 235.898 -14.1781H236.045C237.442 -14.2075 238.839 -14.1529 240.229 -14.0145C241.44 -13.8312 242.633 -13.5453 243.795 -13.1599L244.069 -13.0781C246.011 -12.4851 247.843 -11.929 249.774 -12.2929C254.591 -13.1803 259.694 -18.2512 260.688 -23.138C261.682 -28.0249 260.23 -32.1347 258.811 -36.0932C257.392 -40.0518 256.092 -43.7323 257.04 -48.202C257.597 -50.8274 258.967 -52.7003 260.291 -54.4792L260.353 -54.5569C262.238 -57.1251 263.866 -59.3415 262.864 -63.1937C261.281 -69.2583 255.065 -71.4134 249.058 -73.499C246.015 -74.5377 243.525 -75.4292 241.443 -76.6724L241.394 -76.7133C240.714 -78.088 240.367 -79.6041 240.384 -81.138C240.389 -81.9965 240.287 -82.8522 240.082 -83.6857C239.382 -86.2825 238.266 -87.906 236.671 -88.6503C233.71 -90.0284 229.666 -88.1268 226.1 -86.4502L226.018 -86.4134C224.256 -85.5955 222.591 -84.8062 221.234 -84.5241C218.874 -84.0292 214.789 -84.0497 211.93 -84.5772C210.23 -84.8549 208.609 -85.4962 207.179 -86.4575C205.75 -87.4187 204.544 -88.6772 203.645 -90.147C200.782 -94.6453 200.5 -100.591 201.461 -104.223C203.044 -110.283 205.408 -110.267 209.71 -110.234C212.141 -110.152 214.575 -110.308 216.977 -110.7C225.973 -112.226 228.243 -121.333 228.795 -125.169C230.345 -136.181 230.308 -145.207 228.68 -152.052C228.087 -153.373 228.014 -154.506 228.468 -155.447C229.318 -157.23 231.882 -157.9 234.168 -158.526L234.557 -158.628C234.782 -158.685 235.003 -158.739 235.215 -158.8H235.264L235.293 -158.841C236.36 -160.239 236 -162.006 235.293 -163.192C234.508 -164.558 232.917 -165.817 231.122 -165.556H231.065C229.515 -164.644 229.081 -162.779 228.66 -160.98V-160.939C228.566 -160.53 228.472 -160.121 228.374 -159.753V-159.712C225.92 -157.213 222.285 -157.729 219.377 -158.142L219.226 -158.166C218.58 -158.26 217.966 -158.35 217.41 -158.391C216.645 -158.452 215.868 -158.51 215.099 -158.563L214.691 -158.595C210 -158.955 205.15 -159.332 201.928 -160.231C198.341 -161.2 196.709 -163.63 195.11 -166.001C193.475 -168.455 191.896 -170.774 188.265 -171.166C185.733 -171.432 182.131 -171.121 179.616 -169.441L179.579 -169.416V-169.375C177.534 -164.754 179.125 -161.401 180.675 -158.121C181.718 -155.929 182.72 -153.856 182.405 -151.578C182.106 -149.37 179.493 -147.08 177.395 -145.239L177.309 -145.166C176.503 -144.497 175.741 -143.777 175.027 -143.011C174.2 -141.992 173.454 -140.911 172.795 -139.776L172.75 -139.706C171.883 -138.3 171.069 -136.971 169.785 -135.944C167.863 -134.411 165.225 -133.867 162.669 -133.343H162.62C160.089 -132.816 157.472 -132.268 155.484 -130.755L155.447 -130.726V-130.685C153.444 -125.271 151.198 -121.149 148.389 -117.714L148.336 -117.648L148.36 -117.571C148.919 -115.597 149.788 -113.724 150.933 -112.021C151.967 -110.385 152.716 -109.195 152.356 -106.484C152.016 -104.006 150.021 -101.352 147.89 -98.5098C145.003 -94.6208 142.014 -90.6009 143.339 -86.9327C144.565 -83.5263 150.36 -81.2076 153.726 -80.5614C154.135 -80.4878 154.674 -80.4347 155.361 -80.3733C157.459 -80.1689 160.326 -79.8908 161.496 -78.2714C162.023 -77.5598 162.162 -76.6356 161.905 -75.4987C160.997 -71.4093 154.666 -70.3747 151.378 -70.9513C150.304 -71.186 149.265 -71.5599 148.287 -72.0636L148.172 -72.1168C146.761 -72.7875 145.31 -73.4827 143.637 -73.1228C143.354 -73.0117 143.099 -72.8388 142.891 -72.6167C142.683 -72.3945 142.527 -72.1288 142.435 -71.8387C142.363 -71.2699 142.363 -70.6941 142.435 -70.1253V-70.0762L142.468 -70.0435C144.14 -68.056 145.841 -64.9522 147.641 -61.6643L147.833 -61.3085C148.986 -59.1943 150.287 -56.8102 151.591 -54.7368C153.444 -51.8088 154.396 -49.5637 154.679 -47.4495C155.394 -41.8757 144.893 -34.7069 139.744 -33.9954C133.001 -33.0712 129.406 -37.0543 125.926 -40.9065C123.28 -43.8181 120.544 -46.832 116.483 -47.6704C116.242 -47.7153 116.021 -47.7644 115.788 -47.8298H115.747C114.345 -48.1365 112.599 -48.5209 111.331 -48.067C108.423 -47.012 106.685 -42.5627 106.886 -39.0703C107.196 -33.9995 110.01 -28.0944 112.611 -24.8842C112.868 -24.5529 113.151 -24.2094 113.474 -23.8414C115.657 -21.2037 117.563 -18.9341 117.252 -15.3681C117.096 -13.9795 116.803 -12.6098 116.377 -11.2787C115.776 -9.11136 115.15 -6.87445 115.559 -4.44534C116.103 -0.850754 117.747 1.68876 119.485 4.36732L119.661 4.63722C119.825 4.89486 119.992 5.15658 120.156 5.43057C120.319 5.70456 120.499 5.93765 120.679 6.20755L120.7 6.24028C121.464 7.37304 122.417 8.7798 122.789 10.4196C122.931 11.2738 122.957 12.143 122.867 13.0041V13.0409C122.802 13.7455 122.802 14.4547 122.867 15.1593C123.086 16.8612 123.449 18.5413 123.955 20.1811L124 20.3487C124.818 23.244 125.66 26.2375 125.043 29.3045C124.02 34.3427 118.062 40.0965 113.138 39.3072C111.834 39.0986 110.636 38.3584 109.458 37.6224C108.547 36.987 107.543 36.4985 106.481 36.1747C104.816 35.7944 102.555 35.9212 100.347 36.0398H100.249C99.1608 36.1052 98.0076 36.1665 96.932 36.1665C95.9465 36.1665 94.8424 36.1665 93.6605 36.1215H93.4847C89.9637 36.0602 86.6349 36.007 84.8683 36.6818C82.4147 37.6019 81.6704 38.9841 81.0038 40.2028C80.6338 40.9386 80.1509 41.612 79.5725 42.1984C78.3866 43.2903 76.9798 43.9609 75.0128 44.3739C72.4978 44.8851 69.9011 44.3739 67.8196 43.965C65.918 43.5888 64.1391 43.233 62.5361 43.5315C59.3545 44.1409 57.0563 46.8031 54.8357 49.3917C54.2468 50.0869 53.7888 50.6185 53.3553 51.0806L53.5803 51.2891C54.0178 50.8107 54.4758 50.2872 55.0688 49.592C57.2525 47.0484 59.5181 44.423 62.5933 43.8301C64.1187 43.5438 65.8853 43.8955 67.7582 44.2676C69.8684 44.6766 72.4978 45.2205 75.0742 44.6766C77.1189 44.2676 78.5502 43.5602 79.7811 42.4274C80.3848 41.8202 80.8874 41.1203 81.2696 40.3541C81.9444 39.1273 82.6437 37.8514 84.9787 36.9721C86.6922 36.3178 89.9882 36.371 93.4806 36.4323H93.6523C94.8464 36.461 95.9506 36.4773 96.9239 36.4773C98.0076 36.4773 99.1649 36.416 100.257 36.3506H100.302C102.469 36.232 104.706 36.1093 106.329 36.4773C107.367 36.7996 108.349 37.2796 109.241 37.9005C110.427 38.6365 111.65 39.3972 113.016 39.6139C113.336 39.6665 113.66 39.6925 113.985 39.6916C118.843 39.6916 124.286 34.2077 125.268 29.3658C125.901 26.2293 125.047 23.199 124.221 20.271L124.176 20.1034C123.676 18.4796 123.316 16.8159 123.1 15.1306C123.036 14.4506 123.036 13.766 123.1 13.0859V13.045C123.196 12.1568 123.169 11.2594 123.018 10.3788C122.634 8.68165 121.665 7.24626 120.867 6.06442C120.683 5.79043 120.512 5.52872 120.344 5.29153C120.176 5.05435 120.017 4.75991 119.849 4.47365L119.673 4.20375C117.952 1.54972 116.328 -0.957081 115.792 -4.48624C115.42 -6.854 116.034 -9.0582 116.61 -11.1888C117.045 -12.5264 117.35 -13.9026 117.522 -15.2986C117.825 -18.9791 115.886 -21.3019 113.65 -24.0172C113.351 -24.3607 113.069 -24.7042 112.832 -25.0314C110.243 -28.2048 107.462 -34.0281 107.156 -39.0417C106.963 -42.4277 108.62 -46.7298 111.396 -47.7358C112.586 -48.1447 114.283 -47.7889 115.67 -47.4822C115.911 -47.4168 116.14 -47.3636 116.389 -47.3187C120.348 -46.5008 123.051 -43.5278 125.664 -40.6488C129.193 -36.7435 132.845 -32.699 139.748 -33.6437C144.991 -34.3675 155.697 -41.7162 154.944 -47.4373C154.658 -49.6005 153.693 -51.8865 151.812 -54.8513C150.52 -56.896 149.215 -59.2924 148.066 -61.3944L147.87 -61.7502C146.074 -65.0217 144.377 -68.1337 142.692 -70.1416C142.629 -70.6618 142.629 -71.1877 142.692 -71.7079C142.769 -71.9474 142.897 -72.1668 143.069 -72.35C143.241 -72.5333 143.452 -72.6758 143.686 -72.767C145.228 -73.1024 146.573 -72.4603 148.001 -71.7774L148.119 -71.7242C149.12 -71.2084 150.184 -70.8262 151.284 -70.5874C154.674 -69.9944 161.209 -71.0863 162.162 -75.3679C162.436 -76.5947 162.281 -77.6048 161.7 -78.39C160.453 -80.1239 157.504 -80.406 155.349 -80.6146C154.662 -80.68 154.122 -80.7291 153.713 -80.8027C150.417 -81.4447 144.745 -83.6898 143.555 -86.9777C142.304 -90.511 145.232 -94.4654 148.095 -98.3135C150.225 -101.176 152.241 -103.847 152.593 -106.402C152.969 -109.224 152.184 -110.447 151.125 -112.128C150.015 -113.789 149.17 -115.613 148.622 -117.534C151.427 -120.977 153.664 -125.095 155.668 -130.493C157.598 -131.945 160.167 -132.481 162.645 -133H162.698C165.282 -133.531 167.961 -134.084 169.94 -135.666C171.265 -136.721 172.095 -138.075 172.975 -139.506L173.02 -139.576C173.671 -140.696 174.408 -141.763 175.224 -142.769C175.928 -143.524 176.679 -144.233 177.473 -144.892L177.559 -144.97C179.698 -146.843 182.356 -149.173 182.671 -151.513C182.985 -153.852 181.979 -156.011 180.9 -158.272C179.399 -161.446 177.849 -164.725 179.804 -169.199C182.257 -170.811 185.75 -171.109 188.212 -170.835C191.7 -170.459 193.225 -168.197 194.853 -165.781C196.48 -163.364 198.124 -160.906 201.825 -159.908C205.076 -159.017 209.943 -158.64 214.646 -158.272L215.054 -158.24C215.823 -158.187 216.6 -158.129 217.361 -158.068C217.909 -158.031 218.514 -157.941 219.156 -157.843L219.307 -157.823C222.285 -157.414 225.99 -156.87 228.578 -159.495L228.611 -159.54L228.656 -159.655C228.758 -160.035 228.852 -160.448 228.946 -160.857V-160.898C229.355 -162.624 229.764 -164.411 231.183 -165.265C232.819 -165.486 234.287 -164.312 235.015 -163.045C235.653 -161.957 235.992 -160.35 235.056 -159.078L234.455 -158.919L234.046 -158.812C231.719 -158.191 229.085 -157.487 228.169 -155.573C227.678 -154.559 227.76 -153.328 228.37 -151.95C229.981 -145.178 230.005 -136.181 228.472 -125.21C227.928 -121.431 225.716 -112.487 216.907 -110.999C214.523 -110.61 212.107 -110.455 209.693 -110.537C205.24 -110.569 202.79 -110.59 201.142 -104.296C200.169 -100.616 200.447 -94.5472 203.367 -89.9834C204.286 -88.4744 205.52 -87.1817 206.984 -86.1935C208.449 -85.2054 210.109 -84.5453 211.852 -84.2583C214.744 -83.7266 218.886 -83.7062 221.279 -84.2092C222.669 -84.4954 224.35 -85.2847 226.129 -86.1189L226.21 -86.1598C229.715 -87.7956 233.69 -89.6726 236.524 -88.3558C238.029 -87.6525 239.092 -86.0944 239.763 -83.5917C239.965 -82.7757 240.064 -81.9377 240.057 -81.0971C240.041 -79.5115 240.401 -77.9446 241.108 -76.5252L241.145 -76.4761L241.251 -76.3862C243.37 -75.1225 245.88 -74.2229 248.939 -73.1801C254.869 -71.1354 261.003 -68.9925 262.549 -63.0915C263.51 -59.3783 261.923 -57.215 260.067 -54.6919L260.026 -54.6346C258.68 -52.8107 257.29 -50.9255 256.717 -48.2388C255.752 -43.6832 257.089 -39.9332 258.509 -35.9419C259.907 -32.0488 261.371 -28.0249 260.369 -23.1707C259.392 -18.3902 254.407 -13.4339 249.696 -12.5628C247.839 -12.2152 246.044 -12.7632 244.138 -13.3398L243.86 -13.4257C242.682 -13.8151 241.472 -14.1051 240.245 -14.2926C238.843 -14.4307 237.434 -14.4853 236.025 -14.4562H235.878C234.242 -14.4562 232.713 -14.4562 231.645 -14.7343C226.431 -16.1001 222.305 -21.3346 218.665 -25.9515C217.606 -27.3051 216.568 -28.6219 215.525 -29.8201L215.492 -29.861C215.316 -30.0614 215.132 -30.2699 214.973 -30.4703C213.222 -32.5396 211.844 -34.1753 207.174 -33.4678C201.797 -32.65 198.447 -28.5319 194.575 -23.7473L194.518 -23.6778C191.863 -20.4063 188.858 -16.7258 184.703 -13.4543C182.193 -11.5333 179.441 -9.95332 176.516 -8.75558C174.25 -7.72914 172.108 -6.75995 169.691 -4.84611C165.466 -1.51324 164.15 3.87659 163.786 7.80651C163.352 12.5216 165.282 15.1674 168.284 18.6966C168.848 19.3673 169.425 20.0257 170.006 20.6922L170.918 21.7391L171.036 21.8781C174.422 25.7713 177.923 29.7952 180.569 34.3876C181.051 38.5139 180.262 42.3252 179.497 46.0097L179.293 46.9503C179.203 47.3592 179.145 47.8418 179.088 48.2916V48.4061C178.953 49.5143 178.814 50.6594 178.209 51.6776C177.649 52.6468 176.741 53.248 175.694 53.9514L175.661 53.9718C174.834 54.492 174.055 55.086 173.334 55.7466C172.014 56.9734 171.069 58.6092 170.161 60.204L170.026 60.433C169.519 61.3 169.041 62.1179 168.501 62.8622C168.202 63.2711 167.887 63.68 167.478 64.2076C166.006 66.1582 164.616 67.9984 163.88 70.6197H146.712C146.299 70.4855 145.905 70.2956 145.543 70.0554C144.152 69.0739 143.568 67.5118 142.827 65.5325L142.803 65.4671C142.537 64.7555 142.239 63.9499 141.858 63.0871C141.11 61.4529 140.24 59.8769 139.257 58.372L139.131 58.1675C138.176 56.7838 137.375 55.3001 136.742 53.7428C136.288 52.3368 136.013 50.8789 135.925 49.4039V49.3548C135.853 48.3275 135.708 47.3067 135.491 46.3001C135.328 45.6609 135.111 45.037 134.841 44.4353C134.391 43.3393 134.002 42.3906 134.395 41.2905C135.7 39.434 138.076 40.5585 140.86 41.859C141.932 42.3947 143.036 42.8645 144.165 43.2657C145.808 43.7739 147.494 44.1298 149.203 44.329C152.151 44.7584 154.478 45.0978 156.179 47.576C156.594 48.2473 156.863 48.9982 156.969 49.7802V49.8169C157.222 51.007 157.48 52.242 159.103 53.0885L159.165 53.113C160.71 53.5219 162.162 52.9045 163.716 52.2624H163.753C164.495 51.938 165.256 51.6567 166.031 51.42C166.93 51.1949 167.842 51.0282 168.762 50.9211H168.82C170.316 50.7084 171.866 50.4876 173.114 49.8088C177.812 47.2979 180.282 40.4032 178.295 35.32C177.706 33.807 176.536 32.7192 175.506 31.7582C174.916 31.2451 174.365 30.6887 173.858 30.0938C173.067 29.047 172.351 27.9455 171.715 26.7977L171.605 26.6096C170.732 25.0344 169.736 23.5303 168.627 22.1112C167.776 21.1214 166.867 20.1832 165.904 19.3018C162.898 16.4106 160.056 13.683 160.915 7.966C161.373 4.94802 164.015 -2.75233 165.507 -4.94425C167.818 -8.33028 172.05 -10.5999 176.986 -13.2253L177.35 -13.4175C179.419 -14.5257 181.562 -15.6748 183.738 -17.008C187.774 -19.4821 190.833 -22.8313 193.79 -26.0701L193.83 -26.111C197.904 -30.5685 201.748 -34.7642 207.8 -36.5635C213.852 -38.3629 215.259 -36.3591 218.4 -31.9057C218.854 -31.2514 219.291 -30.638 219.733 -30.0409C220.771 -28.6821 221.914 -27.4064 223.152 -26.2255C223.814 -25.563 224.579 -24.7942 225.196 -24.0827C225.728 -23.4611 226.17 -22.8558 226.599 -22.2997L226.791 -22.042C228.12 -20.2672 229.269 -18.7296 231.829 -17.7645C233.09 -17.2976 234.423 -17.0594 235.767 -17.0612C242.061 -17.0612 248.293 -22.0829 250.514 -27.939C251.18 -29.7301 250.992 -31.4068 250.796 -33.1775V-33.3206C250.688 -34.2534 250.628 -35.1911 250.616 -36.1301V-37.6022C250.616 -41.2827 250.575 -45.8874 251.229 -49.2693C251.765 -51.9969 252.8 -54.1152 253.806 -56.164L253.871 -56.3031C254.733 -57.9791 255.463 -59.7196 256.055 -61.5089L256.079 -61.6193L256.051 -61.7338C254.153 -67.2054 249.737 -66.6043 245.418 -66.0236C242.846 -65.676 240.184 -65.3202 238.27 -66.4325C236.953 -67.2136 235.816 -68.8616 234.639 -70.6037L234.61 -70.6405C232.255 -74.1247 229.584 -78.071 224.387 -76.5538H224.337C220.481 -75.1192 216.796 -73.2578 213.353 -71.0045C212.392 -70.3184 211.496 -69.5464 210.675 -68.6981L210.409 -68.4404C208.033 -66.1136 205.575 -63.7049 201.821 -64.76C200.226 -65.218 198.856 -66.3957 197.527 -67.5367L197.47 -67.5898C196.429 -68.5632 195.269 -69.4013 194.019 -70.0844C189.962 -72.0555 182.863 -72.9224 177.849 -72.0555C177.307 -71.9391 176.779 -71.7692 176.271 -71.5484L176.201 -71.5238C175.737 -71.3184 175.255 -71.1555 174.762 -71.0372C173.562 -70.8239 172.348 -70.6996 171.13 -70.6651H171.008C169.482 -70.5833 168.039 -70.5015 166.693 -69.9944C165.253 -69.3947 163.882 -68.6405 162.604 -67.7452L162.195 -67.4712C161.471 -67.0051 160.727 -66.5225 159.982 -66.1136C159.451 -65.8191 158.862 -65.5615 158.294 -65.2957L158.15 -65.2343C156.654 -64.5923 154.961 -63.8685 153.779 -62.2736L153.722 -62.1796V-62.0691C153.66 -58.863 154.842 -56.2704 155.983 -53.7636L156.003 -53.7186C157.324 -50.8192 158.572 -48.0793 157.639 -44.775C156.801 -41.8389 154.045 -39.6674 151.374 -37.5654C150.277 -36.7272 149.223 -35.8332 148.217 -34.8869C147.514 -34.1917 146.831 -33.3779 146.287 -32.7236C145.06 -31.28 143.94 -29.9182 142.558 -29.3662C138.059 -27.5341 129.75 -31.2105 126.2 -34.4493C125.151 -35.4671 124.166 -36.5473 123.247 -37.684L123.129 -37.8231C120.794 -40.6284 118.369 -43.5237 115.698 -43.4255C114.283 -43.3724 112.979 -42.5013 111.719 -40.7552C111.192 -40.0313 110.582 -36.5022 110.93 -34.4452C111.441 -31.4518 113.412 -28.8795 115.506 -26.1478C117.195 -23.9477 118.941 -21.6495 119.816 -19.1549C120.835 -16.2228 120.634 -13.0208 120.442 -10.2278V-10.1051C120.287 -7.85999 120.139 -5.73351 120.626 -4.02005C121.211 -1.94263 122.638 -0.131019 123.918 1.4843C124.77 2.46159 125.5 3.53807 126.094 4.69039C126.713 6.0956 127.103 7.59071 127.251 9.11921C127.316 10.4507 127.259 11.7854 127.079 13.1064C126.895 14.8444 126.67 16.8155 127.1 18.6271C127.456 19.9995 127.937 21.3367 128.535 22.6224L128.555 22.6715C129.03 23.7552 129.476 24.7775 129.525 25.5341C129.651 27.5011 127.889 35.2382 126.703 37.1439C125.963 38.338 124.736 39.1559 123.644 39.8879C122.815 40.4042 122.04 41.0014 121.329 41.6709C120.315 42.7918 119.434 44.0269 118.704 45.3513C117.195 47.8377 115.641 50.4058 112.57 50.7943C110.296 48.8559 106.894 45.9729 104.019 46.4596C102.862 46.6559 101.913 47.3715 101.201 48.586C100.445 49.8987 100.228 51.1051 100.555 52.1684C101.197 54.2417 103.696 55.4399 105.921 56.4827C107.057 57.0225 108.239 57.5786 108.783 58.1552C110.263 59.6479 110.517 62.0852 110.742 64.2362V64.4529C110.803 65.2919 110.923 66.1256 111.102 66.9475C111.305 67.6689 111.565 68.3731 111.879 69.0535C112.119 69.5844 112.322 70.1309 112.488 70.6893H109.024C108.512 69.8209 107.814 69.0766 106.98 68.5096C102.351 65.647 95.2677 67.43 91.3623 70.7302L91.5586 70.9633C95.3862 67.7326 102.306 65.9742 106.82 68.7714C107.626 69.3204 108.301 70.0392 108.799 70.8774L108.885 71.0001H112.893L112.852 70.812C112.68 70.1724 112.455 69.5486 112.177 68.9472C111.871 68.2866 111.616 67.6029 111.417 66.9025C111.239 66.0944 111.122 65.2743 111.065 64.4488L111.04 64.2321C110.811 62.032 110.554 59.5375 108.996 57.9671C108.391 57.3537 107.237 56.8098 105.998 56.2251C103.855 55.2068 101.422 54.0536 100.821 52.107C100.518 51.1256 100.727 50.0051 101.439 48.766C102.101 47.6373 102.976 46.9707 104.039 46.7908C106.792 46.3246 110.174 49.1954 112.394 51.0969L112.443 51.1419H112.513C115.76 50.7657 117.371 48.1117 118.925 45.5476C119.641 44.2439 120.509 43.0292 121.509 41.9285C122.207 41.2702 122.968 40.6838 123.783 40.1782C124.834 39.4748 126.147 38.5956 126.924 37.3443C128.11 35.41 129.921 27.5543 129.786 25.5545C129.733 24.7612 129.275 23.7143 128.789 22.6061V22.5611C128.197 21.2915 127.722 19.9706 127.369 18.6148C126.961 16.8523 127.165 14.9957 127.369 13.1677C127.547 11.8369 127.603 10.4928 127.537 9.15193C127.414 7.57246 127.037 6.02318 126.421 4.56362C125.955 3.49628 125.063 2.3717 124.184 1.26756C122.957 -0.302773 121.534 -2.08576 120.965 -4.11002C120.495 -5.77032 120.638 -7.86818 120.794 -10.0887V-10.2114C120.978 -13.0495 121.203 -16.2678 120.152 -19.2613C119.26 -21.8212 117.498 -24.1195 115.788 -26.3441C113.744 -29.039 111.777 -31.5826 111.29 -34.5025C110.963 -36.4327 111.527 -39.8964 112.022 -40.5793C113.249 -42.2437 114.451 -43.0739 115.768 -43.1229C118.287 -43.2252 120.769 -40.2603 122.953 -37.6309L123.072 -37.4918C123.999 -36.3427 124.994 -35.2502 126.053 -34.2203C129.643 -30.9488 138.121 -27.207 142.717 -29.0799C144.169 -29.6606 145.33 -31.0551 146.561 -32.5273C147.105 -33.1734 147.788 -33.9831 148.475 -34.6701C149.473 -35.6079 150.518 -36.4938 151.607 -37.3242C154.315 -39.4547 157.112 -41.6589 157.975 -44.6851C158.936 -48.0956 157.664 -50.8846 156.339 -53.8372L156.314 -53.8862C155.19 -56.3603 154.024 -58.9203 154.081 -62.065V-62.0978C155.206 -63.6149 156.789 -64.2897 158.318 -64.9604L158.465 -65.0217C159.042 -65.2752 159.639 -65.537 160.179 -65.8396C160.935 -66.2485 161.684 -66.7392 162.408 -67.2095L162.816 -67.4835C164.08 -68.3655 165.435 -69.1099 166.857 -69.7041C168.161 -70.1948 169.58 -70.2725 171.081 -70.3543H171.204C172.438 -70.3903 173.668 -70.5161 174.884 -70.7305C175.398 -70.8505 175.899 -71.0189 176.381 -71.2335L176.446 -71.2621C176.931 -71.4646 177.434 -71.622 177.947 -71.7324C182.904 -72.5871 189.925 -71.7324 193.929 -69.7899C195.163 -69.1083 196.308 -68.2774 197.339 -67.3159L197.372 -67.2872C198.726 -66.1217 200.124 -64.9195 201.78 -64.4451C205.698 -63.3328 208.217 -65.8028 210.654 -68.191L210.92 -68.4486C211.73 -69.2831 212.613 -70.0439 213.558 -70.7223C216.997 -73.0287 221.9 -75.3802 224.44 -76.2226H224.481C229.478 -77.6825 232.079 -73.8344 234.377 -70.4361L234.406 -70.3993C235.632 -68.6245 236.757 -66.9519 238.135 -66.1381C240.143 -64.9604 242.854 -65.3202 245.496 -65.6801C249.647 -66.2444 253.937 -66.8251 255.744 -61.6111V-61.5743V-61.5457C255.159 -59.7898 254.441 -58.081 253.597 -56.4339L253.528 -56.2949C252.518 -54.2298 251.483 -52.091 250.927 -49.3225C250.268 -45.9119 250.293 -41.2991 250.309 -37.5941V-36.1546C250.322 -35.206 250.383 -34.2588 250.493 -33.3165V-33.1734C250.685 -31.4354 250.87 -29.7956 250.227 -28.0739C247.598 -21.1219 239.215 -15.3641 231.94 -18.0753C229.461 -19.0077 228.341 -20.529 227.032 -22.2547L226.844 -22.5082C226.411 -23.0808 225.965 -23.6778 225.425 -24.3076C224.787 -25.0314 224.018 -25.8002 223.348 -26.4709C222.125 -27.64 220.994 -28.9019 219.966 -30.2454C219.524 -30.8424 219.087 -31.4518 218.625 -32.1224C215.406 -36.6862 213.938 -38.7677 207.698 -36.8825C201.564 -35.0382 197.683 -30.8097 193.581 -26.3359L193.54 -26.2909C190.6 -23.0685 187.557 -19.7479 183.558 -17.2943C181.391 -15.9652 179.252 -14.8202 177.183 -13.716L176.823 -13.5197C171.866 -10.8739 167.589 -8.58791 165.233 -5.14054C163.72 -2.92409 161.054 4.84987 160.592 7.89648C159.708 13.7689 162.604 16.5538 165.671 19.4981C166.625 20.3709 167.526 21.2995 168.37 22.2789C169.468 23.6897 170.454 25.1841 171.318 26.7486L171.429 26.9408C172.073 28.0994 172.797 29.2117 173.596 30.2696C174.119 30.8865 174.685 31.4659 175.289 32.0035C176.295 32.94 177.436 34.0032 178 35.4509C179.935 40.3909 177.534 47.1138 172.958 49.5593C171.76 50.2136 170.239 50.4263 168.767 50.6389H168.713C166.954 50.8069 165.237 51.2729 163.634 52.017L163.585 52.0416C162.097 52.6591 160.686 53.2439 159.263 52.8799H159.234C157.75 52.0866 157.517 50.9783 157.271 49.8047V49.7638C157.159 48.946 156.88 48.1598 156.453 47.4533C154.674 44.8606 152.286 44.513 149.256 44.0713C147.57 43.8762 145.905 43.5257 144.283 43.0245C143.166 42.6254 142.074 42.1611 141.012 41.634C138.108 40.2682 135.601 39.0904 134.154 41.1801V41.2128C133.712 42.4397 134.121 43.4416 134.612 44.6316C134.869 45.2085 135.077 45.8064 135.233 46.4187C135.443 47.4133 135.58 48.422 135.642 49.4366V49.4816C135.727 50.9825 136.002 52.4666 136.46 53.8982C137.098 55.481 137.907 56.9894 138.873 58.3965L139 58.5969C139.976 60.0897 140.838 61.6535 141.58 63.2752C141.956 64.1299 142.255 64.9109 142.517 65.6429L142.541 65.7084C143.302 67.7531 143.903 69.3357 145.371 70.3703C145.764 70.6341 146.192 70.8406 146.643 70.9837H164.096L164.129 70.8692C164.841 68.2438 166.235 66.4036 167.703 64.4529C168.133 63.909 168.427 63.4878 168.73 63.0789Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M76.4115 -1.44435C74.33 -1.38301 72.179 -1.32167 70.3633 -0.438358C66.6828 1.37734 64.5236 5.16822 62.4176 8.83233L62.3808 8.89776C60.103 12.8686 57.9478 16.6226 54.1365 17.4651C52.937 17.7055 51.6943 17.6092 50.546 17.187L50.4479 17.4773C51.2369 17.7533 52.0657 17.8984 52.9015 17.9067C53.3443 17.9067 53.7858 17.8587 54.2183 17.7636C58.1605 16.8925 60.3524 13.0853 62.667 9.04088L62.6997 8.98363C64.7853 5.36042 66.9364 1.6227 70.5146 -0.160282C72.2689 -1.01906 74.3873 -1.0763 76.4483 -1.13764C79.4377 -1.22352 82.5333 -1.3135 84.3368 -3.91845C87.0399 -7.77884 83.4821 -11.5943 80.6031 -14.6858C79.18 -16.203 77.7078 -17.7733 77.5852 -18.8857C77.4175 -20.4315 78.5462 -22.4557 79.6299 -24.4227C80.9058 -26.7128 82.2226 -29.0805 82.2716 -31.5137C82.3166 -33.3213 81.8627 -35.366 81.3924 -37.3411L81.3515 -37.5293C80.8035 -39.8888 80.2883 -42.1135 80.6113 -43.8147C80.8322 -44.9229 81.6705 -46.8122 82.656 -49C83.803 -51.4475 84.7986 -53.9632 85.6372 -56.5327C85.8662 -57.2893 86.0461 -58.0417 86.2097 -58.7042L86.3242 -59.1745C86.5205 -59.9924 86.6882 -60.7203 86.8722 -61.2642C87.0562 -61.8081 87.3875 -62.491 87.6901 -63.1698C88.9169 -65.8361 90.5527 -69.4839 89.2195 -70.9929C88.557 -71.7576 87.3179 -71.8598 85.4286 -71.2996L85.3428 -71.2668L85.2978 -71.2423C81.7155 -68.3184 79.225 -67.9054 75.749 -67.3328C73.9466 -67.0658 72.1597 -66.7027 70.396 -66.2451C68.939 -65.8406 67.509 -65.3448 66.1144 -64.7606C63.1864 -63.5992 60.655 -62.5973 57.0972 -63.2884C55.0525 -63.6974 52.7379 -64.6993 50.5542 -65.7421L50.4233 -65.464C52.6112 -64.4171 54.9217 -63.3948 57.0277 -63.0103C60.6714 -62.3029 63.2395 -63.317 66.2166 -64.4989C67.6007 -65.077 69.0198 -65.5674 70.4655 -65.967C72.2247 -66.4264 74.0076 -66.7895 75.8063 -67.0548C79.2986 -67.6314 81.8218 -68.0485 85.4573 -71.0092L85.5104 -71.0297C87.2607 -71.549 88.3976 -71.4795 88.9742 -70.8129C90.1683 -69.4512 88.4998 -65.7625 87.3956 -63.3171C87.0808 -62.6219 86.7577 -61.9021 86.5778 -61.3909C86.3978 -60.8798 86.2138 -60.1028 86.0175 -59.2644L85.903 -58.7983C85.7353 -58.1071 85.5636 -57.3915 85.3346 -56.639C84.5012 -54.0832 83.511 -51.5812 82.3698 -49.1473C81.3924 -46.9431 80.5541 -45.0374 80.3251 -43.8924C79.9856 -42.1298 80.5091 -39.8725 81.0652 -37.4843L81.1061 -37.2962C81.556 -35.3373 82.0181 -33.3131 81.9772 -31.5424C81.9281 -29.1828 80.6318 -26.8518 79.3681 -24.5904C78.2476 -22.5907 77.0944 -20.5255 77.2703 -18.8652C77.4052 -17.6384 78.8488 -16.113 80.3946 -14.465C83.1754 -11.4797 86.635 -7.76657 84.075 -4.10655C82.3534 -1.61611 79.3354 -1.53023 76.4115 -1.44435Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M56.2708 22.0171C57.7285 22.0179 59.1712 21.723 60.5115 21.1501H60.5483L60.5811 21.097C62.1023 19.1177 62.8793 17.0076 63.6358 14.9301L63.689 14.787C64.8054 11.7568 65.9545 8.62019 69.4346 5.86802C71.7124 4.0605 75.1189 3.34895 78.4313 2.65784H78.509C83.0564 1.72136 87.7592 0.748084 89.6036 -3.06733C90.9531 -5.84404 89.6036 -8.41218 88.0864 -11.3893V-11.4342C87.1254 -13.2786 86.1357 -15.1802 85.6818 -17.323C85.2279 -19.4658 85.7636 -21.7968 86.3361 -24.275C87.015 -27.3011 87.7797 -30.7281 87.0395 -34.6253C86.8392 -35.5805 86.5728 -36.5206 86.2421 -37.4388V-37.4838C85.3833 -40.0969 84.4059 -43.0617 85.5264 -47.421C86.0867 -49.6497 87.3094 -52.1729 88.6017 -54.8433L88.7325 -55.1132C89.4073 -56.5118 90.1025 -57.9553 90.7077 -59.3825C91.0389 -60.1759 91.3702 -60.9815 91.7137 -61.8362C93.01 -65.0709 94.474 -68.7391 96.621 -70.8329C97.7897 -71.9942 99.1495 -72.9459 100.641 -73.6464C101.929 -74.2925 102.947 -74.8037 103.912 -76.7011C105.548 -79.8336 105.004 -85.1376 103.479 -87.444C101.88 -89.8649 99.2995 -92.3513 95.5864 -95.0053C92.4866 -97.2259 88.9779 -98.2768 85.2565 -99.3646C80.8563 -100.681 76.3702 -101.994 72.6121 -105.388L72.5835 -105.425C72.015 -108.001 72.4362 -110.77 72.8084 -113.215C73.2623 -116.291 73.6958 -119.194 72.653 -121.938C71.467 -125.067 67.987 -129.14 63.8771 -130.526C61.6688 -131.287 59.5505 -130.91 57.3054 -130.526C55.6451 -130.227 53.764 -129.892 51.8338 -130.166C51.3963 -130.227 50.9587 -130.305 50.5293 -130.391L50.468 -130.088C50.9055 -130.002 51.3472 -129.925 51.7888 -129.863C53.7722 -129.581 55.6779 -129.921 57.3586 -130.223C59.5628 -130.612 61.6443 -130.98 63.779 -130.244C67.7989 -128.878 71.2053 -124.891 72.3667 -121.832C73.3809 -119.161 72.9556 -116.295 72.5017 -113.244C72.1295 -110.79 71.7042 -107.973 72.2849 -105.339L72.3136 -105.225L72.4076 -105.143C76.2148 -101.72 80.7377 -100.383 85.1216 -99.0825C88.802 -97.9947 92.2903 -96.9641 95.3451 -94.7722C99.0255 -92.1264 101.586 -89.6768 103.16 -87.2927C104.644 -85.0517 105.16 -79.8991 103.569 -76.8606C102.641 -75.049 101.708 -74.5828 100.42 -73.9326C98.9023 -73.2209 97.5188 -72.2525 96.3306 -71.07C94.1469 -68.9476 92.6502 -65.2467 91.3661 -61.9834C91.0185 -61.1164 90.6913 -60.3067 90.3601 -59.5297C89.759 -58.1107 89.0638 -56.6672 88.389 -55.2768L88.2581 -55.0069C86.9577 -52.3201 85.7309 -49.7806 85.1625 -47.5273C84.0215 -43.0781 85.0112 -40.0724 85.8863 -37.4183V-37.3693C86.2127 -36.4643 86.4764 -35.5379 86.6755 -34.5966C87.4035 -30.7649 86.6428 -27.3666 85.9681 -24.3527C85.3915 -21.8418 84.8476 -19.4699 85.3179 -17.2698C85.7881 -15.0697 86.7778 -13.16 87.747 -11.2993L87.8819 -11.3729L87.7715 -11.2543C89.2682 -8.35493 90.5646 -5.84812 89.2846 -3.20637C87.5057 0.474096 82.8765 1.42693 78.4027 2.35113H78.3209C74.988 3.04633 71.5447 3.76606 69.2097 5.62265C65.6642 8.43208 64.4987 11.6054 63.3659 14.6766L63.3169 14.8197C62.5726 16.844 61.8038 18.9378 60.3275 20.872C56.647 22.4097 53.3183 21.5223 50.5129 20.4631L50.4025 20.7494C52.2629 21.5327 54.253 21.9626 56.2708 22.0171V22.0171Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M63.305 -59.5629L63.5095 -59.6488C64.0902 -59.8982 64.6545 -60.1395 65.1943 -60.3562L66.552 -60.9287C70.895 -62.7812 76.2971 -65.0836 79.3437 -61.0923C81.9363 -57.6695 79.8794 -53.6455 78.0637 -50.1L78.031 -50.0346C77.2376 -48.4642 76.4893 -46.9798 76.2234 -45.6875C75.745 -43.3975 76.3502 -40.5308 76.9309 -37.7623C77.5443 -34.8711 78.2395 -31.5954 77.4339 -29.2359C76.751 -27.3016 75.107 -25.8212 73.5163 -24.394C71.8151 -22.8646 70.0566 -21.2861 69.8358 -19.27C69.5659 -16.7918 71.1853 -14.9679 72.7638 -13.189L72.8088 -13.1359C73.9416 -11.86 75.1111 -10.5432 75.5119 -9.00967V-8.9606L75.4874 -8.93197C74.4691 -7.65608 73.0337 -7.15308 71.5206 -6.61737C69.8849 -6.02849 68.1591 -5.42326 66.5602 -3.77932C65.4438 -2.63838 64.6709 -1.05579 63.9225 0.47774L63.898 0.52273C63.41 1.60408 62.8484 2.65069 62.2172 3.65521C60.4629 6.22336 57.5267 10.5213 53.8503 11.7604C52.7824 12.1071 51.6491 12.2037 50.5379 12.0426L50.497 12.3452C50.8671 12.3949 51.24 12.4209 51.6134 12.4229C52.4067 12.4251 53.1952 12.2994 53.9485 12.0508C57.723 10.779 60.6919 6.42783 62.4708 3.83106C63.1173 2.81079 63.6939 1.74783 64.1965 0.6495V0.604523C64.9326 -0.904468 65.6973 -2.46662 66.781 -3.57485C68.3309 -5.16972 70.0035 -5.76269 71.6433 -6.34338C73.1891 -6.88727 74.6531 -7.40254 75.7327 -8.74796L75.8472 -8.89107L75.8022 -9.08737C75.3933 -10.7027 74.1665 -12.0481 73.0337 -13.3485L72.9724 -13.414C71.4511 -15.1315 69.8767 -16.9022 70.1343 -19.2454C70.3347 -21.1429 71.9705 -22.6151 73.7044 -24.1732C75.3401 -25.629 77.0004 -27.1339 77.7079 -29.1459C78.5258 -31.5995 77.8347 -34.9038 77.2172 -37.8318C76.6406 -40.5717 76.0435 -43.4057 76.5056 -45.6303C76.7633 -46.8857 77.5034 -48.3497 78.2886 -49.9037L78.3213 -49.9691C80.1779 -53.5964 82.2799 -57.7063 79.5727 -61.2845C76.3788 -65.468 70.8541 -63.1125 66.4171 -61.2191L65.0798 -60.6425C64.5441 -60.4258 63.9757 -60.1845 63.3909 -59.9309L63.1864 -59.8451C59.1502 -58.1234 54.1243 -55.9806 51.3476 -57.0111C51.0794 -57.1126 50.823 -57.2429 50.5829 -57.3996L50.4193 -57.142C50.6754 -56.9748 50.9498 -56.8376 51.2372 -56.733C54.1284 -55.6493 59.2156 -57.829 63.305 -59.5629Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M65.3658 -7.74183C64.0122 -7.70503 62.6095 -7.66823 61.4113 -7.07118C59.0109 -5.89343 57.6123 -3.43978 56.2464 -1.07201C54.856 1.38163 53.5392 3.67578 51.2737 4.16651C50.5551 4.30215 49.8129 4.23416 49.1309 3.97022L49.0286 4.26056C49.5293 4.44456 50.0574 4.54273 50.5908 4.55092C50.8495 4.55133 51.1074 4.52251 51.3596 4.46503C53.7601 3.94568 55.1055 1.582 56.545 -0.937069C57.874 -3.25576 59.2521 -5.65215 61.5708 -6.79718C62.7077 -7.36152 64.0735 -7.39832 65.3944 -7.43513C67.3042 -7.49238 69.1076 -7.54554 70.1872 -9.07089C71.7821 -11.361 69.7047 -13.5897 67.8562 -15.569C66.8911 -16.5995 65.9792 -17.5687 65.8933 -18.3375C65.7788 -19.3844 66.4781 -20.6316 67.2142 -21.9566L67.2387 -22.0016C68.0198 -23.4084 68.8254 -24.8642 68.8745 -26.3241C68.8398 -27.5459 68.6543 -28.7587 68.3224 -29.935L68.2897 -30.0945C67.9503 -31.5872 67.6272 -33.0021 67.8399 -34.1062C68.1492 -35.1709 68.5473 -36.2078 69.0299 -37.206L69.124 -37.4186C69.8434 -38.9503 70.4676 -40.525 70.9928 -42.1337C71.1523 -42.6572 71.275 -43.1683 71.4018 -43.6182L71.4427 -43.7818C71.5378 -44.2379 71.6579 -44.6884 71.8025 -45.1313C71.8966 -45.3971 72.052 -45.7488 72.236 -46.1536L72.3341 -46.3785C73.058 -47.9857 74.0476 -50.1899 73.3238 -51.02C72.9762 -51.4289 72.2851 -51.4698 71.2055 -51.159L71.1523 -51.1304C68.85 -49.2656 67.2592 -49.0039 65.055 -48.64C63.9266 -48.4793 62.8084 -48.254 61.7058 -47.9652C60.796 -47.7095 59.9029 -47.3981 59.0313 -47.0328C57.2361 -46.3213 55.543 -45.6506 53.2284 -46.0964C51.8075 -46.4347 50.4319 -46.9413 49.1309 -47.6054L49 -47.3273C50.3057 -46.66 51.685 -46.1481 53.1099 -45.8019C55.5144 -45.3398 57.2483 -46.0268 59.0886 -46.7588C59.9496 -47.118 60.8318 -47.4239 61.7303 -47.6749C62.8222 -47.9611 63.9295 -48.185 65.0468 -48.3455C67.2878 -48.7136 68.9113 -48.9835 71.2627 -50.881C72.1706 -51.1386 72.784 -51.1222 73.0334 -50.8278C73.6305 -50.1449 72.6245 -47.8712 71.9825 -46.4767L71.8966 -46.2886C71.7126 -45.8796 71.5572 -45.5198 71.4549 -45.2417C71.3048 -44.7887 71.1819 -44.3271 71.0869 -43.8595L71.046 -43.7C70.9397 -43.2542 70.8211 -42.7471 70.6616 -42.2319C70.1408 -40.6339 69.5207 -39.0701 68.805 -37.5495L68.7109 -37.3369C68.214 -36.3181 67.8036 -35.2592 67.4841 -34.1717C67.2633 -33.0021 67.5904 -31.5585 67.938 -30.0332L67.9707 -29.8737C68.2982 -28.7227 68.4849 -27.5363 68.5269 -26.3404C68.5024 -24.9541 67.709 -23.531 66.9484 -22.157L66.9239 -22.112C66.1632 -20.7461 65.4435 -19.4539 65.5703 -18.3129C65.6684 -17.4419 66.5681 -16.4809 67.615 -15.3522C69.3693 -13.4711 71.3568 -11.3446 69.905 -9.25492C68.9236 -7.84407 67.1978 -7.79499 65.3658 -7.74183Z" stroke="#364152" stroke-width="0.147239" stroke-miterlimit="10"/>
+<path d="M2 0.5H48.793V42.5H2C1.17157 42.5 0.5 41.8284 0.5 41V2C0.500001 1.17157 1.17157 0.5 2 0.5Z" stroke="#334670"/>
+<path d="M30.5458 20.9262L28.1825 21.5047L26.8355 19.1625L26.0024 17.7198L25.0636 16.1084L22.8811 12.3351H19.3538L10.5251 27.599L12.2923 30.6438H13.6323V32.986H11.6094C11.4044 32.9854 11.2032 32.9312 11.0257 32.8289C10.8483 32.7266 10.7008 32.5797 10.5979 32.4028L8.15721 28.1869C8.05422 28.0089 8 27.8069 8 27.6013C8 27.3958 8.05422 27.1938 8.15721 27.0158L17.6641 10.5832C17.767 10.4063 17.9145 10.2594 18.092 10.1571C18.2695 10.0547 18.4707 10.0006 18.6756 10H23.557C23.7619 10.0006 23.9631 10.0547 24.1406 10.1571C24.3181 10.2594 24.4656 10.4063 24.5685 10.5832L27.7648 16.1037L28.1825 16.8438L29.1213 18.4529L29.539 19.1742L30.5458 20.9262Z" fill="url(#paint0_linear_3331_3738)"/>
+<path d="M20.7057 26.8917L17.5117 32.4122C17.4091 32.5895 17.2617 32.7369 17.0842 32.8396C16.9068 32.9424 16.7054 32.9969 16.5002 32.9977H13.6324L10.5182 27.6107L12.2853 30.6555H15.8056L19.3398 24.5472L20.7057 26.8917Z" fill="url(#paint1_linear_3331_3738)"/>
+<path d="M30.5458 22.0903L28.1051 26.3061C28.0026 26.4835 27.8552 26.6309 27.6777 26.7336C27.5002 26.8364 27.2988 26.8909 27.0937 26.8917H24.2399L23.3012 25.2803L22.8835 24.5589H26.4037L28.1685 21.5141L27.8329 20.9332H30.5294C30.6323 21.1082 30.6879 21.3068 30.6908 21.5096C30.6937 21.7124 30.6437 21.9125 30.5458 22.0903Z" fill="url(#paint2_linear_3331_3738)"/>
+<path d="M37.0182 12.3468H33.4839L29.9637 18.4528L28.6166 16.1106L31.813 10.5902C31.9159 10.4133 32.0634 10.2663 32.2408 10.164C32.4183 10.0617 32.6195 10.0075 32.8245 10.007H35.6688L37.0182 12.3468Z" fill="url(#paint3_linear_3331_3738)"/>
+<path d="M41.144 15.9842L31.6394 32.4145C31.5368 32.5918 31.3895 32.7392 31.212 32.8419C31.0345 32.9447 30.8331 32.9992 30.6279 33H25.7466C25.5414 32.9992 25.34 32.9447 25.1626 32.8419C24.9851 32.7392 24.8377 32.5918 24.7351 32.4145L21.9565 27.613L21.1234 26.1703L20.1846 24.5589L19.7669 23.8375L18.7554 22.0879L21.1163 21.5023L22.4657 23.8445L22.8835 24.5659L23.3012 25.2873L24.2399 26.8987L24.6553 27.6177L26.0047 29.9599L26.4225 30.6813H29.9427L38.7737 15.4151L37.0089 12.3702H35.7018L35.6595 10.0281H37.6825C37.8874 10.0287 38.0886 10.0828 38.2661 10.1851C38.4435 10.2875 38.5911 10.4344 38.6939 10.6113L41.1346 14.8272C41.2365 15.0027 41.2909 15.2016 41.2925 15.4044C41.2941 15.6073 41.243 15.807 41.144 15.9842Z" fill="url(#paint4_linear_3331_3738)"/>
+<path d="M22.8881 18.4529L21.1233 21.4977L21.4613 22.0833H18.7624C18.6594 21.9053 18.6052 21.7033 18.6052 21.4977C18.6052 21.2922 18.6594 21.0902 18.7624 20.9122L21.2031 16.6963C21.3059 16.5186 21.4537 16.371 21.6316 16.2683C21.8095 16.1655 22.0114 16.1112 22.2169 16.1108H25.073L26.0117 17.7222L26.4295 18.4436L22.8881 18.4529Z" fill="url(#paint5_linear_3331_3738)"/>
+<mask id="path-32-inside-1_3331_3738" fill="white">
+<path d="M49.2926 0H226.293C227.397 0 228.293 0.895431 228.293 2V41C228.293 42.1046 227.397 43 226.293 43H49.2926V0Z"/>
+</mask>
+<path d="M49.2926 -1H226.293C227.949 -1 229.293 0.343146 229.293 2H227.293C227.293 1.44772 226.845 1 226.293 1H49.2926V-1ZM229.293 41C229.293 42.6569 227.949 44 226.293 44H49.2926V42H226.293C226.845 42 227.293 41.5523 227.293 41H229.293ZM49.2926 43V0V43ZM226.293 -1C227.949 -1 229.293 0.343146 229.293 2V41C229.293 42.6569 227.949 44 226.293 44V42C226.845 42 227.293 41.5523 227.293 41V2C227.293 1.44772 226.845 1 226.293 1V-1Z" fill="#334670" mask="url(#path-32-inside-1_3331_3738)"/>
+<path d="M64.3381 27H60.571V15.3636H64.4574C65.5975 15.3636 66.5767 15.5966 67.3949 16.0625C68.2131 16.5246 68.84 17.1894 69.2756 18.0568C69.715 18.9205 69.9346 19.9564 69.9346 21.1648C69.9346 22.3769 69.7131 23.4186 69.2699 24.2898C68.8305 25.161 68.1941 25.8314 67.3608 26.3011C66.5275 26.767 65.5199 27 64.3381 27ZM62.3267 25.4659H64.2415C65.1278 25.4659 65.8646 25.2992 66.4517 24.9659C67.0388 24.6288 67.4782 24.142 67.7699 23.5057C68.0615 22.8655 68.2074 22.0852 68.2074 21.1648C68.2074 20.2519 68.0615 19.4773 67.7699 18.8409C67.482 18.2045 67.0521 17.7216 66.4801 17.392C65.9081 17.0625 65.1979 16.8977 64.3494 16.8977H62.3267V25.4659ZM75.7429 27.1761C74.883 27.1761 74.1425 26.9924 73.5213 26.625C72.9039 26.2538 72.4266 25.733 72.0895 25.0625C71.7561 24.3883 71.5895 23.5985 71.5895 22.6932C71.5895 21.7992 71.7561 21.0114 72.0895 20.3295C72.4266 19.6477 72.8963 19.1155 73.4986 18.733C74.1046 18.3504 74.813 18.1591 75.6236 18.1591C76.116 18.1591 76.5933 18.2405 77.0554 18.4034C77.5175 18.5663 77.9323 18.822 78.2997 19.1705C78.6671 19.5189 78.9569 19.9716 79.169 20.5284C79.3811 21.0814 79.4872 21.7538 79.4872 22.5455V23.1477H72.5497V21.875H77.8224C77.8224 21.428 77.7315 21.0322 77.5497 20.6875C77.3679 20.339 77.1122 20.0644 76.7827 19.8636C76.4569 19.6629 76.0743 19.5625 75.6349 19.5625C75.1577 19.5625 74.741 19.6799 74.3849 19.9148C74.0327 20.1458 73.7599 20.4489 73.5668 20.8239C73.3774 21.1951 73.2827 21.5985 73.2827 22.0341V23.0284C73.2827 23.6117 73.3849 24.108 73.5895 24.517C73.7978 24.9261 74.0876 25.2386 74.4588 25.4545C74.83 25.6667 75.2637 25.7727 75.7599 25.7727C76.0819 25.7727 76.3755 25.7273 76.6406 25.6364C76.9058 25.5417 77.1349 25.4015 77.3281 25.2159C77.5213 25.0303 77.669 24.8011 77.7713 24.5284L79.3793 24.8182C79.2505 25.2917 79.0194 25.7064 78.6861 26.0625C78.3565 26.4148 77.9418 26.6894 77.4418 26.8864C76.9455 27.0795 76.3793 27.1761 75.7429 27.1761ZM81.3721 30.2727V18.2727H83.0312V19.6875H83.1733C83.2718 19.5057 83.4138 19.2955 83.5994 19.0568C83.785 18.8182 84.0426 18.6098 84.3721 18.4318C84.7017 18.25 85.1373 18.1591 85.679 18.1591C86.3835 18.1591 87.0123 18.3371 87.5653 18.6932C88.1184 19.0492 88.5521 19.5625 88.8665 20.233C89.1846 20.9034 89.3437 21.7102 89.3437 22.6534C89.3437 23.5966 89.1865 24.4053 88.8721 25.0795C88.5578 25.75 88.1259 26.267 87.5767 26.6307C87.0275 26.9905 86.4006 27.1705 85.696 27.1705C85.1657 27.1705 84.732 27.0814 84.3949 26.9034C84.0615 26.7254 83.8002 26.517 83.6108 26.2784C83.4214 26.0398 83.2756 25.8277 83.1733 25.642H83.071V30.2727H81.3721ZM83.0369 22.6364C83.0369 23.25 83.1259 23.7879 83.304 24.25C83.482 24.7121 83.7396 25.0739 84.0767 25.3352C84.4138 25.5928 84.8267 25.7216 85.3153 25.7216C85.8229 25.7216 86.2471 25.5871 86.5881 25.3182C86.929 25.0455 87.1865 24.6761 87.3608 24.2102C87.5388 23.7443 87.6278 23.2197 87.6278 22.6364C87.6278 22.0606 87.5407 21.5436 87.3665 21.0852C87.196 20.6269 86.9384 20.2652 86.5937 20C86.2528 19.7348 85.8267 19.6023 85.3153 19.6023C84.8229 19.6023 84.4062 19.7292 84.0653 19.983C83.7282 20.2367 83.4725 20.5909 83.2983 21.0455C83.124 21.5 83.0369 22.0303 83.0369 22.6364ZM92.946 15.3636V27H91.2471V15.3636H92.946ZM98.9077 27.1761C98.0895 27.1761 97.3755 26.9886 96.7656 26.6136C96.1558 26.2386 95.6823 25.714 95.3452 25.0398C95.008 24.3655 94.8395 23.5777 94.8395 22.6761C94.8395 21.7708 95.008 20.9792 95.3452 20.3011C95.6823 19.6231 96.1558 19.0966 96.7656 18.7216C97.3755 18.3466 98.0895 18.1591 98.9077 18.1591C99.7258 18.1591 100.44 18.3466 101.05 18.7216C101.66 19.0966 102.133 19.6231 102.47 20.3011C102.807 20.9792 102.976 21.7708 102.976 22.6761C102.976 23.5777 102.807 24.3655 102.47 25.0398C102.133 25.714 101.66 26.2386 101.05 26.6136C100.44 26.9886 99.7258 27.1761 98.9077 27.1761ZM98.9133 25.75C99.4436 25.75 99.883 25.6098 100.232 25.3295C100.58 25.0492 100.838 24.6761 101.004 24.2102C101.175 23.7443 101.26 23.2311 101.26 22.6705C101.26 22.1136 101.175 21.6023 101.004 21.1364C100.838 20.6667 100.58 20.2898 100.232 20.0057C99.883 19.7216 99.4436 19.5795 98.9133 19.5795C98.3793 19.5795 97.9361 19.7216 97.5838 20.0057C97.2353 20.2898 96.9758 20.6667 96.8054 21.1364C96.6387 21.6023 96.5554 22.1136 96.5554 22.6705C96.5554 23.2311 96.6387 23.7443 96.8054 24.2102C96.9758 24.6761 97.2353 25.0492 97.5838 25.3295C97.9361 25.6098 98.3793 25.75 98.9133 25.75ZM105.649 30.2727C105.395 30.2727 105.164 30.2519 104.956 30.2102C104.748 30.1723 104.592 30.1307 104.49 30.0852L104.899 28.6932C105.21 28.7765 105.486 28.8125 105.729 28.8011C105.971 28.7898 106.185 28.6989 106.371 28.5284C106.56 28.358 106.727 28.0795 106.871 27.6932L107.081 27.1136L103.888 18.2727H105.706L107.916 25.0455H108.007L110.217 18.2727H112.041L108.445 28.1648C108.278 28.6193 108.066 29.0038 107.808 29.3182C107.551 29.6364 107.244 29.875 106.888 30.0341C106.532 30.1932 106.119 30.2727 105.649 30.2727ZM121.946 18.2727V19.6364H117.179V18.2727H121.946ZM118.457 16.1818H120.156V24.4375C120.156 24.767 120.205 25.0152 120.304 25.1818C120.402 25.3447 120.529 25.4564 120.685 25.517C120.844 25.5739 121.016 25.6023 121.202 25.6023C121.338 25.6023 121.457 25.5928 121.56 25.5739C121.662 25.5549 121.741 25.5398 121.798 25.5284L122.105 26.9318C122.007 26.9697 121.866 27.0076 121.685 27.0455C121.503 27.0871 121.276 27.1098 121.003 27.1136C120.556 27.1212 120.139 27.0417 119.753 26.875C119.366 26.7083 119.054 26.4508 118.815 26.1023C118.577 25.7538 118.457 25.3163 118.457 24.7898V16.1818ZM127.408 27.1761C126.589 27.1761 125.875 26.9886 125.266 26.6136C124.656 26.2386 124.182 25.714 123.845 25.0398C123.508 24.3655 123.339 23.5777 123.339 22.6761C123.339 21.7708 123.508 20.9792 123.845 20.3011C124.182 19.6231 124.656 19.0966 125.266 18.7216C125.875 18.3466 126.589 18.1591 127.408 18.1591C128.226 18.1591 128.94 18.3466 129.55 18.7216C130.16 19.0966 130.633 19.6231 130.97 20.3011C131.307 20.9792 131.476 21.7708 131.476 22.6761C131.476 23.5777 131.307 24.3655 130.97 25.0398C130.633 25.714 130.16 26.2386 129.55 26.6136C128.94 26.9886 128.226 27.1761 127.408 27.1761ZM127.413 25.75C127.944 25.75 128.383 25.6098 128.732 25.3295C129.08 25.0492 129.338 24.6761 129.504 24.2102C129.675 23.7443 129.76 23.2311 129.76 22.6705C129.76 22.1136 129.675 21.6023 129.504 21.1364C129.338 20.6667 129.08 20.2898 128.732 20.0057C128.383 19.7216 127.944 19.5795 127.413 19.5795C126.879 19.5795 126.436 19.7216 126.084 20.0057C125.735 20.2898 125.476 20.6667 125.305 21.1364C125.139 21.6023 125.055 22.1136 125.055 22.6705C125.055 23.2311 125.139 23.7443 125.305 24.2102C125.476 24.6761 125.735 25.0492 126.084 25.3295C126.436 25.6098 126.879 25.75 127.413 25.75ZM147.135 15.3636V27H145.521L139.607 18.4659H139.499V27H137.743V15.3636H139.368L145.288 23.9091H145.396V15.3636H147.135ZM153.236 27.1761C152.418 27.1761 151.704 26.9886 151.094 26.6136C150.484 26.2386 150.01 25.714 149.673 25.0398C149.336 24.3655 149.168 23.5777 149.168 22.6761C149.168 21.7708 149.336 20.9792 149.673 20.3011C150.01 19.6231 150.484 19.0966 151.094 18.7216C151.704 18.3466 152.418 18.1591 153.236 18.1591C154.054 18.1591 154.768 18.3466 155.378 18.7216C155.988 19.0966 156.461 19.6231 156.798 20.3011C157.135 20.9792 157.304 21.7708 157.304 22.6761C157.304 23.5777 157.135 24.3655 156.798 25.0398C156.461 25.714 155.988 26.2386 155.378 26.6136C154.768 26.9886 154.054 27.1761 153.236 27.1761ZM153.241 25.75C153.772 25.75 154.211 25.6098 154.56 25.3295C154.908 25.0492 155.166 24.6761 155.332 24.2102C155.503 23.7443 155.588 23.2311 155.588 22.6705C155.588 22.1136 155.503 21.6023 155.332 21.1364C155.166 20.6667 154.908 20.2898 154.56 20.0057C154.211 19.7216 153.772 19.5795 153.241 19.5795C152.707 19.5795 152.264 19.7216 151.912 20.0057C151.563 20.2898 151.304 20.6667 151.134 21.1364C150.967 21.6023 150.884 22.1136 150.884 22.6705C150.884 23.2311 150.967 23.7443 151.134 24.2102C151.304 24.6761 151.563 25.0492 151.912 25.3295C152.264 25.6098 152.707 25.75 153.241 25.75ZM159.2 27V18.2727H160.842V19.6591H160.933C161.092 19.1894 161.373 18.8201 161.774 18.5511C162.179 18.2784 162.638 18.142 163.149 18.142C163.255 18.142 163.38 18.1458 163.524 18.1534C163.672 18.161 163.787 18.1705 163.871 18.1818V19.8068C163.803 19.7879 163.681 19.767 163.507 19.7443C163.333 19.7178 163.159 19.7045 162.984 19.7045C162.583 19.7045 162.225 19.7898 161.911 19.9602C161.6 20.1269 161.354 20.3598 161.172 20.6591C160.99 20.9545 160.899 21.2917 160.899 21.6705V27H159.2ZM169.93 18.2727V19.6364H165.163V18.2727H169.93ZM166.442 16.1818H168.141V24.4375C168.141 24.767 168.19 25.0152 168.288 25.1818C168.387 25.3447 168.514 25.4564 168.669 25.517C168.828 25.5739 169 25.6023 169.186 25.6023C169.322 25.6023 169.442 25.5928 169.544 25.5739C169.646 25.5549 169.726 25.5398 169.783 25.5284L170.089 26.9318C169.991 26.9697 169.851 27.0076 169.669 27.0455C169.487 27.0871 169.26 27.1098 168.987 27.1136C168.54 27.1212 168.124 27.0417 167.737 26.875C167.351 26.7083 167.038 26.4508 166.8 26.1023C166.561 25.7538 166.442 25.3163 166.442 24.7898V16.1818ZM173.696 21.8182V27H171.997V15.3636H173.673V19.6932H173.781C173.986 19.2235 174.298 18.8504 174.719 18.5739C175.139 18.2973 175.688 18.1591 176.366 18.1591C176.965 18.1591 177.488 18.2822 177.935 18.5284C178.385 18.7746 178.734 19.142 178.98 19.6307C179.23 20.1155 179.355 20.7216 179.355 21.4489V27H177.656V21.6534C177.656 21.0133 177.491 20.517 177.162 20.1648C176.832 19.8087 176.374 19.6307 175.787 19.6307C175.385 19.6307 175.026 19.7159 174.707 19.8864C174.393 20.0568 174.145 20.3068 173.963 20.6364C173.785 20.9621 173.696 21.3561 173.696 21.8182ZM185.776 18.2727V19.6364H180.844V18.2727H185.776ZM182.196 27V17.2614C182.196 16.7159 182.315 16.2633 182.554 15.9034C182.793 15.5398 183.109 15.2689 183.503 15.0909C183.897 14.9091 184.325 14.8182 184.787 14.8182C185.128 14.8182 185.419 14.8466 185.662 14.9034C185.904 14.9564 186.084 15.0057 186.202 15.0511L185.804 16.4261C185.724 16.4034 185.622 16.3769 185.497 16.3466C185.372 16.3125 185.221 16.2955 185.043 16.2955C184.63 16.2955 184.334 16.3977 184.156 16.6023C183.982 16.8068 183.895 17.1023 183.895 17.4886V27H182.196ZM189.227 15.3636V27H187.528V15.3636H189.227ZM194.053 27.1932C193.5 27.1932 193 27.0909 192.553 26.8864C192.106 26.678 191.751 26.3769 191.49 25.983C191.232 25.589 191.104 25.1061 191.104 24.5341C191.104 24.0417 191.198 23.6364 191.388 23.3182C191.577 23 191.833 22.7481 192.155 22.5625C192.477 22.3769 192.837 22.2367 193.234 22.142C193.632 22.0473 194.037 21.9754 194.45 21.9261C194.973 21.8655 195.397 21.8163 195.723 21.7784C196.049 21.7367 196.286 21.6705 196.433 21.5795C196.581 21.4886 196.655 21.3409 196.655 21.1364V21.0966C196.655 20.6004 196.515 20.2159 196.234 19.9432C195.958 19.6705 195.545 19.5341 194.996 19.5341C194.424 19.5341 193.973 19.661 193.643 19.9148C193.318 20.1648 193.092 20.4432 192.967 20.75L191.371 20.3864C191.56 19.8561 191.837 19.428 192.2 19.1023C192.568 18.7727 192.99 18.5341 193.467 18.3864C193.945 18.2348 194.446 18.1591 194.973 18.1591C195.321 18.1591 195.691 18.2008 196.081 18.2841C196.475 18.3636 196.842 18.5114 197.183 18.7273C197.528 18.9432 197.81 19.2519 198.03 19.6534C198.25 20.0511 198.359 20.5682 198.359 21.2045V27H196.7V25.8068H196.632C196.522 26.0265 196.357 26.2424 196.138 26.4545C195.918 26.6667 195.636 26.8428 195.291 26.983C194.946 27.1231 194.534 27.1932 194.053 27.1932ZM194.422 25.8295C194.892 25.8295 195.293 25.7367 195.626 25.5511C195.964 25.3655 196.219 25.1231 196.393 24.8239C196.571 24.5208 196.661 24.197 196.661 23.8523V22.7273C196.6 22.7879 196.482 22.8447 196.308 22.8977C196.138 22.947 195.943 22.9905 195.723 23.0284C195.503 23.0625 195.289 23.0947 195.081 23.125C194.873 23.1515 194.698 23.1742 194.558 23.1932C194.229 23.2348 193.928 23.3049 193.655 23.4034C193.386 23.5019 193.17 23.6439 193.007 23.8295C192.848 24.0114 192.768 24.2538 192.768 24.5568C192.768 24.9773 192.924 25.2955 193.234 25.5114C193.545 25.7235 193.941 25.8295 194.422 25.8295ZM202.321 21.8182V27H200.622V18.2727H202.253V19.6932H202.361C202.562 19.2311 202.876 18.8598 203.304 18.5795C203.736 18.2992 204.279 18.1591 204.935 18.1591C205.529 18.1591 206.05 18.2841 206.497 18.5341C206.944 18.7803 207.291 19.1477 207.537 19.6364C207.783 20.125 207.906 20.7292 207.906 21.4489V27H206.207V21.6534C206.207 21.0208 206.043 20.5265 205.713 20.1705C205.384 19.8106 204.931 19.6307 204.355 19.6307C203.961 19.6307 203.611 19.7159 203.304 19.8864C203.001 20.0568 202.76 20.3068 202.582 20.6364C202.408 20.9621 202.321 21.3561 202.321 21.8182ZM211.747 24.0398L211.736 21.9659H212.031L215.509 18.2727H217.543L213.577 22.4773H213.31L211.747 24.0398ZM210.185 27V15.3636H211.884V27H210.185ZM215.696 27L212.571 22.8523L213.741 21.6648L217.781 27H215.696Z" fill="white"/>
+<path d="M49 45L49 -1" stroke="url(#paint6_linear_3331_3738)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_3331_3738" x1="7.22083" y1="26.5685" x2="27.1466" y2="15.0412" gradientUnits="userSpaceOnUse">
+<stop offset="0.2" stop-color="#668CFF"/>
+<stop offset="0.49" stop-color="#00AAFF"/>
+<stop offset="0.8" stop-color="#00BFB5"/>
+</linearGradient>
+<linearGradient id="paint1_linear_3331_3738" x1="12.4778" y1="30.9905" x2="20.4185" y2="26.3956" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="#668CFF"/>
+<stop offset="1" stop-color="#00AAFF" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3331_3738" x1="23.7917" y1="26.1211" x2="31.1041" y2="21.8903" gradientUnits="userSpaceOnUse">
+<stop stop-color="#00AAFF" stop-opacity="0"/>
+<stop offset="0.4" stop-color="#00BFB5"/>
+</linearGradient>
+<linearGradient id="paint3_linear_3331_3738" x1="28.4383" y1="15.8389" x2="36.379" y2="11.2464" gradientUnits="userSpaceOnUse">
+<stop stop-color="#00BFB5" stop-opacity="0"/>
+<stop offset="0.5" stop-color="#00CC7C"/>
+</linearGradient>
+<linearGradient id="paint4_linear_3331_3738" x1="22.1442" y1="27.9386" x2="42.0676" y2="16.4137" gradientUnits="userSpaceOnUse">
+<stop offset="0.2" stop-color="#00AAFF"/>
+<stop offset="0.51" stop-color="#00BFB5"/>
+<stop offset="0.8" stop-color="#00CC7C"/>
+</linearGradient>
+<linearGradient id="paint5_linear_3331_3738" x1="18.1968" y1="21.1136" x2="25.5116" y2="16.8805" gradientUnits="userSpaceOnUse">
+<stop offset="0.6" stop-color="#00AAFF"/>
+<stop offset="1" stop-color="#00BFB5" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint6_linear_3331_3738" x1="48.5" y1="45" x2="48.5" y2="-1" gradientUnits="userSpaceOnUse">
+<stop stop-color="#425AA3"/>
+<stop offset="0.283654" stop-color="#425AA3"/>
+<stop offset="0.504808" stop-color="#01B2E1"/>
+<stop offset="0.725962" stop-color="#01C987"/>
+<stop offset="1" stop-color="#01C987" stop-opacity="0.75"/>
+</linearGradient>
+<clipPath id="clip0_3331_3738">
+<rect width="228.293" height="43" rx="2" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/docs/mint.json b/docs/mint.json
index c7aa3d45b87a4e..5ac640a68a5812 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -140,6 +140,7 @@
         "self-hosting/deployments/azure",
         "self-hosting/deployments/elestio",
         "self-hosting/deployments/gcp",
+        "self-hosting/deployments/northflank",
         "self-hosting/deployments/railway",
         "self-hosting/deployments/render",
         "self-hosting/deployments/vercel"
@@ -209,17 +210,19 @@
           "group": "Atoms",
           "icon": "atom",
           "pages": [
-            "platform/atoms/cal-provider",
-            "platform/atoms/google-calendar-connect",
-            "platform/atoms/outlook-calendar-connect",
             "platform/atoms/apple-calendar-connect",
             "platform/atoms/availability-settings",
             "platform/atoms/booker",
-            "platform/atoms/event-type",
+            "platform/atoms/cal-provider",
             "platform/atoms/calendar-settings",
-            "platform/atoms/payment-form",
+            "platform/atoms/calendar-view",
             "platform/atoms/conferencing-apps",
-            "platform/atoms/calendar-view"
+            "platform/atoms/create-schedule",
+            "platform/atoms/event-type",
+            "platform/atoms/google-calendar-connect",
+            "platform/atoms/list-schedules",
+            "platform/atoms/outlook-calendar-connect",
+            "platform/atoms/payment-form"
           ]
         },
         {
diff --git a/docs/platform/atoms/calendar-view.mdx b/docs/platform/atoms/calendar-view.mdx
index 52bd1a063ed96d..2531ae0ce940e4 100644
--- a/docs/platform/atoms/calendar-view.mdx
+++ b/docs/platform/atoms/calendar-view.mdx
@@ -30,7 +30,7 @@ import { CalendarView } from "@calcom/atoms";
 export default function Booker( props : BookerProps ) {
   return (
     <div>
-       <CalendarView isTeamEvent={true} teamId={props.teamId} eventSlug={props.eventSlug} />
+       <CalendarView teamId={props.teamId} eventSlug={props.eventSlug} />
     </div>
   )
 }
@@ -55,7 +55,6 @@ Below is a list of props that can be passed to the create event type atom
 
 | Name                       | Required | Description                                                                                           |
 |:----------------------------|:----------|:-------------------------------------------------------------------------------------------------------|
-| username                   | Yes      | Username of the person whose schedule is to be displayed                                              |
-| eventSlug                  | Yes      | Unique slug created for a particular event                                                            |                                                |
-| isTeamEvent                | No       | Boolean indicating if it is a team event, to be passed only for team events                                                                     |
-| teamId                | No       | The id of the team for which the event is created, to be passed only for team events                                                                     |
\ No newline at end of file
+| eventSlug                  | Yes      | Unique slug created for a particular event                                                            |   
+| username                   | Optional     | Username of the person whose schedule is to be displayed, required only for individual events                                          |                                             |                                        |
+| teamId                | Optional       | Id of the team for which the event is created, required only for team events                                                                     |
\ No newline at end of file
diff --git a/docs/platform/atoms/create-schedule.mdx b/docs/platform/atoms/create-schedule.mdx
new file mode 100644
index 00000000000000..f780889bdfb739
--- /dev/null
+++ b/docs/platform/atoms/create-schedule.mdx
@@ -0,0 +1,127 @@
+---
+title: "Create schedule"
+---
+
+The Create Schedule atom provides a simple dialog interface for users to create new availability
+schedules. Fully customizable with callback support for handling successful schedule creation.
+
+Below code snippet can be used to render the Create schedule atom
+
+```js
+import { CreateSchedule } from "@calcom/atoms";
+
+export default function CreateSchedule() {
+  return (
+    <>
+      <CreateSchedule
+        name="Create new schedule"
+        customClassNames={{
+          createScheduleButton: "bg-red-500 border-none my-4 mx-2 rounded-md",
+        }}
+      />
+    </>
+  )
+}
+```
+
+For a demonstration of the Create schedule atom, please refer to the video below.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/2d80dd0dddb64c6fb755b00091bdbced?sid=540f2e02-085e-4240-8b64-ca269cf2bb08"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+For developers who don't want the dialog-based interface, we provide a `CreateScheduleForm` atom to integrate the schedule
+creation form directly into your own UI. This headless approach gives you full flexibility to
+handle layout, styling, and user flow exactly how you need it.
+
+Below code snippet can be used to render the Create schedule form atom
+
+```js
+import { CreateScheduleForm } from "@calcom/atoms";
+
+export default function CreateScheduleForm() {
+  return (
+    <>
+      <CreateScheduleForm
+        customClassNames={{
+          atomsWrapper: "border-black border-[1px] w-[500px] my-10 mx-5 rounded-md px-5 py-5",
+          buttons: {
+            continue: "bg-red-400 border-none",
+            container: "justify-start",
+          },
+        }}
+      />
+    </>
+  )
+}
+```
+
+For a demonstration of the Create schedule form, please refer to the video below.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/6f019f1ba49a43439032d2d6b434c17c?sid=448e105f-14f2-4735-979d-30470e7c10d1"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+We offer all kinds of customizations to the Create schedule atom via props. Below is a list of props that can be passed to the atom.
+
+<p></p>
+
+| Name             | Required | Description                                                              |
+| :--------------- | :------- | :----------------------------------------------------------------------- |
+| name             | No       | The label for the create schedule button                 |
+| customClassNames | No       | To pass in custom classnames from outside for styling the atom                                       |
+| onSuccess        | No       | Callback function that handles successful creation of schedule             |
+| onError          | No       | Callback function to handles errors at the time of schedule creation                          |
+| disableToasts    | No       | Boolean value that determines whether the toasts are displayed or not |
+
+
+Along with the props, create schedule atom accepts custom styles via the **customClassNames** prop. Below is a list of props that fall under this **customClassNames** prop.
+<p></p>
+| Name                      | Description                                                           |
+|:---------------------------|:-----------------------------------------------------------------------|
+| createScheduleButton              | Adds styling to the create button            |
+| inputField              | Adds styling to the container of the name input field               |
+| formWrapper              | Adds styling to the whole form              |
+| actionsButtons              | Object containing classnames for the submit, cancel buttons and container inside the create schedule atom             |
+
+Similar to the create schedule atom, the create schedule form also offer all kinds of customizations via props. Below is a list of props that can be passed to the atom.
+<p></p>
+| customClassNames | No       | To pass in custom classnames from outside for styling the atom                                       |
+| onSuccess        | No       | Callback function that handles successful creation of schedule             |
+| onError          | No       | Callback function to handles errors at the time of schedule creation                          |
+| disableToasts    | No       | Boolean value that determines whether the toasts are displayed or not |
+
+Along with the props, create schedule form also accepts custom styles via the **customClassNames** prop. Below is a list of props that fall under this **customClassNames** prop.
+
+| Name                      | Description                                                           |
+|:---------------------------|:-----------------------------------------------------------------------|
+| formWrapper              | Adds styling to the whole form            |
+| inputField              | Adds styling to the container of the name input field               |
+| actionsButtons              | Object containing classnames for the submit, cancel buttons and container inside the create schedule atom             |
+
+
+<Note>
+  Please ensure all custom classnames are valid Tailwind CSS classnames. Note that sometimes the custom
+  classnames may fail to override the styling with the classnames that you might have passed via props. That
+  is because the clsx utility function that we use to override classnames inside our components has some
+  limitations. A simple get around to solve this issue is to just prefix your classnames with ! property just
+  before passing in any classname.
+</Note>
diff --git a/docs/platform/atoms/event-type.mdx b/docs/platform/atoms/event-type.mdx
index d83a7bdf1e6e6d..536b035e6cf132 100644
--- a/docs/platform/atoms/event-type.mdx
+++ b/docs/platform/atoms/event-type.mdx
@@ -128,6 +128,7 @@ export function EventTypeTabs(eventTypeId: number) {
       <EventTypeSettings
         id={eventTypeId}
         allowDelete={true}
+        tabs={["setup", "limits", "recurring", "advanced", "availability", "team", "payments"]}
         onSuccess={(eventType) => {
           console.log("EventType settings updated successfully", eventType);
         }}
@@ -142,6 +143,19 @@ export function EventTypeTabs(eventTypeId: number) {
 }
 ```
 
+To show only specific tabs, remove the ones you don't want from the array:
+
+```js
+// Example: Show only setup, limits, and availability tabs
+<EventTypeSettings
+  id={eventTypeId}
+  tabs={["setup", "limits", "availability"]}
+  onSuccess={(eventType) => {
+    console.log("EventType settings updated successfully", eventType);
+  }}
+/>
+```
+
 If the `eventTypeId` is of a team event type id, then only the owner or admin of the team can update the event type settings. That means
 you have to create a managed user and then add an accepted membership with an admin or owner role by making a request to the [memberships endpoint](https://cal.com/docs/api-reference/v2/orgs-teams-memberships/create-a-membership). Example body:
 ```js
@@ -176,7 +190,7 @@ Below is a list of props that can be passed to the event type settings atom.
 | Name         | Required | Description                                                                                               |
 |:--------------|:----------|:-----------------------------------------------------------------------------------------------------------|
 | id | Yes       | The event type id obtained at the time of event type creation     
-| tabs | No       | The tabs you want the event type settings to display                                                  |  
+| tabs | No       | Array of tabs to display in the event type settings. Possible values: `["setup", "limits", "recurring", "advanced", "availability", "team", "payments"]`. Remove any tabs you don't want to show. |  
 | onSuccess | No       | Callback function that triggers when the event type is successfully updated                                              |
 | onError   | No       | Callback function to handles errors at the time of event type update |
 | onFormStateChange | No       | Callback function that triggers when the form state changes, providing access to isDirty, dirtyFields, and current form values |
diff --git a/docs/platform/atoms/list-schedules.mdx b/docs/platform/atoms/list-schedules.mdx
new file mode 100644
index 00000000000000..f85688ff88bc3b
--- /dev/null
+++ b/docs/platform/atoms/list-schedules.mdx
@@ -0,0 +1,116 @@
+---
+title: "List schedules"
+---
+
+The List schedules atom displays all of a user's availability schedules and provides management actions such as delete, duplicate, and edit capabilities for each schedule.
+
+Below code snippet can be used to render the List schedules atom
+
+```js
+import { ListSchedules } from "@calcom/atoms";
+
+export default function ListSchedules() {
+  return (
+    <>
+      <ListSchedules getRedirectUrl={(scheduleId) => `/availability/${scheduleId}`} />
+    </>
+  );
+}
+```
+
+For a demonstration of the List schedules atom, please refer to the video below.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/8e020a4848d543548c519d3a7cd532c6?sid=e6ccad23-8372-402a-8fd3-c0180bc9113c"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+Below is a list of props that can be passed to the List schedules atom.
+
+<p></p>
+
+| Name           | Required | Description                                                                                                       |
+| :------------- | :------- | :---------------------------------------------------------------------------------------------------------------- |
+| getRedirectUrl | No       | Callback function that determines where the user should be redirected when they click on a schedule from the atom |
+
+## Combining list schedules atom with availability settings atom
+
+The List schedules atom works best when combined with the Availability settings atom to provide a seamless experience. In order to combine both of atom, here are the steps we recommend:
+
+<Steps>
+    <Step title="Setup list schedules atom"> 
+    Create a page for demostrating the list schedules atom.
+
+    Below code snippet can be used to setup the list schedules atom on a new page
+
+```js
+import { ListSchedules } from "@calcom/atoms";
+
+export default function ListSchedules() {
+  return (
+    <>
+      <ListSchedules getRedirectUrl={(scheduleId) => `/availability/${scheduleId}`} />
+    </>
+  );
+}
+```
+
+`getRedirectUrl` prop is a callback function that determines where the user should be redirected when they click on a schedule from the atom. Say if you want to display your availability settings atom on the page `/availability/:scheduleId`, you need to make sure you return the exact same url when you call the `getRedirectUrl` function.
+
+    </Step>
+    <Step title="Setup availability settings atom">
+    Create a page for demonstrating the availability settings atom. This should be a dynamic route that accepts a schedule id as a query parameter, and then the schedule id gets passed to the availability settings atom.
+
+      Below code snippet can be used to obtain the `scheduleId` and display the availability settings atom
+
+```js
+import { AvailabilitySettings } from "@calcom/atoms";
+import { useRouter } from "next/router";
+
+export default function Availability() {
+  const router = useRouter();
+
+  return (
+    <>
+       <AvailabilitySettings
+          id={router.query.scheduleId as string}
+          onUpdateSuccess={() => {
+            console.log("Updated schedule successfully");
+          }}
+       />
+    </>
+  )
+}
+```
+
+    </Step>
+
+</Steps>
+
+-Below video shows a demonstration of how we combined the list schedules atom and availability settings atom in one of our example app to create a seamless availability management experience.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/76b65330e61e47eb95b7072ed3a42ec8?sid=9373ec6f-ba55-431e-98de-5dd3fb252a8a"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+<Info>
+  Link to the example app can be found
+  [here](https://github.com/calcom/cal.com/tree/main/packages/platform/examples/base)
+</Info>
diff --git a/docs/self-hosting/deployments/northflank.mdx b/docs/self-hosting/deployments/northflank.mdx
new file mode 100644
index 00000000000000..269f816788745a
--- /dev/null
+++ b/docs/self-hosting/deployments/northflank.mdx
@@ -0,0 +1,13 @@
+---
+title: "Northflank"
+icon: "square-n"
+---
+
+You can deploy Cal.com on Northflank using the button below. 
+The team at Northflank also have a [detailed blog post](https://northflank.com/guides/deploy-calcom-with-northflank) on deploying Cal.com on their platform.
+
+## One Click Deployment
+
+<a href="https://northflank.com/stacks/deploy-calcom" target="_blank">
+<img src="/images/deploy-northflank.svg" noZoom alt="Deploy on Northflank" />
+</a>
\ No newline at end of file
diff --git a/infra/README.md b/infra/README.md
deleted file mode 100644
index b1a7194a918190..00000000000000
--- a/infra/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## Infrastructure Folder
-
-This folder, located within the "infra" directory of our monorepo, is dedicated to managing the infrastructure as code (IaC) and Docker-related files for our project. It plays a critical role in orchestrating, configuring, and maintaining the infrastructure that our applications rely on.
diff --git a/infra/docker/api/Dockerfile b/infra/docker/api/Dockerfile
deleted file mode 100644
index 15f17b8ba5b99e..00000000000000
--- a/infra/docker/api/Dockerfile
+++ /dev/null
@@ -1,73 +0,0 @@
-# syntax = docker/dockerfile:1
-
-# Adjust NODE_VERSION as desired
-ARG NODE_VERSION=20.7.0
-FROM node:${NODE_VERSION}-slim as base
-
-ARG DATABASE_URL
-
-# Next.js/Prisma app lives here
-WORKDIR /app
-
-# Set production environment
-ENV NODE_ENV="production" \
-    DATABASE_URL=$DATABASE_URL \
-    DATABASE_DIRECT_URL=$DATABASE_URL
-
-# Throw-away build stage to reduce size of final image
-FROM base as build
-
-# copy all required files from the monorepo
-COPY package.json yarn.lock .yarnrc.yml playwright.config.ts turbo.json git-init.sh git-setup.sh ./
-COPY /.yarn ./.yarn
-COPY ./apps/api ./apps/api
-COPY ./packages ./packages
-# TODO: follow up pr to remove dependencies on web
-COPY ./apps/web ./apps/web
-COPY ./tests ./tests
-
-# Install node modules and dependencies, prune unneeded deps, then build
-RUN set -eux; \
-    apt-get update -qq && \
-    apt-get install -y build-essential openssl pkg-config python-is-python3 && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists /var/cache/apt/archives && \
-    yarn config set httpTimeout 1200000 && \
-    npx turbo prune --filter=@calcom/web --docker && \
-    npx turbo prune --filter=@calcom/api --docker && \
-    yarn install && \
-    yarn turbo run build --filter=@calcom/api
-
-
-# Final stage
-FROM base
-WORKDIR /app
-
-# Install packages needed for deployment
-RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y openssl && \
-    rm -rf /var/lib/apt/lists /var/cache/apt/archives
-
-# Copy built application
-COPY --from=build /app/package.json ./package.json
-COPY --from=build /app/node_modules ./node_modules
-COPY --from=build /app/apps/api/package.json ./apps/api/package.json
-COPY --from=build /app/apps/api/next-i18next.config.js ./apps/api/next-i18next.config.js
-COPY --from=build /app/apps/api/next.config.js ./apps/api/next.config.js
-COPY --from=build /app/apps/api/tsconfig.json ./apps/api/tsconfig.json
-COPY --from=build /app/apps/api/.next ./apps/api/.next
-COPY --from=build /app/apps/api/.turbo ./apps/api/.turbo
-COPY --from=build /app/turbo.json ./turbo.json
-COPY --from=build /app/yarn.lock ./yarn.lock
-COPY --from=build /app/packages/config ./packages/config
-COPY --from=build /app/packages/tsconfig ./packages/tsconfig
-COPY --from=build /app/packages/types ./packages/types
-COPY --from=build /app/apps/web/next.config.js ./apps/web/next.config.js
-COPY --from=build /app/apps/web/next-i18next.config.js ./apps/web/next-i18next.config.js
-COPY --from=build /app/apps/web/public/static/locales ./apps/web/public/static/locales
-COPY --from=build /app/apps/web/package.json ./apps/web/package.json
-# Expose port 80
-EXPOSE 80
-
-# Start cmd, called when docker image is mounted
-CMD [ "yarn", "workspace", "@calcom/api", "docker-start-api"]
diff --git a/package.json b/package.json
index 2a15906797103d..28c07378cb54a2 100644
--- a/package.json
+++ b/package.json
@@ -77,9 +77,6 @@
     "type-check": "turbo run type-check",
     "type-check:ci": "turbo run type-check:ci --log-prefix=none",
     "web": "yarn workspace @calcom/web",
-    "docker-build-api": "docker build -t cal-api -f ./infra/docker/api/Dockerfile .",
-    "docker-run-api": "docker run -p 80:80 cal-api",
-    "docker-stop-api": "docker ps --filter 'ancestor=cal-api' -q | xargs docker stop",
     "changesets-add": "yarn changeset add",
     "changesets-version": "yarn changeset version",
     "changesets-release": "NODE_OPTIONS='--max_old_space_size=12288' turbo run build --filter=@calcom/atoms && yarn changeset publish",
diff --git a/packages/app-store/_appRegistry.ts b/packages/app-store/_appRegistry.ts
index 439b69e7364add..314f80f448a31a 100644
--- a/packages/app-store/_appRegistry.ts
+++ b/packages/app-store/_appRegistry.ts
@@ -2,7 +2,7 @@ import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
 import { getAppFromSlug } from "@calcom/app-store/utils";
 import { getAllDelegationCredentialsForUser } from "@calcom/app-store/delegationCredential";
 import getInstallCountPerApp from "@calcom/lib/apps/getInstallCountPerApp";
-import type { UserAdminTeams } from "@calcom/lib/server/repository/user";
+import type { UserAdminTeams } from "@calcom/features/users/repositories/UserRepository";
 import prisma, { safeAppSelect, safeCredentialSelect } from "@calcom/prisma";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import type { AppFrontendPayload as App } from "@calcom/types/App";
diff --git a/packages/app-store/_utils/installation.ts b/packages/app-store/_utils/installation.ts
index 4d77769d774032..611155c637b838 100644
--- a/packages/app-store/_utils/installation.ts
+++ b/packages/app-store/_utils/installation.ts
@@ -1,5 +1,5 @@
 import { HttpError } from "@calcom/lib/http-error";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { UserProfile } from "@calcom/types/UserProfile";
diff --git a/packages/app-store/_utils/oauth/getCurrentTokenObject.ts b/packages/app-store/_utils/oauth/getCurrentTokenObject.ts
index 1e6110bf3666f9..a19095f64d2814 100644
--- a/packages/app-store/_utils/oauth/getCurrentTokenObject.ts
+++ b/packages/app-store/_utils/oauth/getCurrentTokenObject.ts
@@ -1,6 +1,6 @@
 import { isInMemoryDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";
 
 import { getTokenObjectFromCredential } from "./getTokenObjectFromCredential";
diff --git a/packages/app-store/_utils/oauth/updateProfilePhotoGoogle.ts b/packages/app-store/_utils/oauth/updateProfilePhotoGoogle.ts
index 5526343d870f64..7a70232c823e0f 100644
--- a/packages/app-store/_utils/oauth/updateProfilePhotoGoogle.ts
+++ b/packages/app-store/_utils/oauth/updateProfilePhotoGoogle.ts
@@ -3,7 +3,7 @@ import type { OAuth2Client } from "googleapis-common";
 
 import logger from "@calcom/lib/logger";
 import { uploadAvatar } from "@calcom/lib/server/avatar";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
 import prisma from "@calcom/prisma";
 
diff --git a/packages/app-store/_utils/oauth/updateTokenObject.ts b/packages/app-store/_utils/oauth/updateTokenObject.ts
index d7ba4ef6032ee4..2ca29cd5970e97 100644
--- a/packages/app-store/_utils/oauth/updateTokenObject.ts
+++ b/packages/app-store/_utils/oauth/updateTokenObject.ts
@@ -1,7 +1,7 @@
 import type z from "zod";
 
 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
diff --git a/packages/app-store/_utils/throwIfNotHaveAdminAccessToTeam.ts b/packages/app-store/_utils/throwIfNotHaveAdminAccessToTeam.ts
index b70e00502330c3..3313029e173187 100644
--- a/packages/app-store/_utils/throwIfNotHaveAdminAccessToTeam.ts
+++ b/packages/app-store/_utils/throwIfNotHaveAdminAccessToTeam.ts
@@ -1,5 +1,5 @@
 import { HttpError } from "@calcom/lib/http-error";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 export const throwIfNotHaveAdminAccessToTeam = async ({
diff --git a/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx b/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx
index 5e79d6945b92bf..800c59506570ad 100644
--- a/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx
+++ b/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx
@@ -2,7 +2,7 @@ import type { GetServerSidePropsContext } from "next";
 import { z } from "zod";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 
 import { btcpayCredentialKeysSchema } from "../../lib/btcpayCredentialKeysSchema";
 
diff --git a/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts b/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
index d3e2719084e9c6..79c7b187c22c97 100644
--- a/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
+++ b/packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
@@ -318,7 +318,7 @@ const DailyVideoApiAdapter = (): VideoApiAdapter => {
               bucket_region: process.env.CAL_VIDEO_BUCKET_REGION,
               assume_role_arn: process.env.CAL_VIDEO_ASSUME_ROLE_ARN,
               allow_api_access: true,
-              allow_streaming_from_bucket: true,
+              allow_streaming_from_bucket: false,
             },
           }),
         enable_transcription_storage: isTranscriptionEnabled,
@@ -367,7 +367,7 @@ const DailyVideoApiAdapter = (): VideoApiAdapter => {
               bucket_region: process.env.CAL_VIDEO_BUCKET_REGION,
               assume_role_arn: process.env.CAL_VIDEO_ASSUME_ROLE_ARN,
               allow_api_access: true,
-              allow_streaming_from_bucket: true,
+              allow_streaming_from_bucket: false,
             },
           }),
         start_video_off: true,
diff --git a/packages/app-store/delegationCredential.test.ts b/packages/app-store/delegationCredential.test.ts
index 26ecbb1b21ac84..37f09eece308e6 100644
--- a/packages/app-store/delegationCredential.test.ts
+++ b/packages/app-store/delegationCredential.test.ts
@@ -4,9 +4,9 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 
 import { metadata as googleCalendarMetadata } from "@calcom/app-store/googlecalendar/_metadata";
 import { metadata as googleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";
-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { SMSLockState, RRTimestampBasis } from "@calcom/prisma/enums";
 import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential";
 
@@ -21,14 +21,14 @@ import {
 } from "./delegationCredential";
 
 // Mock OrganizationRepository
-vi.mock("@calcom/lib/server/repository/organization", () => ({
+vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository", () => ({
   OrganizationRepository: {
     findByMemberEmail: vi.fn(),
   },
 }));
 
 // Mock DelegationCredentialRepository
-vi.mock("@calcom/lib/server/repository/delegationCredential", () => ({
+vi.mock("@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository", () => ({
   DelegationCredentialRepository: {
     findUniqueByOrgMemberEmailIncludeSensitiveServiceAccountKey: vi.fn(),
     findUniqueByOrganizationIdAndDomainIncludeSensitiveServiceAccountKey: vi.fn(),
diff --git a/packages/app-store/delegationCredential.ts b/packages/app-store/delegationCredential.ts
index 94e89568ac39e5..b0bdefb1bf1646 100644
--- a/packages/app-store/delegationCredential.ts
+++ b/packages/app-store/delegationCredential.ts
@@ -10,10 +10,10 @@ import {
 } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
diff --git a/packages/app-store/dub/lib/AnalyticsService.ts b/packages/app-store/dub/lib/AnalyticsService.ts
index 14af8e6b507473..71fd037a8b535b 100644
--- a/packages/app-store/dub/lib/AnalyticsService.ts
+++ b/packages/app-store/dub/lib/AnalyticsService.ts
@@ -1,7 +1,7 @@
 import { Dub } from "dub-package";
 
 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import type { AnalyticsService, SendEventProps } from "@calcom/types/AnalyticsService";
 import type { CredentialPayload } from "@calcom/types/Credential";
 
diff --git a/packages/app-store/getVideoAdapters.ts b/packages/app-store/getVideoAdapters.ts
new file mode 100644
index 00000000000000..137ba354852fd6
--- /dev/null
+++ b/packages/app-store/getVideoAdapters.ts
@@ -0,0 +1,45 @@
+import { VideoApiAdapterMap } from "@calcom/app-store/video.adapters.generated";
+import logger from "@calcom/lib/logger";
+import { getPiiFreeCredential } from "@calcom/lib/piiFreeData";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import type { CredentialPayload } from "@calcom/types/Credential";
+import type { VideoApiAdapter, VideoApiAdapterFactory } from "@calcom/types/VideoApiAdapter";
+
+const log = logger.getSubLogger({ prefix: ["[app-store] getVideoAdapters"] });
+
+// factory
+export const getVideoAdapters = async (withCredentials: CredentialPayload[]): Promise<VideoApiAdapter[]> => {
+  const videoAdapters: VideoApiAdapter[] = [];
+
+  for (const cred of withCredentials) {
+    const appName = cred.type.split("_").join(""); // Transform `zoom_video` to `zoomvideo`;
+    log.silly("Getting video adapter for", safeStringify({ appName, cred: getPiiFreeCredential(cred) }));
+
+    let videoAdapterImport = VideoApiAdapterMap[appName as keyof typeof VideoApiAdapterMap];
+
+    // fallback: transforms zoom_video to zoom
+    if (!videoAdapterImport) {
+      const appTypeVariant = cred.type.substring(0, cred.type.lastIndexOf("_"));
+      log.silly(`Adapter not found for ${appName}, trying fallback ${appTypeVariant}`);
+
+      videoAdapterImport = VideoApiAdapterMap[appTypeVariant as keyof typeof VideoApiAdapterMap];
+    }
+
+    if (!videoAdapterImport) {
+      log.error(`Couldn't get adapter for ${appName}`);
+      continue;
+    }
+
+    const videoAdapterModule = await videoAdapterImport;
+    const makeVideoApiAdapter = videoAdapterModule.default as VideoApiAdapterFactory;
+
+    if (makeVideoApiAdapter) {
+      const videoAdapter = makeVideoApiAdapter(cred);
+      videoAdapters.push(videoAdapter);
+    } else {
+      log.error(`App ${appName} doesn't have a default VideoApiAdapter export`);
+    }
+  }
+
+  return videoAdapters;
+};
diff --git a/packages/app-store/googlecalendar/api/callback.ts b/packages/app-store/googlecalendar/api/callback.ts
index 85c3ba0be6569e..283841c6b58204 100644
--- a/packages/app-store/googlecalendar/api/callback.ts
+++ b/packages/app-store/googlecalendar/api/callback.ts
@@ -14,7 +14,7 @@ import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultHandler } from "@calcom/lib/server/defaultHandler";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { Prisma } from "@calcom/prisma/client";
 
 import getInstalledAppPath from "../../_utils/getInstalledAppPath";
diff --git a/packages/app-store/googlecalendar/lib/CalendarService.ts b/packages/app-store/googlecalendar/lib/CalendarService.ts
index ef3e9c57e217ec..13c331ecf13581 100644
--- a/packages/app-store/googlecalendar/lib/CalendarService.ts
+++ b/packages/app-store/googlecalendar/lib/CalendarService.ts
@@ -466,7 +466,7 @@ export default class GoogleCalendarService implements Calendar {
     args: FreeBusyArgs,
     shouldServeCache?: boolean
   ): Promise<calendar_v3.Schema$FreeBusyResponse> {
-    if (shouldServeCache === false) return await this.fetchAvailability(args);
+    if (!shouldServeCache) return await this.fetchAvailability(args);
     const calendarCache = await CalendarCache.init(null);
     const cached = await calendarCache.getCachedAvailability({
       credentialId: this.credential.id,
diff --git a/packages/app-store/googlecalendar/lib/__tests__/getFreeBusyResult.test.ts b/packages/app-store/googlecalendar/lib/__tests__/getFreeBusyResult.test.ts
new file mode 100644
index 00000000000000..64dfea74c9149b
--- /dev/null
+++ b/packages/app-store/googlecalendar/lib/__tests__/getFreeBusyResult.test.ts
@@ -0,0 +1,135 @@
+import { expect, test, beforeEach, vi, describe } from "vitest";
+import "vitest-fetch-mock";
+
+import CalendarService from "../CalendarService";
+
+describe("GoogleCalendarService.getFreeBusyResult - shouldServeCache logic", () => {
+  let calendarService: CalendarService;
+  let fetchAvailabilitySpy: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    calendarService = {} as CalendarService;
+
+    const mockFetchAvailability = vi.fn().mockResolvedValue({
+      calendars: {
+        "test@example.com": {
+          busy: [
+            {
+              start: "2023-12-01T20:00:00Z",
+              end: "2023-12-01T21:00:00Z",
+            },
+          ],
+        },
+      },
+    });
+
+    calendarService.fetchAvailability = mockFetchAvailability;
+    fetchAvailabilitySpy = mockFetchAvailability;
+
+    calendarService.getFreeBusyResult = CalendarService.prototype.getFreeBusyResult.bind(calendarService);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (calendarService as any).credential = { id: 1, userId: 1 };
+  });
+
+  describe("shouldServeCache parameter handling", () => {
+    test("should call fetchAvailability immediately when shouldServeCache is explicitly false", async () => {
+      const args = {
+        timeMin: new Date().toISOString(),
+        timeMax: new Date().toISOString(),
+        items: [{ id: "test@example.com" }],
+      };
+
+      const result = await calendarService.getFreeBusyResult(args, false);
+
+      expect(fetchAvailabilitySpy).toHaveBeenCalledWith(args);
+      expect(fetchAvailabilitySpy).toHaveBeenCalledTimes(1);
+      expect(result.calendars?.["test@example.com"]?.busy).toEqual([
+        {
+          start: "2023-12-01T20:00:00Z",
+          end: "2023-12-01T21:00:00Z",
+        },
+      ]);
+    });
+
+    test("should call fetchAvailability immediately when shouldServeCache is undefined (falsey)", async () => {
+      const args = {
+        timeMin: new Date().toISOString(),
+        timeMax: new Date().toISOString(),
+        items: [{ id: "test@example.com" }],
+      };
+
+      const result = await calendarService.getFreeBusyResult(args, undefined);
+
+      expect(fetchAvailabilitySpy).toHaveBeenCalledWith(args);
+      expect(fetchAvailabilitySpy).toHaveBeenCalledTimes(1);
+      expect(result.calendars?.["test@example.com"]?.busy).toEqual([
+        {
+          start: "2023-12-01T20:00:00Z",
+          end: "2023-12-01T21:00:00Z",
+        },
+      ]);
+    });
+
+    test("should call fetchAvailability immediately when shouldServeCache is null (falsey)", async () => {
+      const args = {
+        timeMin: new Date().toISOString(),
+        timeMax: new Date().toISOString(),
+        items: [{ id: "test@example.com" }],
+      };
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result = await calendarService.getFreeBusyResult(args, null as any);
+
+      expect(fetchAvailabilitySpy).toHaveBeenCalledWith(args);
+      expect(fetchAvailabilitySpy).toHaveBeenCalledTimes(1);
+      expect(result.calendars?.["test@example.com"]?.busy).toEqual([
+        {
+          start: "2023-12-01T20:00:00Z",
+          end: "2023-12-01T21:00:00Z",
+        },
+      ]);
+    });
+
+    test("should call fetchAvailability immediately when shouldServeCache is 0 (falsey)", async () => {
+      const args = {
+        timeMin: new Date().toISOString(),
+        timeMax: new Date().toISOString(),
+        items: [{ id: "test@example.com" }],
+      };
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result = await calendarService.getFreeBusyResult(args, 0 as any);
+
+      expect(fetchAvailabilitySpy).toHaveBeenCalledWith(args);
+      expect(fetchAvailabilitySpy).toHaveBeenCalledTimes(1);
+      expect(result.calendars?.["test@example.com"]?.busy).toEqual([
+        {
+          start: "2023-12-01T20:00:00Z",
+          end: "2023-12-01T21:00:00Z",
+        },
+      ]);
+    });
+
+    test("should call fetchAvailability immediately when shouldServeCache is empty string (falsey)", async () => {
+      const args = {
+        timeMin: new Date().toISOString(),
+        timeMax: new Date().toISOString(),
+        items: [{ id: "test@example.com" }],
+      };
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result = await calendarService.getFreeBusyResult(args, "" as any);
+
+      expect(fetchAvailabilitySpy).toHaveBeenCalledWith(args);
+      expect(fetchAvailabilitySpy).toHaveBeenCalledTimes(1);
+      expect(result.calendars?.["test@example.com"]?.busy).toEqual([
+        {
+          start: "2023-12-01T20:00:00Z",
+          end: "2023-12-01T21:00:00Z",
+        },
+      ]);
+    });
+  });
+});
diff --git a/packages/app-store/hubspot/lib/CrmService.ts b/packages/app-store/hubspot/lib/CrmService.ts
index 33d7713f4df892..4c75cde94054eb 100644
--- a/packages/app-store/hubspot/lib/CrmService.ts
+++ b/packages/app-store/hubspot/lib/CrmService.ts
@@ -8,8 +8,8 @@ import type {
 } from "@hubspot/api-client/lib/codegen/crm/objects/meetings";
 
 import { getLocation } from "@calcom/lib/CalEventParser";
+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import getLabelValueMapFromResponses from "@calcom/lib/getLabelValueMapFromResponses";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import prisma from "@calcom/prisma";
@@ -21,10 +21,6 @@ import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug";
 import refreshOAuthTokens from "../../_utils/oauth/refreshOAuthTokens";
 import type { HubspotToken } from "../api/callback";
 
-interface CustomPublicObjectInput extends SimplePublicObjectInput {
-  id?: string;
-}
-
 export default class HubspotCalendarService implements CRM {
   private url = "";
   private integrationName = "";
@@ -117,8 +113,14 @@ export default class HubspotCalendarService implements CRM {
     return this.hubspotClient.crm.objects.meetings.basicApi.update(uid, simplePublicObjectInput);
   };
 
-  private hubspotDeleteMeeting = async (uid: string) => {
-    return this.hubspotClient.crm.objects.meetings.basicApi.archive(uid);
+  private hubspotCancelMeeting = async (uid: string) => {
+    const simplePublicObjectInput: SimplePublicObjectInput = {
+      properties: {
+        hs_meeting_outcome: "CANCELED",
+      },
+    };
+
+    return this.hubspotClient.crm.objects.meetings.basicApi.update(uid, simplePublicObjectInput);
   };
 
   private hubspotAuth = async (credential: CredentialPayload) => {
@@ -204,7 +206,6 @@ export default class HubspotCalendarService implements CRM {
     return await this.handleMeetingCreation(event, contacts);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async updateEvent(uid: string, event: CalendarEvent): Promise<any> {
     const auth = await this.auth;
     await auth.getToken();
@@ -214,7 +215,7 @@ export default class HubspotCalendarService implements CRM {
   async deleteEvent(uid: string): Promise<void> {
     const auth = await this.auth;
     await auth.getToken();
-    return await this.hubspotDeleteMeeting(uid);
+    await this.hubspotCancelMeeting(uid);
   }
 
   async getContacts({ emails }: { emails: string | string[] }): Promise<Contact[]> {
diff --git a/packages/app-store/jelly/config.json b/packages/app-store/jelly/config.json
index 68433dcbf61594..38e06935d4320e 100644
--- a/packages/app-store/jelly/config.json
+++ b/packages/app-store/jelly/config.json
@@ -16,7 +16,7 @@
       "linkType": "dynamic"
     }
   },
-  "description": "Jelly is a camera-free voice chat platform. No frills, no makeup needed, just good talking. Our AI magic handles the rest by highlighting and publishing key moments with rich visuals.",
+  "description": "JellyPhone is a video calling tool with a stacked rolodex. You can cut short podcasts for Tik Tok and Instagram and publish in seconds. Connect with amazing people.",
   "isTemplate": false,
   "__createdUsingCli": true,
   "__template": "event-type-location-video-static"
diff --git a/packages/app-store/routing-forms/api/responses/[formId].ts b/packages/app-store/routing-forms/api/responses/[formId].ts
index 8bfb73d675a509..0d07bdce73e364 100644
--- a/packages/app-store/routing-forms/api/responses/[formId].ts
+++ b/packages/app-store/routing-forms/api/responses/[formId].ts
@@ -1,8 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 import { getSession } from "next-auth/react";
 
+import {
+  entityPrismaWhereClause,
+  canEditEntity,
+} from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import { sanitizeValue } from "@calcom/lib/csvUtils";
-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
 import prisma from "@calcom/prisma";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";
 
diff --git a/packages/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail.ts b/packages/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail.ts
index f58580c3797711..863edb3d7cb065 100644
--- a/packages/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail.ts
+++ b/packages/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail.ts
@@ -1,5 +1,5 @@
 import { getCRMContactOwnerForRRLeadSkip } from "@calcom/app-store/_utils/CRMRoundRobinSkip";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { prisma } from "@calcom/prisma";
 import { SchedulingType } from "@calcom/prisma/enums";
 
diff --git a/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts b/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts
index abaa533c1361b3..b2b77bb1378c00 100644
--- a/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts
+++ b/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts
@@ -3,9 +3,15 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";
 
 import { describe, it, vi, expect, beforeEach, afterEach } from "vitest";
 
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
-import { WebhookTriggerEvents } from "@calcom/prisma/enums";
+import {
+  WebhookTriggerEvents,
+  WorkflowTriggerEvents,
+  WorkflowActions,
+  WorkflowTemplates,
+} from "@calcom/prisma/enums";
 
 import { _onFormSubmission } from "./formSubmissionUtils";
 
@@ -30,6 +36,14 @@ vi.mock("@calcom/features/tasker", () => {
   return { default: Promise.resolve(tasker) };
 });
 
+// Mock workflow dependencies
+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService", () => ({
+  WorkflowService: {
+    getAllWorkflowsFromRoutingForm: vi.fn(() => Promise.resolve([])),
+    scheduleFormWorkflows: vi.fn(() => Promise.resolve()),
+  },
+}));
+
 const mockSendEmail = vi.fn(() => Promise.resolve());
 const mockResponseEmailConstructor = vi.fn();
 vi.mock("../emails/templates/response-email", () => ({
@@ -49,7 +63,7 @@ describe("_onFormSubmission", () => {
       { id: "field-1", identifier: "email", label: "Email", type: "email" },
       { id: "field-2", identifier: "name", label: "Name", type: "text" },
     ],
-    user: { id: 1, email: "test@example.com" },
+    user: { id: 1, email: "test@example.com", timeFormat: 12, locale: "en" },
     teamId: null,
     settings: { emailOwnerOnSubmission: true },
   };
@@ -83,47 +97,111 @@ describe("_onFormSubmission", () => {
       });
       expect(sendGenericWebhookPayload).toHaveBeenCalledTimes(1);
     });
+  });
 
-    it("should schedule FORM_SUBMITTED_NO_EVENT webhooks via tasker", async () => {
-      const tasker = await (await import("@calcom/features/tasker")).default;
-      const mockWebhook = { id: "wh-no-event-1", secret: "secret" };
-      const chosenAction = { type: "customPageMessage" as const, value: "test" };
+  describe("Workflows", () => {
+    it("should call WorkflowService.scheduleFormWorkflows for FORM_SUBMITTED workflows", async () => {
+      const mockWorkflows = [
+        {
+          id: 1,
+          name: "Form Submitted Workflow",
+          userId: 1,
+          teamId: null,
+          trigger: WorkflowTriggerEvents.FORM_SUBMITTED,
+          time: null,
+          timeUnit: null,
+          steps: [
+            {
+              id: 1,
+              action: WorkflowActions.EMAIL_ATTENDEE,
+              sendTo: null,
+              reminderBody: "Thank you for your submission!",
+              emailSubject: "Form Received",
+              template: WorkflowTemplates.CUSTOM,
+              verifiedAt: new Date(),
+              includeCalendarEvent: false,
+              numberVerificationPending: false,
+              numberRequired: false,
+            },
+          ],
+        },
+      ];
 
-      vi.mocked(getWebhooks).mockImplementation(async (options) => {
-        if (options.triggerEvent === WebhookTriggerEvents.FORM_SUBMITTED_NO_EVENT) {
-          return [mockWebhook as any];
-        }
-        return [];
-      });
+      vi.mocked(WorkflowService.getAllWorkflowsFromRoutingForm).mockResolvedValueOnce(mockWorkflows as any);
 
-      await _onFormSubmission(mockForm as any, mockResponse, responseId, chosenAction);
+      await _onFormSubmission(mockForm as any, mockResponse, responseId);
 
-      expect(getWebhooks).toHaveBeenCalledWith(
-        expect.objectContaining({
-          triggerEvent: WebhookTriggerEvents.FORM_SUBMITTED_NO_EVENT,
-        })
-      );
-      expect(tasker.create).toHaveBeenCalledWith(
-        "triggerFormSubmittedNoEventWebhook",
-        {
-          responseId,
-          form: {
-            id: mockForm.id,
-            name: mockForm.name,
-            teamId: mockForm.teamId,
+      expect(WorkflowService.getAllWorkflowsFromRoutingForm).toHaveBeenCalledWith(mockForm);
+      expect(WorkflowService.scheduleFormWorkflows).toHaveBeenCalledWith({
+        workflows: mockWorkflows,
+        responses: {
+          email: {
+            value: "test@response.com",
+            response: "test@response.com",
           },
-          responses: {
-            email: {
-              value: "test@response.com",
-              response: "test@response.com",
+          name: { value: "Test Name", response: "Test Name" },
+        },
+        responseId,
+        form: {
+          ...mockForm,
+          fields: mockForm.fields.map((field) => ({
+            type: field.type,
+            identifier: field.identifier,
+          })),
+        },
+      });
+    });
+
+    it("should call WorkflowService.scheduleFormWorkflows for FORM_SUBMITTED_NO_EVENT workflows", async () => {
+      const mockWorkflows = [
+        {
+          id: 2,
+          name: "Form Follow-up Workflow",
+          userId: 1,
+          teamId: null,
+          trigger: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
+          time: 30,
+          timeUnit: "MINUTE",
+          steps: [
+            {
+              id: 2,
+              action: WorkflowActions.EMAIL_ATTENDEE,
+              sendTo: null,
+              reminderBody: "Follow up on your form submission",
+              emailSubject: "Follow Up",
+              template: WorkflowTemplates.CUSTOM,
+              verifiedAt: new Date(),
+              includeCalendarEvent: false,
+              numberVerificationPending: false,
+              numberRequired: false,
             },
-            name: { value: "Test Name", response: "Test Name" },
+          ],
+        },
+      ];
+
+      vi.mocked(WorkflowService.getAllWorkflowsFromRoutingForm).mockResolvedValueOnce(mockWorkflows as any);
+
+      await _onFormSubmission(mockForm as any, mockResponse, responseId);
+
+      expect(WorkflowService.getAllWorkflowsFromRoutingForm).toHaveBeenCalledWith(mockForm);
+      expect(WorkflowService.scheduleFormWorkflows).toHaveBeenCalledWith({
+        workflows: mockWorkflows,
+        responses: {
+          email: {
+            value: "test@response.com",
+            response: "test@response.com",
           },
-          redirect: chosenAction,
-          webhook: mockWebhook,
+          name: { value: "Test Name", response: "Test Name" },
         },
-        { scheduledAt: expect.any(Date) }
-      );
+        responseId,
+        form: {
+          ...mockForm,
+          fields: mockForm.fields.map((field) => ({
+            type: field.type,
+            identifier: field.identifier,
+          })),
+        },
+      });
     });
   });
 
@@ -133,7 +211,7 @@ describe("_onFormSubmission", () => {
         ...mockForm,
         teamId: 1,
         userWithEmails: ["team-member1@example.com", "team-member2@example.com"],
-        user: { id: 1, email: "test@example.com" },
+        user: { id: 1, email: "test@example.com", timeFormat: 12, locale: "en" },
       };
 
       await _onFormSubmission(teamForm as any, mockResponse, responseId);
diff --git a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts b/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
index 7c8948a4edce8b..b05b86816cd232 100644
--- a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
+++ b/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
@@ -6,6 +6,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { withReporting } from "@calcom/lib/sentryWrapper";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";
@@ -14,6 +15,7 @@ import { RoutingFormSettings } from "@calcom/prisma/zod-utils";
 import type { Ensure } from "@calcom/types/utils";
 
 import type { FormResponse, SerializableForm, SerializableField, OrderedResponses } from "../types/types";
+import getFieldIdentifier from "./getFieldIdentifier";
 
 const moduleLogger = logger.getSubLogger({ prefix: ["routing-forms/lib/formSubmissionUtils"] });
 
@@ -112,7 +114,10 @@ function getWebhookTargetEntity(form: { teamId?: number | null; user: { id: numb
  */
 export async function _onFormSubmission(
   form: Ensure<
-    SerializableForm<App_RoutingForms_Form> & { user: Pick<User, "id" | "email">; userWithEmails?: string[] },
+    SerializableForm<App_RoutingForms_Form> & {
+      user: Pick<User, "id" | "email" | "timeFormat" | "locale">;
+      userWithEmails?: string[];
+    },
     "fields"
   >,
   response: FormResponse,
@@ -159,6 +164,7 @@ export async function _onFormSubmission(
   };
 
   const webhooksFormSubmitted = await getWebhooks(subscriberOptionsFormSubmitted);
+
   const webhooksFormSubmittedNoEvent = await getWebhooks(subscriberOptionsFormSubmittedNoEvent);
 
   const promisesFormSubmitted = webhooksFormSubmitted.map((webhook) => {
@@ -211,6 +217,22 @@ export async function _onFormSubmission(
       const promises = [...promisesFormSubmitted, ...promisesFormSubmittedNoEvent];
 
       await Promise.all(promises);
+
+      const workflows = await WorkflowService.getAllWorkflowsFromRoutingForm(form);
+
+      await WorkflowService.scheduleFormWorkflows({
+        workflows,
+        responseId,
+        responses: fieldResponsesByIdentifier,
+        form: {
+          ...form,
+          fields: form.fields.map((field) => ({
+            type: field.type,
+            identifier: getFieldIdentifier(field),
+          })),
+        },
+      });
+
       const orderedResponses = form.fields.reduce((acc, field) => {
         acc.push(response[field.id]);
         return acc;
@@ -243,6 +265,8 @@ export type TargetRoutingFormForResponse = SerializableForm<
     user: {
       id: number;
       email: string;
+      timeFormat: number | null;
+      locale: string | null;
     };
     team: {
       parentId: number | null;
diff --git a/packages/app-store/routing-forms/lib/getSerializableForm.ts b/packages/app-store/routing-forms/lib/getSerializableForm.ts
index 7c146a6b4a8229..b9846a41a57658 100644
--- a/packages/app-store/routing-forms/lib/getSerializableForm.ts
+++ b/packages/app-store/routing-forms/lib/getSerializableForm.ts
@@ -1,6 +1,6 @@
 import type { z } from "zod";
 
-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";
diff --git a/packages/app-store/routing-forms/lib/handleResponse.test.ts b/packages/app-store/routing-forms/lib/handleResponse.test.ts
index f3b329b3c7f6d8..213b7fedd257a2 100644
--- a/packages/app-store/routing-forms/lib/handleResponse.test.ts
+++ b/packages/app-store/routing-forms/lib/handleResponse.test.ts
@@ -84,6 +84,8 @@ const mockForm: TargetRoutingFormForResponse = {
   user: {
     id: 1,
     email: "test@example.com",
+    timeFormat: null,
+    locale: null,
   },
   team: {
     parentId: 2,
diff --git a/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts b/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts
index 7460c920403668..3d687b57ecc815 100644
--- a/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts
+++ b/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts
@@ -1,4 +1,4 @@
-import { canCreateEntity, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
+import { canCreateEntity, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import prisma from "@calcom/prisma";
 import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";
 
diff --git a/packages/app-store/salesforce/lib/CrmService.ts b/packages/app-store/salesforce/lib/CrmService.ts
index ce241bed401862..8efb084facfc4a 100644
--- a/packages/app-store/salesforce/lib/CrmService.ts
+++ b/packages/app-store/salesforce/lib/CrmService.ts
@@ -4,10 +4,10 @@ import { RRule } from "rrule";
 import { z } from "zod";
 
 import { RoutingFormResponseDataFactory } from "@calcom/app-store/routing-forms/lib/RoutingFormResponseDataFactory";
+import { checkIfFreeEmailDomain } from "@calcom/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain";
 import { getLocation } from "@calcom/lib/CalEventParser";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { RetryableError } from "@calcom/lib/crmManager/errors";
-import { checkIfFreeEmailDomain } from "@calcom/lib/freeEmailDomainCheck/checkIfFreeEmailDomain";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { PrismaAssignmentReasonRepository } from "@calcom/lib/server/repository/PrismaAssignmentReasonRepository";
@@ -1599,7 +1599,7 @@ export default class SalesforceCRMService implements CRM {
     const appOptions = this.getAppOptions();
     if (!appOptions.ifFreeEmailDomainSkipOwnerCheck) return false;
 
-    const response = await checkIfFreeEmailDomain(attendeeEmail);
+    const response = await checkIfFreeEmailDomain({ email: attendeeEmail });
     return response;
   }
 
diff --git a/packages/app-store/salesforce/lib/__tests__/CrmService.integration.test.ts b/packages/app-store/salesforce/lib/__tests__/CrmService.integration.test.ts
index 968dd42ca9e987..30e0960d2c4411 100644
--- a/packages/app-store/salesforce/lib/__tests__/CrmService.integration.test.ts
+++ b/packages/app-store/salesforce/lib/__tests__/CrmService.integration.test.ts
@@ -6,8 +6,6 @@
  *
  * CrmService.test.ts could still focus on testing detailed edge cases as needed.
  */
-import "../../../../../tests/libs/__mocks__/prisma";
-
 import jsforce from "@jsforce/jsforce-node";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
@@ -46,7 +44,7 @@ vi.mock("@jsforce/jsforce-node", () => {
   };
 });
 
-vi.mock("@calcom/lib/freeEmailDomainCheck/checkIfFreeEmailDomain", () => ({
+vi.mock("@calcom/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain", () => ({
   checkIfFreeEmailDomain: vi.fn().mockResolvedValue(false),
 }));
 
@@ -210,7 +208,7 @@ describe("SalesforceCRMService", () => {
           Website: "https://anything",
         });
 
-        const contact = salesforceMock.addContact({
+        const _contact = salesforceMock.addContact({
           // Contact doesn't have the matching email
           Email: contactEmail,
           FirstName: "Test",
@@ -250,7 +248,7 @@ describe("SalesforceCRMService", () => {
         const contactOwnerEmail = "contact-owner@acme.com";
         const leadOwnerEmail = "lead-owner@acme.com";
         const lookingForEmail = "test1@example.com";
-        const contactEmail = "test2@example.com";
+        const _contactEmail = "test2@example.com";
 
         const account = salesforceMock.addAccount({
           Id: "test-account-id",
@@ -271,7 +269,7 @@ describe("SalesforceCRMService", () => {
           },
         });
 
-        const lead = salesforceMock.addLead({
+        const _lead = salesforceMock.addLead({
           // Lead has the matching email
           Email: lookingForEmail,
           FirstName: "Test",
diff --git a/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts b/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts
index ae440c55788e54..e08a2f28ff8e50 100644
--- a/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts
+++ b/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts
@@ -1,4 +1,4 @@
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import logger from "@calcom/lib/logger";
 
 import { routingFormIncompleteBookingDataSchema } from "../../zod";
diff --git a/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts b/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts
index 01cc317aa3d896..53c4ed052b51e5 100644
--- a/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts
+++ b/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts
@@ -1,4 +1,4 @@
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 
 import type { AttributeRoutingConfig } from "../../routing-forms/types/types";
 import SalesforceCRMService from "./CrmService";
diff --git a/packages/app-store/stripepayment/api/__tests__/portal.test.ts b/packages/app-store/stripepayment/api/__tests__/portal.test.ts
index 8c13dc3c14befd..5d9880ce12a0bf 100644
--- a/packages/app-store/stripepayment/api/__tests__/portal.test.ts
+++ b/packages/app-store/stripepayment/api/__tests__/portal.test.ts
@@ -4,7 +4,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { MembershipRole } from "@calcom/prisma/enums";
 
 import {
@@ -18,7 +18,7 @@ import { validateAuthentication, buildReturnUrl } from "../portal";
 
 // Mock dependencies
 vi.mock("@calcom/features/pbac/services/permission-check.service");
-vi.mock("@calcom/lib/server/repository/team");
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
 vi.mock("../../lib/customer");
 vi.mock("../../lib/server");
 vi.mock("../../lib/subscriptions");
diff --git a/packages/app-store/stripepayment/lib/PaymentService.ts b/packages/app-store/stripepayment/lib/PaymentService.ts
index 5dd16cb879a34c..676dc0195fa7e3 100644
--- a/packages/app-store/stripepayment/lib/PaymentService.ts
+++ b/packages/app-store/stripepayment/lib/PaymentService.ts
@@ -8,7 +8,7 @@ import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { ErrorWithCode } from "@calcom/lib/errors";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import prisma from "@calcom/prisma";
 import type { Booking, Payment, PaymentOption, Prisma } from "@calcom/prisma/client";
 import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
diff --git a/packages/app-store/stripepayment/lib/getCustomerAndCheckoutSession.ts b/packages/app-store/stripepayment/lib/getCustomerAndCheckoutSession.ts
index 11f8ba10d1b918..81194473cdd19c 100644
--- a/packages/app-store/stripepayment/lib/getCustomerAndCheckoutSession.ts
+++ b/packages/app-store/stripepayment/lib/getCustomerAndCheckoutSession.ts
@@ -1,4 +1,4 @@
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 
 export async function getCustomerAndCheckoutSession(checkoutSessionId: string) {
   const billingService = new StripeBillingService();
diff --git a/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts b/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts
index d89afcc68d5443..4b92f57697bad2 100644
--- a/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts
+++ b/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts
@@ -4,7 +4,7 @@ import { PermissionCheckService } from "@calcom/features/pbac/services/permissio
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import logger from "@calcom/lib/logger";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";
 
 import stripe from "../../server";
diff --git a/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts b/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts
index ece4731ebd05d4..4611c74cad705a 100644
--- a/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts
+++ b/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts
@@ -1,4 +1,4 @@
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";
 
 import type { BillingPortalService } from "../base/BillingPortalService";
diff --git a/packages/app-store/vital/lib/reschedule.ts b/packages/app-store/vital/lib/reschedule.ts
index 4f492995263042..99df75be2de3af 100644
--- a/packages/app-store/vital/lib/reschedule.ts
+++ b/packages/app-store/vital/lib/reschedule.ts
@@ -6,7 +6,7 @@ import { CalendarEventBuilder } from "@calcom/lib/builders/CalendarEvent/builder
 import { CalendarEventDirector } from "@calcom/lib/builders/CalendarEvent/director";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { deleteMeeting } from "@calcom/app-store/videoClient";
+import { deleteMeeting } from "@calcom/features/conferencing/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { Booking, BookingReference, User } from "@calcom/prisma/client";
 import { BookingStatus } from "@calcom/prisma/enums";
diff --git a/packages/app-store/wipemycalother/lib/reschedule.ts b/packages/app-store/wipemycalother/lib/reschedule.ts
index 308538f51bdd99..fe05984d65abf3 100644
--- a/packages/app-store/wipemycalother/lib/reschedule.ts
+++ b/packages/app-store/wipemycalother/lib/reschedule.ts
@@ -6,7 +6,7 @@ import { CalendarEventBuilder } from "@calcom/lib/builders/CalendarEvent/builder
 import { CalendarEventDirector } from "@calcom/lib/builders/CalendarEvent/director";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { deleteMeeting } from "@calcom/app-store/videoClient";
+import { deleteMeeting } from "@calcom/features/conferencing/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { Booking, BookingReference, User } from "@calcom/prisma/client";
 import { BookingStatus } from "@calcom/prisma/enums";
diff --git a/packages/emails/src/components/UserFieldsResponses.tsx b/packages/emails/src/components/UserFieldsResponses.tsx
index 6d3fd922817fc3..f656c3ec3ec270 100644
--- a/packages/emails/src/components/UserFieldsResponses.tsx
+++ b/packages/emails/src/components/UserFieldsResponses.tsx
@@ -1,6 +1,6 @@
 import type { TFunction } from "i18next";
 
-import getLabelValueMapFromResponses from "@calcom/lib/getLabelValueMapFromResponses";
+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";
 import type { CalendarEvent } from "@calcom/types/Calendar";
 
 import { Info } from "./Info";
diff --git a/packages/embeds/embed-core/index.html b/packages/embeds/embed-core/index.html
index 2b64e305a5267c..d59bdad44d6821 100644
--- a/packages/embeds/embed-core/index.html
+++ b/packages/embeds/embed-core/index.html
@@ -11,11 +11,13 @@
      <script type="text/javascript" src="./playground/lib/playground-init.ts"></script>
     <script>
       let popupRescheduleUid = null;
+      let popupCancelUid = null;
       let calLink = null;
       const initialNamespace = (url.searchParams.get("only") || "").split("ns:")[1] || "";
       (function defineVariables() {
         const searchParams = new URL(document.URL).searchParams;
         popupRescheduleUid = searchParams.get("popupRescheduleUid") || "qm3kwt3aTnVD7vmP9tiT2f";
+        popupCancelUid = searchParams.get("popupCancelUid") || "qm3kwt3aTnVD7vmP9tiT2f";
         calLink = searchParams.get("calLink");
       })()
       
@@ -292,6 +294,12 @@ <h2>Popup Examples - Reschedule Tests</h2>
       `<button data-cal-namespace="popupRescheduleWithRescheduleUidParam" data-cal-config='{"flag.coep":"true", "rescheduleUid": "${popupRescheduleUid}"}' data-cal-link="${calLink}">Reschedule Event(with rescheduleUid param) - Needs popupRescheduleUid and calLink param</button>`
           );
         </script>
+        <h2>Popup Examples - Cancel Tests</h2>
+        <script>
+          document.write(
+            `<button data-cal-namespace="popupCancelBooking" data-cal-config='{"flag.coep":"true"}' data-cal-link="booking/${popupCancelUid}?cancel=true">Cancel Booking - Needs popupCancelUid param</button>`
+          );
+        </script>
         <h2>Popup Examples - Different Configurations</h2>
         <button data-cal-namespace="popupHideEventTypeDetails" data-cal-link="free/30min" data-cal-config='{"flag.coep": "true"}'>
           Book Free Event [Auto Theme][uiConfig.hideEventTypeDetails=true]
diff --git a/packages/embeds/embed-core/playground/lib/playground.ts b/packages/embeds/embed-core/playground/lib/playground.ts
index a468791aec2e3e..cc39e3178d174e 100644
--- a/packages/embeds/embed-core/playground/lib/playground.ts
+++ b/packages/embeds/embed-core/playground/lib/playground.ts
@@ -371,6 +371,11 @@ Cal("init", "popupRescheduleWithRescheduleUidParam", {
   origin: origin,
 });
 
+Cal("init", "popupCancelBooking", {
+  debug: true,
+  origin: origin,
+});
+
 Cal("init", "popupAutoTheme", {
   debug: true,
   origin: origin,
diff --git a/packages/embeds/embed-core/playwright/lib/testUtils.ts b/packages/embeds/embed-core/playwright/lib/testUtils.ts
index 4cb75410cdbeb7..345095e74542d0 100644
--- a/packages/embeds/embed-core/playwright/lib/testUtils.ts
+++ b/packages/embeds/embed-core/playwright/lib/testUtils.ts
@@ -232,3 +232,19 @@ export async function expectActualFormResponseConnectedToQueuedFormResponse({
   // TODO: We should be able to verify the exact response values by correlating the form field identifiers with the actual Form from DB
   expect(valuesSetInResponse.length).toBe(numberOfExpectedSetFieldValues);
 }
+
+export async function cancelBookingThroughEmbed(bookingUid: string, frame: Frame, page: Page) {
+  await frame.waitForSelector('[data-testid="cancel_reason"]');
+
+  await frame.fill('[data-testid="cancel_reason"]', "Test cancellation from embed");
+
+  const responsePromise = page.waitForResponse("**/api/cancel");
+  await frame.click('[data-testid="confirm_cancel"]');
+
+  const response = await responsePromise;
+  expect(response.status()).toBe(200);
+
+  await expect(frame.locator('[data-testid="cancelled-headline"]')).toBeVisible();
+
+  return response;
+}
diff --git a/packages/embeds/embed-core/playwright/tests/action-based.e2e.ts b/packages/embeds/embed-core/playwright/tests/action-based.e2e.ts
index 76301b2103c966..34e7fe49735775 100644
--- a/packages/embeds/embed-core/playwright/tests/action-based.e2e.ts
+++ b/packages/embeds/embed-core/playwright/tests/action-based.e2e.ts
@@ -11,6 +11,7 @@ import {
   getBooking,
   deleteAllBookingsByEmail,
   rescheduleEvent,
+  cancelBookingThroughEmbed,
 } from "../lib/testUtils";
 
 // in parallel mode sometimes handleNewBooking endpoint throws "No available users found" error, this never happens in serial mode.
@@ -104,6 +105,34 @@ test.describe("Popup Tests", () => {
 
   todo("Add snapshot test for embed iframe");
 
+  test("should be able to cancel booking through embed iframe", async ({
+    page,
+    embeds: { addEmbedListeners, getActionFiredDetails },
+  }) => {
+    const booking = await test.step("Create a booking", async () => {
+      return await bookFirstFreeUserEventThroughEmbed({
+        page,
+        addEmbedListeners,
+        getActionFiredDetails,
+      });
+    });
+
+    await test.step("Cancel the booking through embed", async () => {
+      const calNamespace = "popupCancelBooking";
+      await addEmbedListeners(calNamespace);
+      await page.goto(`/?popupCancelUid=${booking.uid}`);
+      await page.click(`[data-cal-namespace="${calNamespace}"]`);
+      const embedIframe = await getEmbedIframe({ calNamespace, page, pathname: `/booking/${booking.uid}` });
+      if (!embedIframe) {
+        throw new Error("Embed iframe not found");
+      }
+      await cancelBookingThroughEmbed(booking.uid, embedIframe, page);
+    });
+
+    const cancelledBooking = await getBooking(booking.uid);
+    expect(cancelledBooking.status).toBe("CANCELLED");
+  });
+
   test("should open Routing Forms embed on click", async ({
     page,
     embeds: { addEmbedListeners, getActionFiredDetails },
diff --git a/packages/embeds/embed-core/src/embed-iframe.ts b/packages/embeds/embed-core/src/embed-iframe.ts
index 9f0a2ff72950dc..66d8c2403f6869 100644
--- a/packages/embeds/embed-core/src/embed-iframe.ts
+++ b/packages/embeds/embed-core/src/embed-iframe.ts
@@ -4,7 +4,13 @@ import { useEffect, useRef, useState, useCallback } from "react";
 
 import type { Message } from "./embed";
 import { embedStore, EMBED_IFRAME_STATE } from "./embed-iframe/lib/embedStore";
-import { runAsap, isBookerReady, isLinkReady, recordResponseIfQueued } from "./embed-iframe/lib/utils";
+import {
+  runAsap,
+  isBookerReady,
+  isLinkReady,
+  recordResponseIfQueued,
+  keepParentInformedAboutDimensionChanges,
+} from "./embed-iframe/lib/utils";
 import { sdkActionManager } from "./sdk-event";
 import type {
   UiConfig,
@@ -195,7 +201,6 @@ export const useEmbedStyles = (elementName: keyof EmbedStyles) => {
 
   useEffect(() => {
     return registerNewSetter({ elementName, setState: setStyles, styles: true });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const styles = embedStore.styles || {};
   // Always read the data from global embedStore so that even across components, the same data is used.
@@ -207,7 +212,6 @@ export const useEmbedNonStylesConfig = (elementName: keyof EmbedNonStylesConfig)
 
   useEffect(() => {
     return registerNewSetter({ elementName, setState: setNonStyles, styles: false });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   // Always read the data from global embedStore so that even across components, the same data is used.
@@ -387,7 +391,6 @@ export const methods = {
     setEmbedStyles(stylesConfig || {});
     setEmbedNonStyles(stylesConfig || {});
   },
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   parentKnowsIframeReady: (_unused: unknown) => {
     log("Method: `parentKnowsIframeReady` called");
     // No UI change should happen in sight. Let the parent height adjust and in next cycle show it.
@@ -425,7 +428,7 @@ export const methods = {
       ...queryParamsFromConfig
     } = config;
     // We reset it to allow informing parent again through `__dimensionChanged` event about possibly updated dimensions with changes in config
-    embedStore.parentInformedAboutContentHeight = false;
+    embedStore.providedCorrectHeightToParent = false;
 
     if (noSlotsFetchOnConnect !== "true") {
       log("Method: connect, noSlotsFetchOnConnect is false. Requesting slots re-fetch");
@@ -484,93 +487,6 @@ const messageParent = (data: CustomEvent["detail"]) => {
   );
 };
 
-/**
- * This function is called once the iframe loads.
- * It isn't called on "connect"
- */
-function keepParentInformedAboutDimensionChanges() {
-  let knownIframeHeight: number | null = null;
-  let knownIframeWidth: number | null = null;
-  let isFirstTime = true;
-  let isWindowLoadComplete = false;
-  runAsap(function informAboutScroll() {
-    if (document.readyState !== "complete") {
-      // Wait for window to load to correctly calculate the initial scroll height.
-      runAsap(informAboutScroll);
-      return;
-    }
-    if (!isWindowLoadComplete) {
-      // On Safari, even though document.readyState is complete, still the page is not rendered and we can't compute documentElement.scrollHeight correctly
-      // Postponing to just next cycle allow us to fix this.
-      setTimeout(() => {
-        isWindowLoadComplete = true;
-        informAboutScroll();
-      }, 100);
-      return;
-    }
-
-    if (!embedStore.windowLoadEventFired) {
-      sdkActionManager?.fire("__windowLoadComplete", {});
-    }
-    embedStore.windowLoadEventFired = true;
-
-    // Use the dimensions of main element as in most places there is max-width restriction on it and we just want to show the main content.
-    // It avoids the unwanted padding outside main tag.
-    const mainElement =
-      document.getElementsByClassName("main")[0] ||
-      document.getElementsByTagName("main")[0] ||
-      document.documentElement;
-    const documentScrollHeight = document.documentElement.scrollHeight;
-    const documentScrollWidth = document.documentElement.scrollWidth;
-
-    if (!(mainElement instanceof HTMLElement)) {
-      throw new Error("Main element should be an HTMLElement");
-    }
-
-    const mainElementStyles = getComputedStyle(mainElement);
-    // Use, .height as that gives more accurate value in floating point. Also, do a ceil on the total sum so that whatever happens there is enough iframe size to avoid scroll.
-    const contentHeight = Math.ceil(
-      parseFloat(mainElementStyles.height) +
-        parseFloat(mainElementStyles.marginTop) +
-        parseFloat(mainElementStyles.marginBottom)
-    );
-    const contentWidth = Math.ceil(
-      parseFloat(mainElementStyles.width) +
-        parseFloat(mainElementStyles.marginLeft) +
-        parseFloat(mainElementStyles.marginRight)
-    );
-
-    // During first render let iframe tell parent that how much is the expected height to avoid scroll.
-    // Parent would set the same value as the height of iframe which would prevent scroll.
-    // On subsequent renders, consider html height as the height of the iframe. If we don't do this, then if iframe gets bigger in height, it would never shrink
-    const iframeHeight = isFirstTime ? documentScrollHeight : contentHeight;
-    const iframeWidth = isFirstTime ? documentScrollWidth : contentWidth;
-
-    if (!iframeHeight || !iframeWidth) {
-      runAsap(informAboutScroll);
-      return;
-    }
-    const isThereAChangeInDimensions = knownIframeHeight !== iframeHeight || knownIframeWidth !== iframeWidth;
-    if (isThereAChangeInDimensions || !embedStore.parentInformedAboutContentHeight) {
-      embedStore.parentInformedAboutContentHeight = true;
-
-      knownIframeHeight = iframeHeight;
-      knownIframeWidth = iframeWidth;
-      // FIXME: This event shouldn't be subscribable by the user. Only by the SDK.
-      sdkActionManager?.fire("__dimensionChanged", {
-        iframeHeight,
-        iframeWidth,
-        isFirstTime,
-      });
-    }
-    isFirstTime = false;
-    // Parent Counterpart would change the dimension of iframe and thus page's dimension would be impacted which is recursive.
-    // It should stop ideally by reaching a hiddenHeight value of 0.
-    // FIXME: If 0 can't be reached we need to just abandon our quest for perfect iframe and let scroll be there. Such case can be logged in the wild and fixed later on.
-    runAsap(informAboutScroll);
-  });
-}
-
 function main() {
   if (!isBrowser) {
     return;
@@ -659,7 +575,7 @@ function initializeAndSetupEmbed() {
   const pageStatus = window.CalComPageStatus;
 
   if (!pageStatus || pageStatus == "200") {
-    keepParentInformedAboutDimensionChanges();
+    keepParentInformedAboutDimensionChanges({ embedStore });
   } else
     sdkActionManager?.fire("linkFailed", {
       code: pageStatus,
diff --git a/packages/embeds/embed-core/src/embed-iframe/__tests__/isLinkReady.test.ts b/packages/embeds/embed-core/src/embed-iframe/__tests__/isLinkReady.test.ts
index 597447ec8067c6..8918afcaa64350 100644
--- a/packages/embeds/embed-core/src/embed-iframe/__tests__/isLinkReady.test.ts
+++ b/packages/embeds/embed-core/src/embed-iframe/__tests__/isLinkReady.test.ts
@@ -1,5 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
+import { type EmbedStore } from "../lib/embedStore";
 import { fakeCurrentDocumentUrl, takeBookerToSlotsLoadingState, takeBookerToReadyState } from "./test-utils";
 
 beforeEach(() => {
@@ -13,15 +14,15 @@ afterEach(() => {
 });
 
 describe("isLinkReady", async () => {
-  let isLinkReady: typeof import("../lib/utils").isLinkReady;
-  let embedStore: typeof import("../lib/embedStore").embedStore;
+  let isLinkReady: (props: { embedStore: EmbedStore }) => boolean;
+  let embedStore: EmbedStore;
 
   beforeEach(async () => {
     ({ isLinkReady } = await import("../lib/utils"));
     ({ embedStore } = await import("../lib/embedStore"));
 
     // Reset embedStore state to ensure test isolation
-    embedStore.parentInformedAboutContentHeight = true;
+    embedStore.providedCorrectHeightToParent = true;
     embedStore.renderState = null;
     embedStore.connectVersion = 1;
   });
@@ -72,11 +73,11 @@ describe("isLinkReady", async () => {
     });
   });
 
-  describe("when parent not informed about content height", () => {
+  describe("when parent not provided correct height", () => {
     it("should return false regardless of other conditions", () => {
       fakeCurrentDocumentUrl({ params: { "cal.embed.pageType": "user.event.booking.slots" } });
       takeBookerToReadyState();
-      embedStore.parentInformedAboutContentHeight = false; // Not informed yet
+      embedStore.providedCorrectHeightToParent = false; // Not informed yet
 
       const result = isLinkReady({ embedStore });
       expect(result).toBe(false);
diff --git a/packages/embeds/embed-core/src/embed-iframe/__tests__/utils.test.ts b/packages/embeds/embed-core/src/embed-iframe/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..4fc29212d5ad59
--- /dev/null
+++ b/packages/embeds/embed-core/src/embed-iframe/__tests__/utils.test.ts
@@ -0,0 +1,230 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+
+import { sdkActionManager } from "../../sdk-event";
+import { embedStore } from "../lib/embedStore";
+import { keepParentInformedAboutDimensionChanges } from "../lib/utils";
+import { fakeCurrentDocumentUrl } from "./test-utils";
+
+type DimensionEvent = {
+  isFirstTime: boolean;
+  height: number;
+  width: number;
+};
+
+type DOMTestData = {
+  documentElementScrollDimensions: { height: number; width: number };
+  mainElementDimensions: { height: number; width: number };
+  readyState: "complete" | "loading";
+};
+
+type DomEnvironment = DOMTestData & {
+  setReadyState: (readyState: "complete" | "loading") => void;
+};
+
+const RUN_ASAP_TICK_MS = 50;
+const WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS = 100;
+
+const createDOMEnvironment = (testData: DOMTestData) => {
+  Object.defineProperty(document, "readyState", {
+    writable: true,
+    configurable: true,
+    value: testData.readyState,
+  });
+
+  const mainElement = document.createElement("main");
+  mainElement.className = "main";
+  document.body.appendChild(mainElement);
+
+  Object.defineProperty(document.documentElement, "scrollHeight", {
+    writable: true,
+    configurable: true,
+    value: testData.documentElementScrollDimensions.height,
+  });
+  Object.defineProperty(document.documentElement, "scrollWidth", {
+    writable: true,
+    configurable: true,
+    value: testData.documentElementScrollDimensions.width,
+  });
+
+  const originalGetComputedStyle = window.getComputedStyle;
+  vi.spyOn(window, "getComputedStyle").mockImplementation((element) => {
+    if (element.classList?.contains("main") || element.tagName === "MAIN") {
+      return {
+        height: `${testData.mainElementDimensions.height}px`,
+        width: `${testData.mainElementDimensions.width}px`,
+        marginTop: "0px",
+        marginBottom: "0px",
+        marginLeft: "0px",
+        marginRight: "0px",
+      } as CSSStyleDeclaration;
+    }
+    return originalGetComputedStyle(element);
+  });
+
+  return {
+    ...testData,
+    setReadyState: (readyState: "complete" | "loading") => {
+      Object.defineProperty(document, "readyState", {
+        writable: true,
+        configurable: true,
+        value: readyState,
+      });
+    },
+  };
+};
+
+const resetEmbedState = () => {
+  embedStore.providedCorrectHeightToParent = false;
+  embedStore.windowLoadEventFired = false;
+  fakeCurrentDocumentUrl({ params: {} });
+};
+
+const createDimensionTracker = () => {
+  const events: DimensionEvent[] = [];
+  sdkActionManager?.on("__dimensionChanged", (e) => {
+    events.push({
+      isFirstTime: e.detail.data.isFirstTime,
+      height: e.detail.data.iframeHeight,
+      width: e.detail.data.iframeWidth,
+    });
+  });
+  return events;
+};
+
+const expectCorrectHeightNotProvided = () => {
+  expect(embedStore.providedCorrectHeightToParent).toBe(false);
+};
+
+const expectCorrectHeightProvided = () => {
+  expect(embedStore.providedCorrectHeightToParent).toBe(true);
+};
+
+const expectFirstPassEvent = (
+  event: DimensionEvent | undefined,
+  {
+    documentElementScrollHeight,
+    documentElementScrollWidth,
+  }: {
+    documentElementScrollHeight: number;
+    documentElementScrollWidth: number;
+  }
+) => {
+  expect(event).toBeDefined();
+  expect(event?.isFirstTime).toBe(true);
+  expect(event?.height).toBe(documentElementScrollHeight);
+  expect(event?.width).toBe(documentElementScrollWidth);
+};
+
+const expectSecondPassEvent = (
+  event: DimensionEvent | undefined,
+  {
+    mainElementHeight,
+    mainElementWidth,
+  }: {
+    mainElementHeight: number;
+    mainElementWidth: number;
+  }
+) => {
+  expect(event).toBeDefined();
+  expect(event?.isFirstTime).toBe(false);
+  expect(event?.height).toBe(mainElementHeight);
+  expect(event?.width).toBe(mainElementWidth);
+};
+
+beforeEach(() => {
+  vi.useFakeTimers();
+});
+
+afterEach(() => {
+  vi.clearAllMocks();
+  vi.useRealTimers();
+  document.body.innerHTML = "";
+});
+
+describe("keepParentInformedAboutDimensionChanges", () => {
+  let domEnvironment: DomEnvironment;
+  beforeEach(() => {
+    domEnvironment = createDOMEnvironment({
+      documentElementScrollDimensions: { height: 1000, width: 800 },
+      mainElementDimensions: { height: 500, width: 400 },
+      readyState: "complete",
+    });
+    resetEmbedState();
+  });
+
+  describe("when iframe dimensions are calculated", () => {
+    it("should not mark height as provided during initial dimension pass", async () => {
+      const dimensionEvents = createDimensionTracker();
+
+      keepParentInformedAboutDimensionChanges({ embedStore });
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS + WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS);
+      expectCorrectHeightNotProvided();
+      const firstEvent = dimensionEvents[0];
+      expectFirstPassEvent(firstEvent, {
+        documentElementScrollHeight: domEnvironment.documentElementScrollDimensions.height,
+        documentElementScrollWidth: domEnvironment.documentElementScrollDimensions.width,
+      });
+    });
+
+    it("should mark height as provided after second dimension pass completes", async () => {
+      const dimensionEvents = createDimensionTracker();
+
+      keepParentInformedAboutDimensionChanges({ embedStore });
+
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS + WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS);
+      expectCorrectHeightNotProvided();
+
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS);
+      expectCorrectHeightProvided();
+      const secondEvent = dimensionEvents[1];
+      expectSecondPassEvent(secondEvent, {
+        mainElementHeight: domEnvironment.mainElementDimensions.height,
+        mainElementWidth: domEnvironment.mainElementDimensions.width,
+      });
+    });
+  });
+
+  describe("when window load state changes", () => {
+    it("should wait for window load completion before calculating dimensions", async () => {
+      domEnvironment = createDOMEnvironment({
+        documentElementScrollDimensions: { height: 1000, width: 800 },
+        mainElementDimensions: { height: 500, width: 400 },
+        readyState: "loading",
+      });
+
+      const dimensionEvents = createDimensionTracker();
+
+      keepParentInformedAboutDimensionChanges({ embedStore });
+
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS + WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS);
+
+      expect(dimensionEvents.length).toBe(0);
+      expectCorrectHeightNotProvided();
+
+      domEnvironment.setReadyState("complete");
+
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS + WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS);
+      expect(dimensionEvents.length).toBe(1);
+    });
+
+    it("should fire window load complete event on first pass", async () => {
+      domEnvironment = createDOMEnvironment({
+        documentElementScrollDimensions: { height: 1000, width: 800 },
+        mainElementDimensions: { height: 500, width: 400 },
+        readyState: "complete",
+      });
+
+      const windowLoadEvents: unknown[] = [];
+      sdkActionManager?.on("__windowLoadComplete", () => {
+        windowLoadEvents.push({});
+      });
+
+      keepParentInformedAboutDimensionChanges({ embedStore });
+
+      await vi.advanceTimersByTimeAsync(RUN_ASAP_TICK_MS + WINDOW_LOAD_COMPLETE_CONFIRMED_DELAY_MS);
+
+      expect(windowLoadEvents.length).toBe(1);
+      expect(embedStore.windowLoadEventFired).toBe(true);
+    });
+  });
+});
diff --git a/packages/embeds/embed-core/src/embed-iframe/lib/embedStore.ts b/packages/embeds/embed-core/src/embed-iframe/lib/embedStore.ts
index ab16c24dfdf44f..44a73044f0afb1 100644
--- a/packages/embeds/embed-core/src/embed-iframe/lib/embedStore.ts
+++ b/packages/embeds/embed-core/src/embed-iframe/lib/embedStore.ts
@@ -106,7 +106,7 @@ export const embedStore = {
   reactStylesStateSetters: {} as Record<keyof EmbedStyles, SetStyles>,
   reactNonStylesStateSetters: {} as Record<keyof EmbedNonStylesConfig, setNonStylesConfig>,
   // Embed can show itself only after this is set to true
-  parentInformedAboutContentHeight: false,
+  providedCorrectHeightToParent: false,
   windowLoadEventFired: false,
   setTheme: undefined as ((arg0: EmbedThemeConfig) => void) | undefined,
   theme: undefined as UiConfig["theme"],
@@ -116,3 +116,5 @@ export const embedStore = {
    */
   setUiConfig: [] as ((arg0: UiConfig) => void)[],
 };
+
+export type EmbedStore = typeof embedStore;
diff --git a/packages/embeds/embed-core/src/embed-iframe/lib/utils.ts b/packages/embeds/embed-core/src/embed-iframe/lib/utils.ts
index c1dfa155909831..c0606c7d3937b7 100644
--- a/packages/embeds/embed-core/src/embed-iframe/lib/utils.ts
+++ b/packages/embeds/embed-core/src/embed-iframe/lib/utils.ts
@@ -1,3 +1,6 @@
+import { sdkActionManager } from "../../sdk-event";
+import { type EmbedStore } from "../lib/embedStore";
+
 export function runAsap(fn: (...arg: unknown[]) => void) {
   // We don't use rAF because it runs slower in Safari plus doesn't run if the iframe is hidden sometimes
   return setTimeout(fn, 50);
@@ -22,8 +25,8 @@ function isSkeletonSupportedPageType() {
 /**
  * It is important to be able to check realtime(instead of storing isLinkReady as a variable) if the link is ready, because there is a possibility that  booker might have moved to non-ready state from ready state
  */
-export function isLinkReady({ embedStore }: { embedStore: typeof import("./embedStore").embedStore }) {
-  if (!embedStore.parentInformedAboutContentHeight) {
+export function isLinkReady({ embedStore }: { embedStore: EmbedStore }) {
+  if (!embedStore.providedCorrectHeightToParent) {
     return false;
   }
 
@@ -40,6 +43,107 @@ export function isLinkReady({ embedStore }: { embedStore: typeof import("./embed
   return true;
 }
 
+/**
+ * This function is called once the iframe loads.
+ * It isn't called on "connect"
+ *
+ * Two-pass dimension strategy:
+ * 1. Initial pass: Uses document scroll dimensions to provide maximum space and avoid affecting layout
+ * 2. Second pass: Updates with correct dimensions of main container after parent adjusts iframe
+ *
+ * The correct iframe height is only available after the second pass, so we mark providedCorrectHeightToParent=true
+ * when the second pass runs (regardless of whether dimensions changed or not).
+ */
+export function keepParentInformedAboutDimensionChanges({ embedStore }: { embedStore: EmbedStore }) {
+  let knownIframeHeight: number | null = null;
+  let knownIframeWidth: number | null = null;
+  let isInitialDimensionPass = true;
+  let isWindowLoadComplete = false;
+  runAsap(function informAboutScroll() {
+    if (document.readyState !== "complete") {
+      // Wait for window to load to correctly calculate the initial scroll height.
+      runAsap(informAboutScroll);
+      return;
+    }
+
+    if (!isWindowLoadComplete) {
+      // On Safari, even though document.readyState is complete, still the page is not rendered and we can't compute documentElement.scrollHeight correctly
+      // Postponing to just next cycle allow us to fix this.
+      setTimeout(() => {
+        isWindowLoadComplete = true;
+        informAboutScroll();
+      }, 100);
+      return;
+    }
+
+    if (!embedStore.windowLoadEventFired) {
+      sdkActionManager?.fire("__windowLoadComplete", {});
+    }
+    embedStore.windowLoadEventFired = true;
+
+    // Use the dimensions of main element as in most places there is max-width restriction on it and we just want to show the main content.
+    // It avoids the unwanted padding outside main tag.
+    const mainElement =
+      document.getElementsByClassName("main")[0] ||
+      document.getElementsByTagName("main")[0] ||
+      document.documentElement;
+    const documentScrollHeight = document.documentElement.scrollHeight;
+    const documentScrollWidth = document.documentElement.scrollWidth;
+
+    if (!(mainElement instanceof HTMLElement)) {
+      throw new Error("Main element should be an HTMLElement");
+    }
+
+    const mainElementStyles = getComputedStyle(mainElement);
+    // Use, .height as that gives more accurate value in floating point. Also, do a ceil on the total sum so that whatever happens there is enough iframe size to avoid scroll.
+    const contentHeight = Math.ceil(
+      parseFloat(mainElementStyles.height) +
+        parseFloat(mainElementStyles.marginTop) +
+        parseFloat(mainElementStyles.marginBottom)
+    );
+    const contentWidth = Math.ceil(
+      parseFloat(mainElementStyles.width) +
+        parseFloat(mainElementStyles.marginLeft) +
+        parseFloat(mainElementStyles.marginRight)
+    );
+
+    // During first render let iframe tell parent that how much is the expected height to avoid scroll.
+    // Parent would set the same value as the height of iframe which would prevent scroll.
+    // On subsequent renders, consider html height as the height of the iframe. If we don't do this, then if iframe gets bigger in height, it would never shrink
+    const iframeHeight = isInitialDimensionPass ? documentScrollHeight : contentHeight;
+    const iframeWidth = isInitialDimensionPass ? documentScrollWidth : contentWidth;
+
+    if (!iframeHeight || !iframeWidth) {
+      runAsap(informAboutScroll);
+      return;
+    }
+    const isThereAChangeInDimensions = knownIframeHeight !== iframeHeight || knownIframeWidth !== iframeWidth;
+    if (isThereAChangeInDimensions || !embedStore.providedCorrectHeightToParent) {
+      knownIframeHeight = iframeHeight;
+      knownIframeWidth = iframeWidth;
+
+      // FIXME: This event shouldn't be subscribable by the user. Only by the SDK.
+      sdkActionManager?.fire("__dimensionChanged", {
+        iframeHeight,
+        iframeWidth,
+        isFirstTime: isInitialDimensionPass,
+      });
+    }
+
+    // After the initial pass, we've provided the correct height to parent
+    // This happens on second pass regardless of whether dimensions changed
+    if (!isInitialDimensionPass) {
+      embedStore.providedCorrectHeightToParent = true;
+    }
+
+    isInitialDimensionPass = false;
+    // Parent Counterpart would change the dimension of iframe and thus page's dimension would be impacted which is recursive.
+    // It should stop ideally by reaching a hiddenHeight value of 0.
+    // FIXME: If 0 can't be reached we need to just abandon our quest for perfect iframe and let scroll be there. Such case can be logged in the wild and fixed later on.
+    runAsap(informAboutScroll);
+  });
+}
+
 /**
  * Moves the queuedFormResponse to the routingFormResponse record to mark it as an actual response now.
  */
diff --git a/packages/features/apps/components/AllApps.tsx b/packages/features/apps/components/AllApps.tsx
index 5acd9e64b23620..ff3c579d4ed272 100644
--- a/packages/features/apps/components/AllApps.tsx
+++ b/packages/features/apps/components/AllApps.tsx
@@ -5,7 +5,7 @@ import type { UIEvent } from "react";
 import { useEffect, useRef, useState } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { UserAdminTeams } from "@calcom/lib/server/repository/user";
+import type { UserAdminTeams } from "@calcom/features/users/repositories/UserRepository";
 import type { AppCategories } from "@calcom/prisma/client";
 import type { AppFrontendPayload as App } from "@calcom/types/App";
 import type { CredentialFrontendPayload as Credential } from "@calcom/types/Credential";
diff --git a/packages/features/apps/components/AppCard.tsx b/packages/features/apps/components/AppCard.tsx
index 06715cba2c1b65..7c0351626c2ac9 100644
--- a/packages/features/apps/components/AppCard.tsx
+++ b/packages/features/apps/components/AppCard.tsx
@@ -11,7 +11,7 @@ import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
 import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { UserAdminTeams } from "@calcom/lib/server/repository/user";
+import type { UserAdminTeams } from "@calcom/features/users/repositories/UserRepository";
 import type { AppFrontendPayload as App } from "@calcom/types/App";
 import type { CredentialFrontendPayload as Credential } from "@calcom/types/Credential";
 import classNames from "@calcom/ui/classNames";
diff --git a/packages/features/auth/SAMLLogin.tsx b/packages/features/auth/SAMLLogin.tsx
index 0ea0a265919b6d..98fbbe3724e337 100644
--- a/packages/features/auth/SAMLLogin.tsx
+++ b/packages/features/auth/SAMLLogin.tsx
@@ -3,9 +3,9 @@ import type { Dispatch, SetStateAction } from "react";
 import { useFormContext } from "react-hook-form";
 import z from "zod";
 
+import { LastUsed, useLastUsed } from "@calcom/features/auth/lib/hooks/useLastUsed";
 import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
 import { emailRegex } from "@calcom/lib/emailSchema";
-import { LastUsed, useLastUsed } from "@calcom/lib/hooks/useLastUsed";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import type { ButtonProps } from "@calcom/ui/components/button";
diff --git a/packages/lib/getLocaleFromRequest.ts b/packages/features/auth/lib/getLocaleFromRequest.ts
similarity index 100%
rename from packages/lib/getLocaleFromRequest.ts
rename to packages/features/auth/lib/getLocaleFromRequest.ts
diff --git a/packages/features/auth/lib/getServerSession.ts b/packages/features/auth/lib/getServerSession.ts
index 3512da13d98848..168860c962cb4e 100644
--- a/packages/features/auth/lib/getServerSession.ts
+++ b/packages/features/auth/lib/getServerSession.ts
@@ -8,7 +8,7 @@ import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 const log = logger.getSubLogger({ prefix: ["getServerSession"] });
diff --git a/packages/lib/hooks/useLastUsed.tsx b/packages/features/auth/lib/hooks/useLastUsed.tsx
similarity index 100%
rename from packages/lib/hooks/useLastUsed.tsx
rename to packages/features/auth/lib/hooks/useLastUsed.tsx
diff --git a/packages/features/auth/lib/next-auth-options.ts b/packages/features/auth/lib/next-auth-options.ts
index 4874f77b7d8336..bd27b53b3e5f9f 100644
--- a/packages/features/auth/lib/next-auth-options.ts
+++ b/packages/features/auth/lib/next-auth-options.ts
@@ -32,11 +32,11 @@ import logger from "@calcom/lib/logger";
 import { randomString } from "@calcom/lib/random";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { hashEmail } from "@calcom/lib/server/PiiHasher";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";
 import type { Membership, Team } from "@calcom/prisma/client";
diff --git a/packages/features/auth/lib/verifyEmail.ts b/packages/features/auth/lib/verifyEmail.ts
index 192b7ba4635b27..4163d5423e8a39 100644
--- a/packages/features/auth/lib/verifyEmail.ts
+++ b/packages/features/auth/lib/verifyEmail.ts
@@ -7,13 +7,14 @@ import {
   sendChangeOfEmailVerificationLink,
 } from "@calcom/emails/email-manager";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
+import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";
 import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
+import { hashEmail } from "@calcom/lib/server/PiiHasher";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { prisma } from "@calcom/prisma";
-import { hashEmail } from "@calcom/lib/server/PiiHasher";
 
 const log = logger.getSubLogger({ prefix: [`[[Auth] `] });
 
@@ -43,7 +44,7 @@ export const sendEmailVerification = async ({
     return { ok: true, skipped: true };
   }
 
-  if (await checkIfEmailIsBlockedInWatchlistController(email)) {
+  if (await checkIfEmailIsBlockedInWatchlistController({ email, organizationId: null, span: sentrySpan })) {
     log.warn("Email is blocked - not sending verification email", email);
     return { ok: false, skipped: false };
   }
@@ -90,7 +91,7 @@ export const sendEmailVerificationByCode = async ({
   username,
   isVerifyingEmail,
 }: VerifyEmailType) => {
-  if (await checkIfEmailIsBlockedInWatchlistController(email)) {
+  if (await checkIfEmailIsBlockedInWatchlistController({ email, organizationId: null, span: sentrySpan })) {
     log.warn("Email is blocked - not sending verification email", email);
     return { ok: false, skipped: false };
   }
@@ -136,7 +137,13 @@ export const sendChangeOfEmailVerification = async ({ user, language }: ChangeOf
     return { ok: true, skipped: true };
   }
 
-  if (await checkIfEmailIsBlockedInWatchlistController(user.emailFrom)) {
+  if (
+    await checkIfEmailIsBlockedInWatchlistController({
+      email: user.emailFrom,
+      organizationId: null,
+      span: sentrySpan,
+    })
+  ) {
     log.warn("Email is blocked - not sending verification email", user.emailFrom);
     return { ok: false, skipped: false };
   }
diff --git a/packages/features/auth/signup/handlers/calcomHandler.ts b/packages/features/auth/signup/handlers/calcomHandler.ts
index adecb8e14eb293..76a95feb71f06a 100644
--- a/packages/features/auth/signup/handlers/calcomHandler.ts
+++ b/packages/features/auth/signup/handlers/calcomHandler.ts
@@ -2,19 +2,20 @@ import { cookies, headers } from "next/headers";
 import { NextResponse } from "next/server";
 
 import { getPremiumMonthlyPlanPriceId } from "@calcom/app-store/stripepayment/lib/utils";
+import { getLocaleFromRequest } from "@calcom/features/auth/lib/getLocaleFromRequest";
 import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
 import { createOrUpdateMemberships } from "@calcom/features/auth/signup/utils/createOrUpdateMemberships";
 import { prefillAvatar } from "@calcom/features/auth/signup/utils/prefillAvatar";
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/features/auth/signup/utils/validateUsername";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
+import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";
 import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 import { hashPassword } from "@calcom/lib/auth/hashPassword";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { getLocaleFromRequest } from "@calcom/lib/getLocaleFromRequest";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import type { CustomNextApiHandler } from "@calcom/lib/server/username";
 import { usernameHandler } from "@calcom/lib/server/username";
-import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/lib/validateUsername";
 import { prisma } from "@calcom/prisma";
 import { CreationSource } from "@calcom/prisma/enums";
 import { IdentityProvider } from "@calcom/prisma/enums";
@@ -45,7 +46,11 @@ const handler: CustomNextApiHandler = async (body, usernameStatus) => {
 
   const billingService = new StripeBillingService();
 
-  const shouldLockByDefault = await checkIfEmailIsBlockedInWatchlistController(_email);
+  const shouldLockByDefault = await checkIfEmailIsBlockedInWatchlistController({
+    email: _email,
+    organizationId: null,
+    span: sentrySpan,
+  });
 
   log.debug("handler", { email: _email });
 
diff --git a/packages/features/auth/signup/handlers/selfHostedHandler.ts b/packages/features/auth/signup/handlers/selfHostedHandler.ts
index 6b2028b2e8845a..5bfc23335cf52a 100644
--- a/packages/features/auth/signup/handlers/selfHostedHandler.ts
+++ b/packages/features/auth/signup/handlers/selfHostedHandler.ts
@@ -3,12 +3,12 @@ import { NextResponse } from "next/server";
 import { checkPremiumUsername } from "@calcom/ee/common/lib/checkPremiumUsername";
 import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
 import { createOrUpdateMemberships } from "@calcom/features/auth/signup/utils/createOrUpdateMemberships";
+import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/features/auth/signup/utils/validateUsername";
 import { hashPassword } from "@calcom/lib/auth/hashPassword";
 import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { isUsernameReservedDueToMigration } from "@calcom/lib/server/username";
 import slugify from "@calcom/lib/slugify";
-import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/lib/validateUsername";
 import prisma from "@calcom/prisma";
 import { IdentityProvider } from "@calcom/prisma/enums";
 import { signupSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/auth/signup/utils/createOrUpdateMemberships.ts b/packages/features/auth/signup/utils/createOrUpdateMemberships.ts
index 0df016f7e79365..da58171a8d0382 100644
--- a/packages/features/auth/signup/utils/createOrUpdateMemberships.ts
+++ b/packages/features/auth/signup/utils/createOrUpdateMemberships.ts
@@ -1,5 +1,5 @@
 import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
 import type { Team, User, OrganizationSettings } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/features/auth/signup/utils/organization.ts b/packages/features/auth/signup/utils/organization.ts
index 5b5e27c926a067..1aac93e4197998 100644
--- a/packages/features/auth/signup/utils/organization.ts
+++ b/packages/features/auth/signup/utils/organization.ts
@@ -1,5 +1,5 @@
 import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
 import type { Team, OrganizationSettings } from "@calcom/prisma/client";
 
diff --git a/packages/features/auth/signup/utils/token.ts b/packages/features/auth/signup/utils/token.ts
index 88c23c34e8a10b..843a5d6e87cd9f 100644
--- a/packages/features/auth/signup/utils/token.ts
+++ b/packages/features/auth/signup/utils/token.ts
@@ -1,6 +1,6 @@
 import dayjs from "@calcom/dayjs";
+import { validateAndGetCorrectedUsernameInTeam } from "@calcom/features/auth/signup/utils/validateUsername";
 import { HttpError } from "@calcom/lib/http-error";
-import { validateAndGetCorrectedUsernameInTeam } from "@calcom/lib/validateUsername";
 import { prisma } from "@calcom/prisma";
 
 export async function findTokenByToken({ token }: { token: string }) {
diff --git a/packages/lib/validateUsername.ts b/packages/features/auth/signup/utils/validateUsername.ts
similarity index 100%
rename from packages/lib/validateUsername.ts
rename to packages/features/auth/signup/utils/validateUsername.ts
diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts
similarity index 100%
rename from packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts
rename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts
diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts
similarity index 95%
rename from packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts
rename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts
index 7bde5594f2023d..f1706f7dec8f01 100644
--- a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts
+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts
@@ -1,4 +1,4 @@
-import type { DateRange } from "@calcom/lib/date-ranges";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 import { IntervalTree, ContainmentSearchAlgorithm, createIntervalNodes } from "@calcom/lib/intervalTree";
 
 /**
diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts
similarity index 97%
rename from packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts
rename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts
index 2aa8cc6809d4d2..1fe980f1c70bc2 100644
--- a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts
+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
 
 import dayjs from "@calcom/dayjs";
-import type { DateRange } from "@calcom/lib/date-ranges";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 
 import { mergeOverlappingDateRanges } from "./mergeOverlappingDateRanges";
 
diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts
similarity index 92%
rename from packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts
rename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts
index 21199be1584815..7f2411d33c5611 100644
--- a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts
+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts
@@ -1,4 +1,4 @@
-import type { DateRange } from "@calcom/lib/date-ranges";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 
 export function mergeOverlappingDateRanges(dateRanges: DateRange[]) {
   dateRanges.sort((a, b) => a.start.valueOf() - b.start.valueOf());
diff --git a/packages/lib/getAggregatedAvailability.test.ts b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.test.ts
similarity index 100%
rename from packages/lib/getAggregatedAvailability.test.ts
rename to packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.test.ts
diff --git a/packages/lib/getAggregatedAvailability.ts b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts
similarity index 87%
rename from packages/lib/getAggregatedAvailability.ts
rename to packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts
index e78f5d198213f8..ad3afaa1e2fa50 100644
--- a/packages/lib/getAggregatedAvailability.ts
+++ b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts
@@ -1,10 +1,10 @@
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
+import { intersect } from "@calcom/features/schedules/lib/date-ranges";
 import { DEFAULT_GROUP_ID } from "@calcom/lib/constants";
-import type { DateRange } from "@calcom/lib/date-ranges";
-import { intersect } from "@calcom/lib/date-ranges";
 import { SchedulingType } from "@calcom/prisma/enums";
 
-import { filterRedundantDateRanges } from "./getAggregatedAvailability/date-range-utils/filterRedundantDateRanges";
-import { mergeOverlappingDateRanges } from "./getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges";
+import { filterRedundantDateRanges } from "./date-range-utils/filterRedundantDateRanges";
+import { mergeOverlappingDateRanges } from "./date-range-utils/mergeOverlappingDateRanges";
 
 function uniqueAndSortedDateRanges(ranges: DateRange[]): DateRange[] {
   const seen = new Set<string>();
diff --git a/packages/features/availability/lib/getUserAvailability.ts b/packages/features/availability/lib/getUserAvailability.ts
index d897a2e7be026c..f135e611592a2c 100644
--- a/packages/features/availability/lib/getUserAvailability.ts
+++ b/packages/features/availability/lib/getUserAvailability.ts
@@ -4,26 +4,26 @@ import { z } from "zod";
 import { getCalendar } from "@calcom/app-store/_utils/getCalendar";
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import {
+  getBusyTimesFromLimits,
+  getBusyTimesFromTeamLimits,
+} from "@calcom/features/busyTimes/lib/getBusyTimesFromLimits";
 import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import type { IRedisService } from "@calcom/features/redis/IRedisService";
+import type { DateOverride, WorkingHours } from "@calcom/features/schedules/lib/date-ranges";
+import { buildDateRanges, subtract } from "@calcom/features/schedules/lib/date-ranges";
 import { getWorkingHours } from "@calcom/lib/availability";
-import type { DateOverride, WorkingHours } from "@calcom/lib/date-ranges";
-import { buildDateRanges, subtract } from "@calcom/lib/date-ranges";
 import { stringToDayjsZod } from "@calcom/lib/dayjs";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
 import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
 import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits";
-import {
-  getBusyTimesFromLimits,
-  getBusyTimesFromTeamLimits,
-} from "@calcom/lib/intervalLimits/server/getBusyTimesFromLimits";
 import { getPeriodStartDatesBetween as getPeriodStartDatesBetweenUtil } from "@calcom/lib/intervalLimits/utils/getPeriodStartDatesBetween";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
 import type { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
 import type {
   Booking,
@@ -641,9 +641,9 @@ export class UserAvailabilityService {
           // you can obtain that from user availability defined outside of here
           fromUser: { id: user.id, displayName: user.name },
           // optional chaining destructuring toUser
-          toUser: !!toUser ? { id: toUser.id, displayName: toUser.name, username: toUser.username } : null,
-          reason: !!reason ? reason.reason : null,
-          emoji: !!reason ? reason.emoji : null,
+          toUser: toUser ? { id: toUser.id, displayName: toUser.name, username: toUser.username } : null,
+          reason: reason ? reason.reason : null,
+          emoji: reason ? reason.emoji : null,
         };
       }
 
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
index 137c4abaa18b2f..a9abddc0cb7b0c 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
@@ -301,6 +301,7 @@ const getError = ({
   const error = dataError;
 
   let date = "";
+  let count = 0;
 
   if (error.message === ErrorCode.BookerLimitExceededReschedule) {
     const formattedDate = formatEventFromTime({
@@ -312,9 +313,16 @@ const getError = ({
     date = `${formattedDate.date} ${formattedDate.time}`;
   }
 
+  if (error.message === ErrorCode.BookerLimitExceeded && error.data?.count) {
+    count = error.data.count;
+  }
+
+  const messageKey =
+    error.message === ErrorCode.BookerLimitExceeded ? "booker_upcoming_limit_reached" : error.message;
+
   return error?.message ? (
     <>
-      {responseVercelIdHeader ?? ""} {t(error.message, { date })}
+      {responseVercelIdHeader ?? ""} {t(messageKey, { date, count })}
     </>
   ) : (
     <>{t("can_you_try_again")}</>
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
index 6197e948af73a4..3b7195ef782aed 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
@@ -8,12 +8,11 @@ import getLocationOptionsForSelect from "@calcom/features/bookings/lib/getLocati
 import { FormBuilderField } from "@calcom/features/form-builder/FormBuilderField";
 import { fieldTypesConfigMap } from "@calcom/features/form-builder/fieldTypes";
 import { fieldsThatSupportLabelAsSafeHtml } from "@calcom/features/form-builder/fieldsThatSupportLabelAsSafeHtml";
+import { SystemField } from "@calcom/lib/bookings/SystemField";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import type { RouterOutputs } from "@calcom/trpc/react";
 
-import { SystemField } from "../../../lib/SystemField";
-
 type Fields = NonNullable<RouterOutputs["viewer"]["public"]["event"]>["bookingFields"];
 export const BookingFields = ({
   fields,
diff --git a/packages/features/bookings/Booker/components/DecoyBookingSuccessCard.tsx b/packages/features/bookings/Booker/components/DecoyBookingSuccessCard.tsx
new file mode 100644
index 00000000000000..81021b47ce548d
--- /dev/null
+++ b/packages/features/bookings/Booker/components/DecoyBookingSuccessCard.tsx
@@ -0,0 +1,115 @@
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
+
+export interface DecoyBookingSuccessCardProps {
+  title: string;
+  formattedDate: string;
+  formattedTime: string;
+  endTime: string;
+  formattedTimeZone: string;
+  hostName: string | null;
+  hostEmail: string | null;
+  attendeeName: string | null;
+  attendeeEmail: string | null;
+  location: string | null;
+}
+
+export function DecoyBookingSuccessCard({
+  title,
+  formattedDate,
+  formattedTime,
+  endTime,
+  formattedTimeZone,
+  hostName,
+  hostEmail,
+  attendeeName,
+  attendeeEmail,
+  location,
+}: DecoyBookingSuccessCardProps) {
+  const { t } = useLocale();
+
+  return (
+    <div className="h-screen">
+      <main className="mx-auto max-w-3xl">
+        <div className="overflow-y-auto">
+          <div className="flex items-end justify-center px-4 pb-20 pt-4 text-center sm:flex sm:p-0">
+            <div className="main inset-0 my-4 flex flex-col transition-opacity sm:my-0" aria-hidden="true">
+              <div
+                className="bg-default dark:bg-muted border-booker border-booker-width inline-block transform overflow-hidden rounded-lg px-8 pb-4 pt-5 text-left align-bottom transition-all sm:my-8 sm:w-full sm:max-w-xl sm:py-8 sm:align-middle"
+                role="dialog"
+                aria-modal="true"
+                aria-labelledby="modal-headline">
+                <div>
+                  <div className="bg-success mx-auto flex h-12 w-12 items-center justify-center rounded-full">
+                    <Icon name="check" className="h-5 w-5 text-green-600 dark:text-green-400" />
+                  </div>
+                </div>
+                <div className="mb-8 mt-6 text-center last:mb-0">
+                  <h3 className="text-emphasis text-2xl font-semibold leading-6" id="modal-headline">
+                    {t("meeting_is_scheduled")}
+                  </h3>
+
+                  <div className="mt-3">
+                    <p className="text-default">{t("emailed_you_and_any_other_attendees")}</p>
+                  </div>
+
+                  <div className="border-subtle text-default mt-8 grid grid-cols-3 gap-x-4 border-t pt-8 text-left rtl:text-right sm:gap-x-0">
+                    <div className="font-medium">{t("what")}</div>
+                    <div className="col-span-2 mb-6 last:mb-0">{title}</div>
+
+                    {formattedDate && (
+                      <>
+                        <div className="font-medium">{t("when")}</div>
+                        <div className="col-span-2 mb-6 last:mb-0">
+                          {formattedDate}
+                          {formattedTime && (
+                            <>
+                              <br />
+                              {formattedTime}
+                              {endTime && ` - ${endTime}`}
+                              {formattedTimeZone && (
+                                <span className="text-bookinglight"> ({formattedTimeZone})</span>
+                              )}
+                            </>
+                          )}
+                        </div>
+                      </>
+                    )}
+
+                    <div className="font-medium">{t("who")}</div>
+                    <div className="col-span-2 last:mb-0">
+                      {hostName && (
+                        <div className="mb-3">
+                          <div>
+                            <span className="mr-2">{hostName}</span>
+                            <Badge variant="blue">{t("Host")}</Badge>
+                          </div>
+                          {hostEmail && <p className="text-default">{hostEmail}</p>}
+                        </div>
+                      )}
+                      {attendeeName && (
+                        <div className="mb-3 last:mb-0">
+                          <p>{attendeeName}</p>
+                          {attendeeEmail && <p>{attendeeEmail}</p>}
+                        </div>
+                      )}
+                    </div>
+
+                    {location && (
+                      <>
+                        <div className="mt-3 font-medium">{t("where")}</div>
+                        <div className="col-span-2 mt-3">{t("web_conferencing_details_to_follow")}</div>
+                      </>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+  );
+}
+
diff --git a/packages/features/bookings/Booker/components/LargeCalendar.tsx b/packages/features/bookings/Booker/components/LargeCalendar.tsx
index 839b5a6fdc67a6..d1accdc72a7673 100644
--- a/packages/features/bookings/Booker/components/LargeCalendar.tsx
+++ b/packages/features/bookings/Booker/components/LargeCalendar.tsx
@@ -3,6 +3,7 @@ import { useMemo, useEffect } from "react";
 import dayjs from "@calcom/dayjs";
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import { useAvailableTimeSlots } from "@calcom/features/bookings/Booker/components/hooks/useAvailableTimeSlots";
+import { useBookerTime } from "@calcom/features/bookings/Booker/components/hooks/useBookerTime";
 import type { BookerEvent } from "@calcom/features/bookings/types";
 import { Calendar } from "@calcom/features/calendars/weeklyview";
 import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
@@ -31,6 +32,7 @@ export const LargeCalendar = ({
   const overlayEvents = useOverlayCalendarStore((state) => state.overlayBusyDates);
   const displayOverlay =
     getQueryParam("overlayCalendar") === "true" || localStorage?.getItem("overlayCalendarSwitchDefault");
+  const { timezone } = useBookerTime();
 
   const eventDuration = selectedEventDuration || event?.data?.length || 30;
 
@@ -43,7 +45,6 @@ export const LargeCalendar = ({
 
   // HACK: force rerender when overlay events change
   // Sine we dont use react router here we need to force rerender (ATOM SUPPORT)
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   useEffect(() => {}, [displayOverlay]);
 
   const overlayEventsForDate = useMemo(() => {
@@ -75,6 +76,7 @@ export const LargeCalendar = ({
         gridCellsPerHour={60 / eventDuration}
         hoverEventDuration={eventDuration}
         hideHeader
+        timezone={timezone}
       />
     </div>
   );
diff --git a/packages/features/bookings/Booker/components/hooks/useBookings.ts b/packages/features/bookings/Booker/components/hooks/useBookings.ts
index e5a2c8ecb7b6db..87915e4b624a8e 100644
--- a/packages/features/bookings/Booker/components/hooks/useBookings.ts
+++ b/packages/features/bookings/Booker/components/hooks/useBookings.ts
@@ -11,11 +11,14 @@ import dayjs from "@calcom/dayjs";
 import { sdkActionManager } from "@calcom/embed-core/embed-iframe";
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import { updateQueryParam, getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param";
-import { createBooking, createRecurringBooking, createInstantBooking } from "@calcom/features/bookings/lib";
+import { storeDecoyBooking } from "@calcom/features/bookings/lib/client/decoyBookingStore";
+import { createBooking } from "@calcom/features/bookings/lib/create-booking";
+import { createInstantBooking } from "@calcom/features/bookings/lib/create-instant-booking";
+import { createRecurringBooking } from "@calcom/features/bookings/lib/create-recurring-booking";
 import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import type { BookerEvent } from "@calcom/features/bookings/types";
 import { getFullName } from "@calcom/features/form-builder/utils";
-import { useBookingSuccessRedirect } from "@calcom/lib/bookingSuccessRedirect";
+import { useBookingSuccessRedirect } from "../../../lib/bookingSuccessRedirect";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { localStorage } from "@calcom/lib/webstorage";
@@ -165,13 +168,7 @@ const storeInLocalStorage = ({
   localStorage.setItem(STORAGE_KEY, value);
 };
 
-export const useBookings = ({
-  event,
-  hashedLink,
-  bookingForm,
-  metadata,
-  isBookingDryRun,
-}: IUseBookings) => {
+export const useBookings = ({ event, hashedLink, bookingForm, metadata, isBookingDryRun }: IUseBookings) => {
   const router = useRouter();
   const eventSlug = useBookerStoreContext((state) => state.eventSlug);
   const eventTypeId = useBookerStoreContext((state) => state.eventId);
@@ -248,7 +245,7 @@ export const useBookings = ({
         } else {
           showToast(t("something_went_wrong_on_our_end"), "error");
         }
-      } catch (err) {
+      } catch {
         showToast(t("something_went_wrong_on_our_end"), "error");
       }
     },
@@ -259,12 +256,6 @@ export const useBookings = ({
     mutationFn: createBooking,
     onSuccess: (booking) => {
       if (booking.isDryRun) {
-        const validDuration = event.data?.isDynamic
-          ? duration || event.data?.length
-          : duration && event.data?.metadata?.multipleDuration?.includes(duration)
-          ? duration
-          : event.data?.length;
-
         if (isRescheduling) {
           sdkActionManager?.fire(
             "dryRunRescheduleBookingSuccessfulV2",
@@ -286,6 +277,28 @@ export const useBookings = ({
         router.push("/booking/dry-run-successful");
         return;
       }
+
+      if ("isShortCircuitedBooking" in booking && booking.isShortCircuitedBooking) {
+        if (!booking.uid) {
+          console.error("Decoy booking missing uid");
+          return;
+        }
+
+        const bookingData = {
+          uid: booking.uid,
+          title: booking.title ?? null,
+          startTime: booking.startTime,
+          endTime: booking.endTime,
+          booker: booking.attendees?.[0] ?? null,
+          host: booking.user ?? null,
+          location: booking.location ?? null,
+        };
+
+        storeDecoyBooking(bookingData);
+        router.push(`/booking-successful/${booking.uid}`);
+        return;
+      }
+
       const { uid, paymentUid } = booking;
       const fullName = getFullName(bookingForm.getValues("responses.name"));
 
@@ -380,9 +393,10 @@ export const useBookings = ({
             : event?.data?.forwardParamsSuccessRedirect,
       });
     },
-    onError: (err, _, ctx) => {
-      // eslint-disable-next-line @calcom/eslint/no-scroll-into-view-embed -- It is only called when user takes an action in embed
-      bookerFormErrorRef && bookerFormErrorRef.current?.scrollIntoView({ behavior: "smooth" });
+    onError: (err) => {
+      if (bookerFormErrorRef?.current) {
+        bookerFormErrorRef.current.scrollIntoView({ behavior: "smooth" });
+      }
 
       const error = err as Error & {
         data: { rescheduleUid: string; startTime: string; attendees: string[] };
@@ -414,10 +428,11 @@ export const useBookings = ({
       updateQueryParam("bookingId", responseData.bookingId);
       setExpiryTime(responseData.expires);
     },
-    onError: (err, _, ctx) => {
+    onError: (err) => {
       console.error("Error creating instant booking", err);
-      // eslint-disable-next-line @calcom/eslint/no-scroll-into-view-embed -- It is only called when user takes an action in embed
-      bookerFormErrorRef && bookerFormErrorRef.current?.scrollIntoView({ behavior: "smooth" });
+      if (bookerFormErrorRef?.current) {
+        bookerFormErrorRef.current.scrollIntoView({ behavior: "smooth" });
+      }
     },
   });
 
@@ -513,15 +528,10 @@ export const useBookings = ({
     bookingForm,
     hashedLink,
     metadata,
-    handleInstantBooking: (
-      variables: Parameters<typeof createInstantBookingMutation.mutate>[0]
-    ) => {
+    handleInstantBooking: (variables: Parameters<typeof createInstantBookingMutation.mutate>[0]) => {
       const remaining = getInstantCooldownRemainingMs(eventTypeId);
       if (remaining > 0) {
-        showToast(
-          t("please_try_again_later_or_book_another_slot"),
-          "error"
-        );
+        showToast(t("please_try_again_later_or_book_another_slot"), "error");
         return;
       }
       createInstantBookingMutation.mutate(variables);
diff --git a/packages/features/bookings/Booker/components/hooks/useDecoyBooking.ts b/packages/features/bookings/Booker/components/hooks/useDecoyBooking.ts
new file mode 100644
index 00000000000000..39356f04ba243a
--- /dev/null
+++ b/packages/features/bookings/Booker/components/hooks/useDecoyBooking.ts
@@ -0,0 +1,31 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
+
+import { getDecoyBooking } from "@calcom/features/bookings/lib/client/decoyBookingStore";
+import type { DecoyBookingData } from "@calcom/features/bookings/lib/client/decoyBookingStore";
+
+/**
+ * Hook to retrieve and manage decoy booking data from localStorage
+ * @param uid - The booking uid
+ * @returns The booking data or null if not found/expired
+ */
+export function useDecoyBooking(uid: string) {
+  const router = useRouter();
+  const [bookingData, setBookingData] = useState<DecoyBookingData | null>(null);
+
+  useEffect(() => {
+    const data = getDecoyBooking(uid);
+
+    if (!data) {
+      router.push("/404");
+      return;
+    }
+
+    setBookingData(data);
+  }, [uid, router]);
+
+  return bookingData;
+}
+
diff --git a/packages/features/bookings/Booker/components/hooks/usePrefetch.ts b/packages/features/bookings/Booker/components/hooks/usePrefetch.ts
index 1f5cf300e72171..3f746aaf977fb9 100644
--- a/packages/features/bookings/Booker/components/hooks/usePrefetch.ts
+++ b/packages/features/bookings/Booker/components/hooks/usePrefetch.ts
@@ -1,6 +1,8 @@
 import dayjs from "@calcom/dayjs";
 import type { BookerState } from "@calcom/features/bookings/Booker/types";
-import { BookerLayouts } from "@calcom/prisma/zod-utils";
+
+import { getPrefetchMonthCount } from "../../utils/getPrefetchMonthCount";
+import { isPrefetchNextMonthEnabled } from "../../utils/isPrefetchNextMonthEnabled";
 
 interface UsePrefetchParams {
   date: string;
@@ -21,33 +23,22 @@ export const usePrefetch = ({ date, month, bookerLayout, bookerState }: UsePrefe
     .add(bookerLayout.columnViewExtraDays.current, "day")
     .month();
 
-  const isValidDate = dayjs(date).isValid();
-  const twoWeeksAfter = dayjs(month).startOf("month").add(2, "week");
-  const isSameMonth = dayjs().isSame(dayjs(month), "month");
-  const isAfter2Weeks = dayjs().isAfter(twoWeeksAfter);
-
-  const prefetchNextMonth =
-    (bookerLayout.layout === BookerLayouts.WEEK_VIEW &&
-      !!bookerLayout.extraDays &&
-      !isNaN(dateMonth) &&
-      !isNaN(monthAfterAddingExtraDays) &&
-      dateMonth !== monthAfterAddingExtraDays) ||
-    (bookerLayout.layout === BookerLayouts.COLUMN_VIEW &&
-      !isNaN(dateMonth) &&
-      !isNaN(monthAfterAddingExtraDaysColumnView) &&
-      dateMonth !== monthAfterAddingExtraDaysColumnView) ||
-    ((bookerLayout.layout === BookerLayouts.MONTH_VIEW || bookerLayout.layout === "mobile") &&
-      (!isValidDate || isSameMonth) &&
-      isAfter2Weeks);
-
-  const monthCount =
-    ((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
-      bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
-    !isNaN(monthAfterAdding1Month) &&
-    !isNaN(monthAfterAddingExtraDaysColumnView) &&
-    monthAfterAdding1Month !== monthAfterAddingExtraDaysColumnView
-      ? 2
-      : undefined;
+  const prefetchNextMonth = isPrefetchNextMonthEnabled(
+    bookerLayout.layout,
+    date,
+    dateMonth,
+    monthAfterAddingExtraDays,
+    monthAfterAddingExtraDaysColumnView,
+    month,
+    bookerLayout.extraDays
+  );
+  const monthCount = getPrefetchMonthCount(
+    bookerLayout.layout,
+    bookerState,
+    monthAfterAdding1Month,
+    monthAfterAddingExtraDaysColumnView,
+    prefetchNextMonth
+  );
 
   return {
     prefetchNextMonth,
diff --git a/packages/features/bookings/Booker/utils/areDifferentValidMonths.test.ts b/packages/features/bookings/Booker/utils/areDifferentValidMonths.test.ts
new file mode 100644
index 00000000000000..c899df1939f89f
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/areDifferentValidMonths.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+
+import { areDifferentValidMonths } from "./areDifferentValidMonths";
+
+describe("areDifferentValidMonths", () => {
+  describe("valid different months", () => {
+    it("should return true for different valid month numbers", () => {
+      expect(areDifferentValidMonths(0, 1)).toBe(true);
+      expect(areDifferentValidMonths(5, 10)).toBe(true);
+      expect(areDifferentValidMonths(11, 0)).toBe(true);
+    });
+  });
+
+  describe("same month numbers", () => {
+    it("should return false for identical month numbers", () => {
+      expect(areDifferentValidMonths(0, 0)).toBe(false);
+      expect(areDifferentValidMonths(6, 6)).toBe(false);
+      expect(areDifferentValidMonths(11, 11)).toBe(false);
+    });
+  });
+
+  describe("invalid inputs", () => {
+    it("should return false for NaN values", () => {
+      expect(areDifferentValidMonths(NaN, 5)).toBe(false);
+      expect(areDifferentValidMonths(5, NaN)).toBe(false);
+      expect(areDifferentValidMonths(NaN, NaN)).toBe(false);
+    });
+
+    it("should return false for Infinity values", () => {
+      expect(areDifferentValidMonths(Infinity, 5)).toBe(false);
+      expect(areDifferentValidMonths(5, Infinity)).toBe(false);
+      expect(areDifferentValidMonths(Infinity, Infinity)).toBe(false);
+    });
+
+    it("should return false for -Infinity values", () => {
+      expect(areDifferentValidMonths(-Infinity, 5)).toBe(false);
+      expect(areDifferentValidMonths(5, -Infinity)).toBe(false);
+      expect(areDifferentValidMonths(-Infinity, -Infinity)).toBe(false);
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle negative month numbers correctly", () => {
+      expect(areDifferentValidMonths(-1, 5)).toBe(true);
+      expect(areDifferentValidMonths(-1, -1)).toBe(false);
+    });
+
+    it("should handle month numbers beyond 11", () => {
+      expect(areDifferentValidMonths(12, 5)).toBe(true);
+      expect(areDifferentValidMonths(100, 200)).toBe(true);
+    });
+  });
+});
diff --git a/packages/features/bookings/Booker/utils/areDifferentValidMonths.ts b/packages/features/bookings/Booker/utils/areDifferentValidMonths.ts
new file mode 100644
index 00000000000000..6fca03d1956340
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/areDifferentValidMonths.ts
@@ -0,0 +1,14 @@
+export const areDifferentValidMonths = (firstMonth: number, secondMonth: number) => {
+  const isFirstMonthValid = Number.isFinite(firstMonth);
+  const isSecondMonthValid = Number.isFinite(secondMonth);
+
+  if (!isFirstMonthValid || !isSecondMonthValid) {
+    return false;
+  }
+
+  if (firstMonth === secondMonth) {
+    return false;
+  }
+
+  return true;
+};
diff --git a/packages/features/bookings/Booker/utils/getPrefetchMonthCount.test.ts b/packages/features/bookings/Booker/utils/getPrefetchMonthCount.test.ts
new file mode 100644
index 00000000000000..2db3076a28add5
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/getPrefetchMonthCount.test.ts
@@ -0,0 +1,103 @@
+import { describe, expect, it } from "vitest";
+
+import { BookerLayouts } from "@calcom/prisma/zod-utils";
+
+import { getPrefetchMonthCount } from "./getPrefetchMonthCount";
+
+describe("getPrefetchMonthCount", () => {
+  describe("COLUMN_VIEW layout", () => {
+    it("should return 2 when months are different", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", 1, 2, false);
+      expect(result).toBe(2);
+    });
+
+    it("should return undefined when months are the same", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", 5, 5, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return 2 regardless of bookerState when months are different", () => {
+      expect(getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_time", 3, 4, false)).toBe(2);
+      expect(getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "booking", 7, 8, false)).toBe(2);
+    });
+
+    it("should return 2 even when prefetchNextMonth is true", () => {
+      expect(getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_time", 3, 4, true)).toBe(2);
+    });
+  });
+
+  describe("WEEK_VIEW layout", () => {
+    it("should return undefined when state is selecting_time", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.WEEK_VIEW, "selecting_time", 1, 2, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined when state is not selecting_time", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.WEEK_VIEW, "selecting_date", 1, 2, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined even with different months", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.WEEK_VIEW, "booking", 0, 11, false);
+      expect(result).toBe(undefined);
+    });
+  });
+
+  describe("MONTH_VIEW layout with selecting_time state", () => {
+    it("should return 2 when months are different and NOT prefetching", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.MONTH_VIEW, "selecting_time", 3, 4, false);
+      expect(result).toBe(2);
+    });
+
+    it("should return undefined when months are different but ALREADY prefetching", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.MONTH_VIEW, "selecting_time", 3, 4, true);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined when months are the same", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.MONTH_VIEW, "selecting_time", 6, 6, false);
+      expect(result).toBe(undefined);
+    });
+  });
+
+  describe("MONTH_VIEW layout with other states", () => {
+    it("should return undefined when state is selecting_date", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.MONTH_VIEW, "selecting_date", 1, 2, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined when state is booking", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.MONTH_VIEW, "booking", 1, 2, false);
+      expect(result).toBe(undefined);
+    });
+  });
+
+  describe("invalid month inputs", () => {
+    it("should return undefined when first month is NaN", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", NaN, 5, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined when second month is NaN", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", 5, NaN, false);
+      expect(result).toBe(undefined);
+    });
+
+    it("should return undefined when both months are invalid", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_time", Infinity, -Infinity, false);
+      expect(result).toBe(undefined);
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle month transitions (11 to 0)", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", 11, 0, false);
+      expect(result).toBe(2);
+    });
+
+    it("should handle negative month numbers if they are different", () => {
+      const result = getPrefetchMonthCount(BookerLayouts.COLUMN_VIEW, "selecting_date", -1, 5, false);
+      expect(result).toBe(2);
+    });
+  });
+});
diff --git a/packages/features/bookings/Booker/utils/getPrefetchMonthCount.ts b/packages/features/bookings/Booker/utils/getPrefetchMonthCount.ts
new file mode 100644
index 00000000000000..94be221b1f073d
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/getPrefetchMonthCount.ts
@@ -0,0 +1,35 @@
+import { BookerLayouts } from "@calcom/prisma/zod-utils";
+
+import type { BookerState } from "../types";
+import { areDifferentValidMonths } from "./areDifferentValidMonths";
+
+export const getPrefetchMonthCount = (
+  bookerLayout: string,
+  bookerState: BookerState,
+  firstMonth: number,
+  secondMonth: number,
+  prefetchNextMonth: boolean
+) => {
+  const isDifferentMonth = areDifferentValidMonths(firstMonth, secondMonth);
+
+  const isWeekView = bookerLayout === BookerLayouts.WEEK_VIEW;
+  const isColumnView = bookerLayout === BookerLayouts.COLUMN_VIEW;
+  const isSelectingTime = bookerState === "selecting_time";
+
+  if (!isDifferentMonth) return undefined;
+
+  // Column view always needs 2 months because it displays multiple weeks side-by-side,
+  // regardless of user state or whether we're already prefetching
+  if (isColumnView) return 2;
+
+  // Month view conditionally needs an extra month for performance optimization.
+  // Only return 2 when:
+  // 1. User is selecting time slots (improves UX by preloading more availability)
+  // 2. We're NOT already prefetching next month (prevents duplicate API calls)
+  //
+  // If prefetchNextMonth is already true (e.g., viewing dates after 15th of month),
+  // we don't need extra months since the next month is already being fetched via prefetchNextMonth
+  if (!isWeekView && isSelectingTime && !prefetchNextMonth) return 2;
+
+  return undefined;
+};
diff --git a/packages/features/bookings/Booker/utils/isMonthChange.test.ts b/packages/features/bookings/Booker/utils/isMonthChange.test.ts
new file mode 100644
index 00000000000000..9e40343e54e65a
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isMonthChange.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from "vitest";
+
+import { isMonthChange } from "./isMonthChange";
+
+describe("isMonthChange", () => {
+  describe("when months are different", () => {
+    it("should return true for consecutive months", () => {
+      expect(isMonthChange(0, 1)).toBe(true);
+      expect(isMonthChange(5, 6)).toBe(true);
+      expect(isMonthChange(10, 11)).toBe(true);
+    });
+
+    it("should return true for non-consecutive months", () => {
+      expect(isMonthChange(0, 11)).toBe(true);
+      expect(isMonthChange(3, 9)).toBe(true);
+    });
+
+    it("should return true for year transition (11 to 0)", () => {
+      expect(isMonthChange(11, 0)).toBe(true);
+    });
+  });
+
+  describe("when months are the same", () => {
+    it("should return false for same month values", () => {
+      expect(isMonthChange(0, 0)).toBe(false);
+      expect(isMonthChange(5, 5)).toBe(false);
+      expect(isMonthChange(11, 11)).toBe(false);
+    });
+  });
+
+  describe("when inputs are invalid", () => {
+    it("should return false when currentMonth is NaN", () => {
+      expect(isMonthChange(NaN, 5)).toBe(false);
+    });
+
+    it("should return false when nextMonth is NaN", () => {
+      expect(isMonthChange(5, NaN)).toBe(false);
+    });
+
+    it("should return false when both inputs are NaN", () => {
+      expect(isMonthChange(NaN, NaN)).toBe(false);
+    });
+  });
+});
diff --git a/packages/features/bookings/Booker/utils/isMonthChange.ts b/packages/features/bookings/Booker/utils/isMonthChange.ts
new file mode 100644
index 00000000000000..21c718987f44c5
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isMonthChange.ts
@@ -0,0 +1,11 @@
+export const isMonthChange = (currentMonth: number, nextMonth: number) => {
+  if (isNaN(currentMonth) || isNaN(nextMonth)) {
+    return false;
+  }
+
+  if (currentMonth === nextMonth) {
+    return false;
+  }
+
+  return true;
+};
diff --git a/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.test.ts b/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.test.ts
new file mode 100644
index 00000000000000..30e93cd2996c4f
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+
+import { isMonthViewPrefetchEnabled } from "./isMonthViewPrefetchEnabled";
+
+describe("isMonthViewPrefetchEnabled", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  describe("when current time is after 2 weeks into the month", () => {
+    it("should return true when date is invalid and same month", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      expect(isMonthViewPrefetchEnabled("invalid-date", "2024-01-01")).toBe(true);
+    });
+
+    it("should return true when date is valid but same month", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      expect(isMonthViewPrefetchEnabled("2024-02-15", "2024-01-01")).toBe(true);
+    });
+
+    it("should return false when date is valid and different month", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      expect(isMonthViewPrefetchEnabled("2024-02-15", "2024-02-01")).toBe(false);
+    });
+  });
+
+  describe("when current time is before 2 weeks threshold", () => {
+    it("should return false regardless of date validity", () => {
+      vi.setSystemTime(new Date("2024-01-10T12:00:00Z"));
+
+      expect(isMonthViewPrefetchEnabled("invalid-date", "2024-01-01")).toBe(false);
+      expect(isMonthViewPrefetchEnabled("2024-02-15", "2024-01-01")).toBe(false);
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle null month parameter", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      const result = isMonthViewPrefetchEnabled("2024-02-15", null);
+      expect(result).toBe(false);
+    });
+
+    it("should handle exactly at 2 weeks threshold", () => {
+      vi.setSystemTime(new Date("2024-01-15T00:00:00Z"));
+
+      const result = isMonthViewPrefetchEnabled("invalid-date", "2024-01-01");
+      expect(result).toBe(false);
+    });
+
+    it("should work with different months throughout the year", () => {
+      vi.setSystemTime(new Date("2024-06-20T12:00:00Z"));
+
+      expect(isMonthViewPrefetchEnabled("invalid-date", "2024-06-01")).toBe(true);
+      expect(isMonthViewPrefetchEnabled("2024-07-15", "2024-06-01")).toBe(true);
+    });
+  });
+});
diff --git a/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.ts b/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.ts
new file mode 100644
index 00000000000000..6a95538600c8ca
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isMonthViewPrefetchEnabled.ts
@@ -0,0 +1,14 @@
+import dayjs from "@calcom/dayjs";
+
+export const isMonthViewPrefetchEnabled = (date: string, month: string | null) => {
+  const isValidDate = dayjs(date).isValid();
+  const twoWeeksAfter = dayjs(month).startOf("month").add(2, "week");
+  const isSameMonth = dayjs().isSame(dayjs(month), "month");
+  const isAfter2Weeks = dayjs().isAfter(twoWeeksAfter);
+
+  if (isAfter2Weeks && (!isValidDate || isSameMonth)) {
+    return true;
+  }
+
+  return false;
+};
diff --git a/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.test.ts b/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.test.ts
new file mode 100644
index 00000000000000..ed262b96b34b23
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.test.ts
@@ -0,0 +1,208 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+
+import dayjs from "@calcom/dayjs";
+import { BookerLayouts } from "@calcom/prisma/zod-utils";
+
+import { isPrefetchNextMonthEnabled } from "./isPrefetchNextMonthEnabled";
+
+describe("isPrefetchNextMonthEnabled", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  describe("WEEK_VIEW layout", () => {
+    it("should return true when extraDays is provided and months change", () => {
+      const date = "2024-01-28";
+      const dateMonth = dayjs(date).month();
+      const extraDays = 7;
+      const monthAfterAddingExtraDays = dayjs(date).add(extraDays, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.WEEK_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01",
+        extraDays
+      );
+      expect(result).toBe(true);
+    });
+
+    it("should return false when extraDays is provided but months don't change", () => {
+      const date = "2024-01-15";
+      const dateMonth = dayjs(date).month();
+      const extraDays = 7;
+      const monthAfterAddingExtraDays = dayjs(date).add(extraDays, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.WEEK_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01",
+        extraDays
+      );
+      expect(result).toBe(false);
+    });
+
+    it("should return false when extraDays is not provided", () => {
+      const date = "2024-01-28";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.WEEK_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01",
+        undefined
+      );
+      expect(result).toBe(false);
+    });
+
+    it("should return false when extraDays is 0", () => {
+      const date = "2024-01-28";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.WEEK_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01",
+        0
+      );
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("COLUMN_VIEW layout", () => {
+    it("should return true when months change after adding columnView extra days", () => {
+      const date = "2024-01-30";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.COLUMN_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(true);
+    });
+
+    it("should return false when months don't change after adding columnView extra days", () => {
+      const date = "2024-01-10";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.COLUMN_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("MONTH_VIEW layout", () => {
+    it("should return true when conditions for month view prefetch are met", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      const date = "invalid-date";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.MONTH_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(true);
+    });
+
+    it("should return false when current time is before 2 weeks threshold", () => {
+      vi.setSystemTime(new Date("2024-01-10T12:00:00Z"));
+
+      const date = "invalid-date";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        BookerLayouts.MONTH_VIEW,
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("mobile layout", () => {
+    it("should return true when conditions for month view prefetch are met", () => {
+      vi.setSystemTime(new Date("2024-01-20T12:00:00Z"));
+
+      const date = "invalid-date";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        "mobile",
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("unknown layout", () => {
+    it("should return false for unrecognized layout", () => {
+      const date = "2024-01-15";
+      const dateMonth = dayjs(date).month();
+      const monthAfterAddingExtraDays = dayjs(date).add(7, "day").month();
+      const monthAfterAddingExtraDaysColumnView = dayjs(date).add(5, "day").month();
+
+      const result = isPrefetchNextMonthEnabled(
+        "unknown-layout",
+        date,
+        dateMonth,
+        monthAfterAddingExtraDays,
+        monthAfterAddingExtraDaysColumnView,
+        "2024-01-01"
+      );
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.ts b/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.ts
new file mode 100644
index 00000000000000..bcf62f0f4fdf40
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/isPrefetchNextMonthEnabled.ts
@@ -0,0 +1,29 @@
+import { BookerLayouts } from "@calcom/prisma/zod-utils";
+
+import { isMonthChange } from "./isMonthChange";
+import { isMonthViewPrefetchEnabled } from "./isMonthViewPrefetchEnabled";
+
+export const isPrefetchNextMonthEnabled = (
+  bookerLayout: string,
+  date: string,
+  dateMonth: number,
+  monthAfterAddingExtraDays: number,
+  monthAfterAddingExtraDaysColumnView: number,
+  month: string | null,
+  extraDays?: number
+) => {
+  if (bookerLayout === BookerLayouts.WEEK_VIEW) {
+    return !!extraDays && isMonthChange(dateMonth, monthAfterAddingExtraDays);
+  }
+
+  if (bookerLayout === BookerLayouts.COLUMN_VIEW) {
+    return isMonthChange(dateMonth, monthAfterAddingExtraDaysColumnView);
+  }
+
+  if (bookerLayout === BookerLayouts.MONTH_VIEW || bookerLayout === "mobile") {
+    const shouldPrefetchNextMonth = isMonthViewPrefetchEnabled(date, month);
+    return shouldPrefetchNextMonth;
+  }
+
+  return false;
+};
diff --git a/packages/features/bookings/components/BookingSuccessCard.tsx b/packages/features/bookings/components/BookingSuccessCard.tsx
new file mode 100644
index 00000000000000..1e14079b48a18c
--- /dev/null
+++ b/packages/features/bookings/components/BookingSuccessCard.tsx
@@ -0,0 +1,114 @@
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
+
+export interface BookingSuccessCardProps {
+  title: string;
+  formattedDate: string;
+  formattedTime: string;
+  endTime: string;
+  formattedTimeZone: string;
+  hostName: string | null;
+  hostEmail: string | null;
+  attendeeName: string | null;
+  attendeeEmail: string | null;
+  location: string | null;
+}
+
+export function BookingSuccessCard({
+  title,
+  formattedDate,
+  formattedTime,
+  endTime,
+  formattedTimeZone,
+  hostName,
+  hostEmail,
+  attendeeName,
+  attendeeEmail,
+  location,
+}: BookingSuccessCardProps) {
+  const { t } = useLocale();
+
+  return (
+    <div className="h-screen">
+      <main className="mx-auto max-w-3xl">
+        <div className="overflow-y-auto">
+          <div className="flex items-end justify-center px-4 pb-20 pt-4 text-center sm:flex sm:p-0">
+            <div className="main inset-0 my-4 flex flex-col transition-opacity sm:my-0" aria-hidden="true">
+              <div
+                className="bg-default dark:bg-muted border-booker border-booker-width inline-block transform overflow-hidden rounded-lg px-8 pb-4 pt-5 text-left align-bottom transition-all sm:my-8 sm:w-full sm:max-w-xl sm:py-8 sm:align-middle"
+                role="dialog"
+                aria-modal="true"
+                aria-labelledby="modal-headline">
+                <div>
+                  <div className="bg-success mx-auto flex h-12 w-12 items-center justify-center rounded-full">
+                    <Icon name="check" className="h-5 w-5 text-green-600 dark:text-green-400" />
+                  </div>
+                </div>
+                <div className="mb-8 mt-6 text-center last:mb-0">
+                  <h3 className="text-emphasis text-2xl font-semibold leading-6" id="modal-headline">
+                    {t("meeting_is_scheduled")}
+                  </h3>
+
+                  <div className="mt-3">
+                    <p className="text-default">{t("emailed_you_and_any_other_attendees")}</p>
+                  </div>
+
+                  <div className="border-subtle text-default mt-8 grid grid-cols-3 gap-x-4 border-t pt-8 text-left rtl:text-right sm:gap-x-0">
+                    <div className="font-medium">{t("what")}</div>
+                    <div className="col-span-2 mb-6 last:mb-0">{title}</div>
+
+                    {formattedDate && (
+                      <>
+                        <div className="font-medium">{t("when")}</div>
+                        <div className="col-span-2 mb-6 last:mb-0">
+                          {formattedDate}
+                          {formattedTime && (
+                            <>
+                              <br />
+                              {formattedTime}
+                              {endTime && ` - ${endTime}`}
+                              {formattedTimeZone && (
+                                <span className="text-bookinglight"> ({formattedTimeZone})</span>
+                              )}
+                            </>
+                          )}
+                        </div>
+                      </>
+                    )}
+
+                    <div className="font-medium">{t("who")}</div>
+                    <div className="col-span-2 last:mb-0">
+                      {hostName && (
+                        <div className="mb-3">
+                          <div>
+                            <span className="mr-2">{hostName}</span>
+                            <Badge variant="blue">{t("Host")}</Badge>
+                          </div>
+                          {hostEmail && <p className="text-default">{hostEmail}</p>}
+                        </div>
+                      )}
+                      {attendeeName && (
+                        <div className="mb-3 last:mb-0">
+                          <p>{attendeeName}</p>
+                          {attendeeEmail && <p>{attendeeEmail}</p>}
+                        </div>
+                      )}
+                    </div>
+
+                    {location && (
+                      <>
+                        <div className="mt-3 font-medium">{t("where")}</div>
+                        <div className="col-span-2 mt-3">{t("web_conferencing_details_to_follow")}</div>
+                      </>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+  );
+}
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index cf001f4d2b5542..096d53d996c29b 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -2,9 +2,9 @@ import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
 import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
 import { useBookerStore } from "@calcom/features/bookings/Booker/store";
 import type { BookerEvent } from "@calcom/features/bookings/types";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
+import { getTeamUrlSync } from "@calcom/features/ee/organizations/lib/getTeamUrlSync";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
-import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client";
 import { SchedulingType } from "@calcom/prisma/enums";
 import { AvatarGroup } from "@calcom/ui/components/avatar";
 
diff --git a/packages/features/bookings/di/BookingCancelService.container.ts b/packages/features/bookings/di/BookingCancelService.container.ts
new file mode 100644
index 00000000000000..6b7cabaa43b54e
--- /dev/null
+++ b/packages/features/bookings/di/BookingCancelService.container.ts
@@ -0,0 +1,14 @@
+import { createContainer } from "@calcom/lib/di/di";
+
+import {
+  type BookingCancelService,
+  moduleLoader as bookingCancelServiceModule,
+} from "../modules/BookingCancelService.module";
+
+const bookingCancelServiceContainer = createContainer();
+
+export function getBookingCancelService(): BookingCancelService {
+  bookingCancelServiceModule.loadModule(bookingCancelServiceContainer);
+
+  return bookingCancelServiceContainer.get<BookingCancelService>(bookingCancelServiceModule.token);
+}
diff --git a/packages/features/bookings/di/BookingCancelService.module.ts b/packages/features/bookings/di/BookingCancelService.module.ts
new file mode 100644
index 00000000000000..a4e6ea5f25adc9
--- /dev/null
+++ b/packages/features/bookings/di/BookingCancelService.module.ts
@@ -0,0 +1,24 @@
+import { BookingCancelService } from "@calcom/features/bookings/lib/handleCancelBooking";
+import { bindModuleToClassOnToken, createModule } from "@calcom/lib/di/di";
+import { DI_TOKENS } from "@calcom/lib/di/tokens";
+import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+
+const thisModule = createModule();
+const token = DI_TOKENS.BOOKING_CANCEL_SERVICE;
+const moduleToken = DI_TOKENS.BOOKING_CANCEL_SERVICE_MODULE;
+const loadModule = bindModuleToClassOnToken({
+  module: thisModule,
+  moduleToken,
+  token,
+  classs: BookingCancelService,
+  depsMap: {
+    prismaClient: prismaModuleLoader,
+  },
+});
+
+export const moduleLoader = {
+  token,
+  loadModule,
+};
+
+export type { BookingCancelService };
diff --git a/packages/features/bookings/di/InstantBookingCreateService.container.ts b/packages/features/bookings/di/InstantBookingCreateService.container.ts
new file mode 100644
index 00000000000000..78d10f0947f78f
--- /dev/null
+++ b/packages/features/bookings/di/InstantBookingCreateService.container.ts
@@ -0,0 +1,13 @@
+import { createContainer } from "@calcom/features/di/di";
+
+import {
+  type InstantBookingCreateService,
+  moduleLoader as instantBookingCreateServiceModule,
+} from "./InstantBookingCreateService.module";
+
+const container = createContainer();
+
+export function getInstantBookingCreateService(): InstantBookingCreateService {
+  instantBookingCreateServiceModule.loadModule(container);
+  return container.get<InstantBookingCreateService>(instantBookingCreateServiceModule.token);
+}
diff --git a/packages/features/bookings/di/InstantBookingCreateService.module.ts b/packages/features/bookings/di/InstantBookingCreateService.module.ts
new file mode 100644
index 00000000000000..76c3319e33fae9
--- /dev/null
+++ b/packages/features/bookings/di/InstantBookingCreateService.module.ts
@@ -0,0 +1,20 @@
+import { createModule, bindModuleToClassOnToken } from "@calcom/features/di/di";
+import { DI_TOKENS } from "@calcom/features/di/tokens";
+import { InstantBookingCreateService } from "@calcom/features/instant-meeting/handleInstantMeeting";
+
+export const instantBookingCreateServiceModule = createModule();
+const token = DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE;
+const moduleToken = DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE_MODULE;
+const loadModule = bindModuleToClassOnToken({
+  module: instantBookingCreateServiceModule,
+  moduleToken,
+  token,
+  classs: InstantBookingCreateService,
+  depsMap: {},
+});
+
+export type { InstantBookingCreateService };
+export const moduleLoader = {
+  token,
+  loadModule,
+};
diff --git a/packages/features/bookings/di/RecurringBookingService.container.ts b/packages/features/bookings/di/RecurringBookingService.container.ts
new file mode 100644
index 00000000000000..6c3f5a65c48206
--- /dev/null
+++ b/packages/features/bookings/di/RecurringBookingService.container.ts
@@ -0,0 +1,14 @@
+import { createContainer } from "@calcom/features/di/di";
+
+import {
+  type RecurringBookingService,
+  moduleLoader as recurringBookingServiceModule,
+} from "./RecurringBookingService.module";
+
+const container = createContainer();
+
+export function getRecurringBookingService(): RecurringBookingService {
+  recurringBookingServiceModule.loadModule(container);
+
+  return container.get<RecurringBookingService>(recurringBookingServiceModule.token);
+}
diff --git a/packages/features/bookings/di/RecurringBookingService.module.ts b/packages/features/bookings/di/RecurringBookingService.module.ts
new file mode 100644
index 00000000000000..8e71dacfa23099
--- /dev/null
+++ b/packages/features/bookings/di/RecurringBookingService.module.ts
@@ -0,0 +1,25 @@
+import { RecurringBookingService } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
+import { createModule, bindModuleToClassOnToken } from "@calcom/features/di/di";
+import { DI_TOKENS } from "@calcom/features/di/tokens";
+
+import { moduleLoader as regularBookingServiceModuleLoader } from "./RegularBookingService.module";
+
+const token = DI_TOKENS.RECURRING_BOOKING_SERVICE;
+const moduleToken = DI_TOKENS.RECURRING_BOOKING_SERVICE_MODULE;
+export const recurringBookingServiceModule = createModule();
+
+const loadModule = bindModuleToClassOnToken({
+  module: recurringBookingServiceModule,
+  moduleToken,
+  token,
+  classs: RecurringBookingService,
+  depsMap: {
+    regularBookingService: regularBookingServiceModuleLoader,
+  },
+});
+
+export const moduleLoader = {
+  token,
+  loadModule,
+};
+export type { RecurringBookingService };
diff --git a/packages/features/di/bookings/containers/RegularBookingService.container.ts b/packages/features/bookings/di/RegularBookingService.container.ts
similarity index 70%
rename from packages/features/di/bookings/containers/RegularBookingService.container.ts
rename to packages/features/bookings/di/RegularBookingService.container.ts
index b4df8cb790c2ef..7ec215a2a893be 100644
--- a/packages/features/di/bookings/containers/RegularBookingService.container.ts
+++ b/packages/features/bookings/di/RegularBookingService.container.ts
@@ -1,8 +1,9 @@
-import { createContainer } from "../../di";
+import { createContainer } from "@calcom/features/di/di";
+
 import {
   type RegularBookingService,
-  regularBookingServiceModule,
-} from "../modules/RegularBookingService.module";
+  moduleLoader as regularBookingServiceModule,
+} from "./RegularBookingService.module";
 
 const regularBookingServiceContainer = createContainer();
 
diff --git a/packages/features/di/bookings/modules/RegularBookingService.module.ts b/packages/features/bookings/di/RegularBookingService.module.ts
similarity index 63%
rename from packages/features/di/bookings/modules/RegularBookingService.module.ts
rename to packages/features/bookings/di/RegularBookingService.module.ts
index b00b03a1eb5ec3..187b12a2ec4f9f 100644
--- a/packages/features/di/bookings/modules/RegularBookingService.module.ts
+++ b/packages/features/bookings/di/RegularBookingService.module.ts
@@ -1,14 +1,18 @@
 import { RegularBookingService } from "@calcom/features/bookings/lib/handleNewBooking";
+import { bindModuleToClassOnToken, createModule } from "@calcom/features/di/di";
+import { moduleLoader as attributeRepositoryModuleLoader } from "@calcom/features/di/modules/Attribute";
 import { moduleLoader as bookingRepositoryModuleLoader } from "@calcom/features/di/modules/Booking";
 import { moduleLoader as cacheModuleLoader } from "@calcom/features/di/modules/Cache";
 import { moduleLoader as checkBookingAndDurationLimitsModuleLoader } from "@calcom/features/di/modules/CheckBookingAndDurationLimits";
 import { moduleLoader as checkBookingLimitsModuleLoader } from "@calcom/features/di/modules/CheckBookingLimits";
 import { moduleLoader as featuresRepositoryModuleLoader } from "@calcom/features/di/modules/Features";
+import { moduleLoader as hostRepositoryModuleLoader } from "@calcom/features/di/modules/Host";
+import { moduleLoader as luckyUserServiceModuleLoader } from "@calcom/features/di/modules/LuckyUser";
+import { moduleLoader as oooRepositoryModuleLoader } from "@calcom/features/di/modules/Ooo";
+import { moduleLoader as userRepositoryModuleLoader } from "@calcom/features/di/modules/User";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
 
-import { bindModuleToClassOnToken, createModule } from "../../di";
-
 const thisModule = createModule();
 const token = DI_TOKENS.REGULAR_BOOKING_SERVICE;
 const moduleToken = DI_TOKENS.REGULAR_BOOKING_SERVICE_MODULE;
@@ -24,10 +28,15 @@ const loadModule = bindModuleToClassOnToken({
     bookingRepository: bookingRepositoryModuleLoader,
     featuresRepository: featuresRepositoryModuleLoader,
     checkBookingLimitsService: checkBookingLimitsModuleLoader,
+    luckyUserService: luckyUserServiceModuleLoader,
+    hostRepository: hostRepositoryModuleLoader,
+    oooRepository: oooRepositoryModuleLoader,
+    userRepository: userRepositoryModuleLoader,
+    attributeRepository: attributeRepositoryModuleLoader,
   },
 });
 
-export const regularBookingServiceModule = {
+export const moduleLoader = {
   token,
   loadModule,
 };
diff --git a/packages/features/di/bookings/tokens.ts b/packages/features/bookings/di/tokens.ts
similarity index 78%
rename from packages/features/di/bookings/tokens.ts
rename to packages/features/bookings/di/tokens.ts
index 84f8827cc393c6..560c2663a24b49 100644
--- a/packages/features/di/bookings/tokens.ts
+++ b/packages/features/bookings/di/tokens.ts
@@ -5,4 +5,6 @@ export const BOOKING_DI_TOKENS = {
   RECURRING_BOOKING_SERVICE_MODULE: Symbol("RecurringBookingServiceModule"),
   INSTANT_BOOKING_CREATE_SERVICE: Symbol("InstantBookingCreateService"),
   INSTANT_BOOKING_CREATE_SERVICE_MODULE: Symbol("InstantBookingCreateServiceModule"),
+  BOOKING_CANCEL_SERVICE: Symbol("BookingCancelService"),
+  BOOKING_CANCEL_SERVICE_MODULE: Symbol("BookingCancelServiceModule"),
 };
diff --git a/packages/lib/hooks/useBookerUrl.ts b/packages/features/bookings/hooks/useBookerUrl.ts
similarity index 100%
rename from packages/lib/hooks/useBookerUrl.ts
rename to packages/features/bookings/hooks/useBookerUrl.ts
diff --git a/packages/features/bookings/lib/EventManager.ts b/packages/features/bookings/lib/EventManager.ts
index 272e7aca534782..fe254500a2c6dd 100644
--- a/packages/features/bookings/lib/EventManager.ts
+++ b/packages/features/bookings/lib/EventManager.ts
@@ -8,12 +8,12 @@ import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApi
 import { appKeysSchema as calVideoKeysSchema } from "@calcom/app-store/dailyvideo/zod";
 import { getLocationFromApp, MeetLocationType, MSTeamsLocationType } from "@calcom/app-store/locations";
 import getApps from "@calcom/app-store/utils";
-import { createMeeting, updateMeeting, deleteMeeting } from "@calcom/app-store/videoClient";
 import { createEvent, updateEvent, deleteEvent } from "@calcom/features/calendars/lib/CalendarManager";
+import { createMeeting, updateMeeting, deleteMeeting } from "@calcom/features/conferencing/lib/videoClient";
 import CrmManager from "@calcom/features/crmManager/crmManager";
+import CRMScheduler from "@calcom/features/crmManager/crmScheduler";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { getUid } from "@calcom/lib/CalEventParser";
-import CRMScheduler from "@calcom/lib/crmManager/tasker/crmScheduler";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import { isDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
@@ -24,7 +24,7 @@ import {
   getPiiFreeCalendarEvent,
 } from "@calcom/lib/piiFreeData";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { prisma } from "@calcom/prisma";
 import type { DestinationCalendar, BookingReference } from "@calcom/prisma/client";
 import { createdEventSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/bookings/lib/bookingCreateBodySchema.ts b/packages/features/bookings/lib/bookingCreateBodySchema.ts
index 9da43a92398edd..086354f57b8ef5 100644
--- a/packages/features/bookings/lib/bookingCreateBodySchema.ts
+++ b/packages/features/bookings/lib/bookingCreateBodySchema.ts
@@ -57,36 +57,48 @@ export const bookingCreateBodySchema = z.object({
 
 export type BookingCreateBody = z.input<typeof bookingCreateBodySchema>;
 
+// TODO: Plan to create different schemas for Recurring Bookings, Instant Bookings and Regular Bookings.
+// We later want to make these properties required. They were optional because they are part of general schema which is used for all types of bookings.
+const recurringBookingCreateBodyPartialSchema = z.object({
+  recurringCount: z.number().optional(),
+  isFirstRecurringSlot: z.boolean().optional(),
+  thirdPartyRecurringEventId: z.string().nullish(),
+  numSlotsToCheckForAvailability: z.number().optional(),
+  allRecurringDates: z
+    .array(
+      z.object({
+        start: z.string(),
+        end: z.string().optional(),
+      })
+    )
+    .optional(),
+  currentRecurringIndex: z.number().optional(),
+});
+
 export const extendedBookingCreateBody = bookingCreateBodySchema.merge(
-  z.object({
-    noEmail: z.boolean().optional(),
-    recurringCount: z.number().optional(),
-    allRecurringDates: z
-      .array(
-        z.object({
-          start: z.string(),
-          end: z.string(),
-        })
-      )
-      .optional(),
-    currentRecurringIndex: z.number().optional(),
-    appsStatus: z
-      .array(
-        z.object({
-          appName: z.string(),
-          success: z.number(),
-          failures: z.number(),
-          type: z.string(),
-          errors: z.string().array(),
-          warnings: z.string().array().optional(),
-        })
-      )
-      .optional(),
-    luckyUsers: z.array(z.number()).optional(),
-    customInputs: z.undefined().optional(),
-  })
+  z
+    .object({
+      noEmail: z.boolean().optional(),
+      appsStatus: z
+        .array(
+          z.object({
+            appName: z.string(),
+            success: z.number(),
+            failures: z.number(),
+            type: z.string(),
+            errors: z.string().array(),
+            warnings: z.string().array().optional(),
+          })
+        )
+        .optional(),
+      luckyUsers: z.array(z.number()).optional(),
+      customInputs: z.undefined().optional(),
+    })
+    .merge(recurringBookingCreateBodyPartialSchema)
 );
 
+export type ExtendedBookingCreateBody = z.input<typeof extendedBookingCreateBody>;
+
 // It has only the legacy props that are part of `responses` now. The API can still hit old props
 export const bookingCreateSchemaLegacyPropsForApi = z.object({
   email: z.string(),
diff --git a/packages/lib/bookingSuccessRedirect.test.ts b/packages/features/bookings/lib/bookingSuccessRedirect.test.ts
similarity index 100%
rename from packages/lib/bookingSuccessRedirect.test.ts
rename to packages/features/bookings/lib/bookingSuccessRedirect.test.ts
diff --git a/packages/lib/bookingSuccessRedirect.ts b/packages/features/bookings/lib/bookingSuccessRedirect.ts
similarity index 99%
rename from packages/lib/bookingSuccessRedirect.ts
rename to packages/features/bookings/lib/bookingSuccessRedirect.ts
index 870f50792bdc26..55fc7d1c91020b 100644
--- a/packages/lib/bookingSuccessRedirect.ts
+++ b/packages/features/bookings/lib/bookingSuccessRedirect.ts
@@ -4,12 +4,11 @@ import dayjs from "@calcom/dayjs";
 import type { PaymentPageProps } from "@calcom/ee/payments/pages/payment";
 import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
 import type { BookingResponse } from "@calcom/features/bookings/types";
+import { getSafe } from "@calcom/lib/getSafe";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { navigateInTopWindow } from "@calcom/lib/navigateInTopWindow";
 import type { EventType } from "@calcom/prisma/client";
 
-import { getSafe } from "./getSafe";
-
 export function getNewSearchParams(args: {
   query: Record<string, string | null | undefined | boolean>;
   searchParams?: URLSearchParams;
diff --git a/packages/lib/bookings/buildEventUrlFromBooking.test.ts b/packages/features/bookings/lib/buildEventUrlFromBooking.test.ts
similarity index 96%
rename from packages/lib/bookings/buildEventUrlFromBooking.test.ts
rename to packages/features/bookings/lib/buildEventUrlFromBooking.test.ts
index 2e5a59ce2d0e87..a2091c51db759b 100644
--- a/packages/lib/bookings/buildEventUrlFromBooking.test.ts
+++ b/packages/features/bookings/lib/buildEventUrlFromBooking.test.ts
@@ -2,11 +2,11 @@ import { constantsScenarios } from "@calcom/lib/__mocks__/constants";
 
 import { describe, it, vi, expect, beforeEach } from "vitest";
 
-import { getBrand } from "@calcom/lib/server/getBrand";
+import { getBrand } from "@calcom/features/ee/organizations/lib/getBrand";
 
 import { buildEventUrlFromBooking } from "./buildEventUrlFromBooking";
 
-vi.mock("@calcom/lib/server/getBrand", () => ({
+vi.mock("@calcom/features/ee/organizations/lib/getBrand", () => ({
   getBrand: vi.fn(),
 }));
 
diff --git a/packages/lib/bookings/buildEventUrlFromBooking.ts b/packages/features/bookings/lib/buildEventUrlFromBooking.ts
similarity index 92%
rename from packages/lib/bookings/buildEventUrlFromBooking.ts
rename to packages/features/bookings/lib/buildEventUrlFromBooking.ts
index 127b838cc1fb99..cf5e3754856752 100644
--- a/packages/lib/bookings/buildEventUrlFromBooking.ts
+++ b/packages/features/bookings/lib/buildEventUrlFromBooking.ts
@@ -1,8 +1,7 @@
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
+import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 
-import logger from "../logger";
-
 type BookingEventType = {
   slug: string;
   team: {
diff --git a/packages/lib/intervalLimits/server/checkBookingLimits.ts b/packages/features/bookings/lib/checkBookingLimits.ts
similarity index 88%
rename from packages/lib/intervalLimits/server/checkBookingLimits.ts
rename to packages/features/bookings/lib/checkBookingLimits.ts
index 5b8ca777811b58..bf354b9beb76ed 100644
--- a/packages/lib/intervalLimits/server/checkBookingLimits.ts
+++ b/packages/features/bookings/lib/checkBookingLimits.ts
@@ -1,12 +1,11 @@
 import dayjs from "@calcom/dayjs";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { HttpError } from "@calcom/lib/http-error";
+import { ascendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
+import type { IntervalLimit, IntervalLimitKey } from "@calcom/lib/intervalLimits/intervalLimitSchema";
+import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
 import { withReporting } from "@calcom/lib/sentryWrapper";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
-
-import { ascendingLimitKeys, intervalLimitKeyToUnit } from "../intervalLimit";
-import type { IntervalLimit, IntervalLimitKey } from "../intervalLimitSchema";
-import { parseBookingLimit } from "../isBookingLimits";
 
 export interface ICheckBookingLimitsService {
   bookingRepo: BookingRepository;
diff --git a/packages/lib/intervalLimits/server/checkDurationLimits.ts b/packages/features/bookings/lib/checkDurationLimits.ts
similarity index 81%
rename from packages/lib/intervalLimits/server/checkDurationLimits.ts
rename to packages/features/bookings/lib/checkDurationLimits.ts
index 4fd757241999df..aad39869332e70 100644
--- a/packages/lib/intervalLimits/server/checkDurationLimits.ts
+++ b/packages/features/bookings/lib/checkDurationLimits.ts
@@ -1,13 +1,12 @@
 import dayjs from "@calcom/dayjs";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { HttpError } from "@calcom/lib/http-error";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { ascendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
+import type { IntervalLimit, IntervalLimitKey } from "@calcom/lib/intervalLimits/intervalLimitSchema";
+import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits";
 import prisma from "@calcom/prisma";
 
-import { ascendingLimitKeys, intervalLimitKeyToUnit } from "../intervalLimit";
-import type { IntervalLimit, IntervalLimitKey } from "../intervalLimitSchema";
-import { parseDurationLimit } from "../isDurationLimits";
-
 export async function checkDurationLimits(
   durationLimits: IntervalLimit,
   eventStartDate: Date,
diff --git a/packages/features/bookings/lib/client/decoyBookingStore.ts b/packages/features/bookings/lib/client/decoyBookingStore.ts
new file mode 100644
index 00000000000000..88a387f0fc7129
--- /dev/null
+++ b/packages/features/bookings/lib/client/decoyBookingStore.ts
@@ -0,0 +1,86 @@
+import { localStorage } from "@calcom/lib/webstorage";
+
+const BOOKING_SUCCESS_STORAGE_KEY_PREFIX = "cal.successfulBooking";
+
+interface DecoyBookingData {
+  booking: {
+    uid: string;
+    title: string | null;
+    startTime: string;
+    endTime: string;
+    booker: { name: string; timeZone?: string; email: string } | null;
+    host: { name: string; timeZone?: string } | null;
+    location: string | null;
+  };
+  timestamp: number;
+}
+
+function getStorageKey(uid: string): string {
+  return `${BOOKING_SUCCESS_STORAGE_KEY_PREFIX}.${uid}`;
+}
+
+/**
+ * Stores decoy booking data in localStorage using the booking's uid
+ * @param booking - The booking data to store (must include uid)
+ */
+export function storeDecoyBooking(booking: Record<string, unknown> & { uid: string }): void {
+  const bookingSuccessData = {
+    booking,
+    timestamp: Date.now(),
+  };
+  const storageKey = getStorageKey(booking.uid);
+  localStorage.setItem(storageKey, JSON.stringify(bookingSuccessData));
+}
+
+/**
+ * Retrieves decoy booking data from localStorage
+ * @param uid - The booking uid
+ * @returns The stored booking data or null if not found or expired
+ */
+export function getDecoyBooking(uid: string): DecoyBookingData | null {
+  if (!uid) {
+    return null;
+  }
+
+  const storageKey = getStorageKey(uid);
+  const dataStr = localStorage.getItem(storageKey);
+
+  if (!dataStr) {
+    return null;
+  }
+
+  try {
+    const data: DecoyBookingData = JSON.parse(dataStr);
+
+    // Check if the data is too old (5 min)
+    const dataAge = Date.now() - data.timestamp;
+    const maxAge = 5 * 60 * 1000; // 5 minutes in milliseconds
+
+    if (dataAge > maxAge) {
+      // Remove the data from localStorage if expired
+      localStorage.removeItem(storageKey);
+      return null;
+    }
+
+    return data;
+  } catch {
+    // If parsing fails, remove the corrupted data
+    localStorage.removeItem(storageKey);
+    return null;
+  }
+}
+
+/**
+ * Removes decoy booking data from localStorage
+ * @param uid - The booking uid
+ */
+export function removeDecoyBooking(uid: string): void {
+  if (!uid) {
+    return;
+  }
+
+  const storageKey = getStorageKey(uid);
+  localStorage.removeItem(storageKey);
+}
+
+export type { DecoyBookingData };
diff --git a/packages/features/bookings/lib/create-instant-booking.ts b/packages/features/bookings/lib/create-instant-booking.ts
index 672faecdb3b6d3..82289d496927cb 100644
--- a/packages/features/bookings/lib/create-instant-booking.ts
+++ b/packages/features/bookings/lib/create-instant-booking.ts
@@ -1,15 +1,13 @@
 import { post } from "@calcom/lib/fetch-wrapper";
 
-import type { BookingCreateBody, InstantBookingResponse } from "../types";
+import type { BookingCreateBody } from "../types";
+import type { InstantBookingCreateResult } from "./dto/types";
 
 export const createInstantBooking = async (data: BookingCreateBody) => {
   const response = await post<
     BookingCreateBody,
-    // fetch response can't have a Date type, it must be a string
-    Omit<InstantBookingResponse, "startTime" | "endTime"> & {
-      startTime: string;
-      endTime: string;
-    }
+    // TODO: Fetch response can't have a Date type, it must be a string. We need to type expires as a string here but it breaks types down the line, fix it in a follow-up PR.
+    InstantBookingCreateResult
   >("/api/book/instant-event", data);
   return response;
 };
diff --git a/packages/features/bookings/lib/dto/BookingCancel.d.ts b/packages/features/bookings/lib/dto/BookingCancel.d.ts
new file mode 100644
index 00000000000000..e341d24c26407d
--- /dev/null
+++ b/packages/features/bookings/lib/dto/BookingCancel.d.ts
@@ -0,0 +1,35 @@
+/**
+ * Domain types for Booking Cancellation Service
+ * These types are framework-agnostic and contain only the data required for booking cancellation operations
+ */
+import type { z } from "zod";
+
+import type { bookingCancelInput } from "@calcom/prisma/zod-utils";
+
+/**
+ * The booking data required for cancellation
+ */
+export type CancelRegularBookingData = z.infer<typeof bookingCancelInput>;
+
+/**
+ * Additional metadata for booking cancellation, typically used for platform integrations
+ */
+export type CancelBookingMeta = {
+  userId?: number;
+  platformClientId?: string;
+  platformRescheduleUrl?: string;
+  platformCancelUrl?: string;
+  platformBookingUrl?: string;
+  arePlatformEmailsEnabled?: boolean;
+};
+
+/**
+ * The response returned after attempting to cancel a booking
+ */
+export type HandleCancelBookingResponse = {
+  success: boolean;
+  message: string;
+  onlyRemovedAttendee: boolean;
+  bookingId: number;
+  bookingUid: string;
+};
diff --git a/packages/features/bookings/lib/dto/types.d.ts b/packages/features/bookings/lib/dto/types.d.ts
index e79f6bed0c925a..652cd2b47c1863 100644
--- a/packages/features/bookings/lib/dto/types.d.ts
+++ b/packages/features/bookings/lib/dto/types.d.ts
@@ -1,22 +1,22 @@
 /**
- * Domain types for BookingCreateService
+ * Domain types for Booking Services
  * These types are framework-agnostic and contain only the data required for booking operations
  */
-import type { z } from "zod";
-
 import type getBookingDataSchema from "@calcom/features/bookings/lib/getBookingDataSchema";
 import type getBookingDataSchemaForApi from "@calcom/features/bookings/lib/getBookingDataSchemaForApi";
-import type { BookingCreateBody as BaseCreateBookingData } from "@calcom/prisma/zod/custom/booking";
-import type { extendedBookingCreateBody } from "@calcom/prisma/zod/custom/booking";
+import type { SchedulingType } from "@calcom/prisma/enums";
+
+import type { ExtendedBookingCreateBody } from "../bookingCreateBodySchema";
+import type { RegularBookingService } from "../handleNewBooking";
 
-export type ExtendedBookingCreateData = z.input<typeof extendedBookingCreateBody>;
+export type { BookingCreateBody } from "../bookingCreateBodySchema";
 export type BookingDataSchemaGetter = typeof getBookingDataSchema | typeof getBookingDataSchemaForApi;
 
-export type CreateRegularBookingData = BaseCreateBookingData;
+export type CreateRegularBookingData = ExtendedBookingCreateBody;
 
-export type CreateInstantBookingData = BaseCreateBookingData;
+export type CreateInstantBookingData = ExtendedBookingCreateBody;
 
-export type CreateRecurringBookingData = (BaseCreateBookingData & {
+export type CreateRecurringBookingData = (ExtendedBookingCreateBody & {
   schedulingType?: SchedulingType;
 })[];
 
@@ -27,6 +27,9 @@ export type PlatformParams = {
   platformRescheduleUrl?: string;
   platformBookingLocation?: string;
   areCalendarEventsEnabled?: boolean;
+  skipAvailabilityCheck?: boolean;
+  skipEventLimitsCheck?: boolean;
+  skipCalendarSyncTaskCreation?: boolean;
 };
 
 export type CreateBookingMeta = {
@@ -41,7 +44,7 @@ export type BookingHandlerInput = {
   bookingData: CreateRegularBookingData;
 } & CreateBookingMeta;
 
-export type CreateInstantBookingResponse = {
+export type InstantBookingCreateResult = {
   message: string;
   meetingTokenId: number;
   bookingId: number;
@@ -49,3 +52,6 @@ export type CreateInstantBookingResponse = {
   expires: Date;
   userId: number | null;
 };
+
+// TODO: In a followup PR, we working on defining the type here itself instead of inferring it.
+export type RegularBookingCreateResult = Awaited<ReturnType<RegularBookingService["createBooking"]>>;
diff --git a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.test.ts b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.test.ts
index c9c60997d82ac9..25daaf47a1a1da 100644
--- a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.test.ts
+++ b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.test.ts
@@ -7,9 +7,9 @@ import {
 
 import { describe, test, expect, vi } from "vitest";
 
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 
-vi.mock("@calcom/lib/server/repository/user", () => {
+vi.mock("@calcom/features/users/repositories/UserRepository", () => {
   return {
     UserRepository: vi.fn().mockImplementation(() => ({
       enrichUserWithItsProfile: vi.fn(),
diff --git a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.ts b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.ts
index 385d4852817c38..90cc769326a99b 100644
--- a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.ts
+++ b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials.ts
@@ -2,7 +2,7 @@ import type { z } from "zod";
 
 import { eventTypeAppMetadataOptionalSchema } from "@calcom/app-store/zod-utils";
 import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/lib/bookings/getAllUserBookings.ts b/packages/features/bookings/lib/getAllUserBookings.ts
similarity index 100%
rename from packages/lib/bookings/getAllUserBookings.ts
rename to packages/features/bookings/lib/getAllUserBookings.ts
diff --git a/packages/features/bookings/lib/getBookingFields.ts b/packages/features/bookings/lib/getBookingFields.ts
index 150d5cd4d2103e..d3639ecda0a583 100644
--- a/packages/features/bookings/lib/getBookingFields.ts
+++ b/packages/features/bookings/lib/getBookingFields.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
 import {
   SMS_REMINDER_NUMBER_FIELD,
   CAL_AI_AGENT_PHONE_NUMBER_FIELD,
-} from "@calcom/features/bookings/lib/SystemField";
+} from "@calcom/lib/bookings/SystemField";
 import type { Workflow } from "@calcom/features/ee/workflows/lib/types";
 import { fieldsThatSupportLabelAsSafeHtml } from "@calcom/features/form-builder/fieldsThatSupportLabelAsSafeHtml";
 import { getFieldIdentifier } from "@calcom/features/form-builder/utils/getFieldIdentifier";
diff --git a/packages/features/bookings/lib/getBookingResponsesSchema.test.ts b/packages/features/bookings/lib/getBookingResponsesSchema.test.ts
index 556356dd7919e3..249baee9697bda 100644
--- a/packages/features/bookings/lib/getBookingResponsesSchema.test.ts
+++ b/packages/features/bookings/lib/getBookingResponsesSchema.test.ts
@@ -176,6 +176,66 @@ describe("getBookingResponsesSchema", () => {
         );
       });
 
+      test(`hidden required email field should not be validated`, async () => {
+        const schema = getBookingResponsesSchema({
+          bookingFields: [
+            {
+              name: "name",
+              type: "name",
+              required: true,
+            },
+            {
+              name: "email",
+              type: "email",
+              required: true,
+              hidden: true,
+            },
+            {
+              name: "attendeePhoneNumber",
+              type: "phone",
+              required: true,
+            },
+          ] as z.infer<typeof eventTypeBookingFields> & z.BRAND<"HAS_SYSTEM_FIELDS">,
+          view: "ALL_VIEWS",
+        });
+        const parsedResponses = await schema.safeParseAsync({
+          name: "John",
+          email: "",
+          attendeePhoneNumber: "+919999999999",
+        });
+        expect(parsedResponses.success).toBe(true);
+      });
+
+      test(`hidden required phone field should not be validated`, async () => {
+        const schema = getBookingResponsesSchema({
+          bookingFields: [
+            {
+              name: "name",
+              type: "name",
+              required: true,
+            },
+            {
+              name: "email",
+              type: "email",
+              required: true,
+            },
+            {
+              name: "attendeePhoneNumber",
+              type: "phone",
+              required: true,
+              hidden: true,
+            },
+          ] as z.infer<typeof eventTypeBookingFields> & z.BRAND<"HAS_SYSTEM_FIELDS">,
+          view: "ALL_VIEWS",
+        });
+        const parsedResponses = await schema.safeParseAsync({
+          name: "John",
+          email: "john@example.com",
+          attendeePhoneNumber: "",
+        });
+        expect(parsedResponses.success).toBe(true);
+      });
+
       test(`firstName is required and lastName is optional by default`, async () => {
         const schema = getBookingResponsesSchema({
           bookingFields: [
diff --git a/packages/features/bookings/lib/getBookingResponsesSchema.ts b/packages/features/bookings/lib/getBookingResponsesSchema.ts
index d3e61a883dde0e..249806982a6bd4 100644
--- a/packages/features/bookings/lib/getBookingResponsesSchema.ts
+++ b/packages/features/bookings/lib/getBookingResponsesSchema.ts
@@ -2,7 +2,8 @@ import { isValidPhoneNumber } from "libphonenumber-js";
 import z from "zod";
 
 import type { ALL_VIEWS } from "@calcom/features/form-builder/schema";
-import { dbReadResponseSchema, fieldTypesSchemaMap } from "@calcom/features/form-builder/schema";
+import { fieldTypesSchemaMap } from "@calcom/features/form-builder/schema";
+import { dbReadResponseSchema } from "@calcom/lib/dbReadResponseSchema";
 import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import { bookingResponses, emailSchemaRefinement } from "@calcom/prisma/zod-utils";
 
@@ -174,7 +175,7 @@ function preprocess<T extends z.ZodType>({
         }
 
         if (bookingField.type === "email") {
-          if (!bookingField.hidden && checkOptional ? true : bookingField.required) {
+          if (!bookingField.hidden && (checkOptional || bookingField.required)) {
             // Email RegExp to validate if the input is a valid email
             if (!emailSchema.safeParse(value).success) {
               ctx.addIssue({
diff --git a/packages/features/bookings/lib/getCalEventResponses.ts b/packages/features/bookings/lib/getCalEventResponses.ts
index bda5267440f639..14fe2a7665e137 100644
--- a/packages/features/bookings/lib/getCalEventResponses.ts
+++ b/packages/features/bookings/lib/getCalEventResponses.ts
@@ -1,6 +1,6 @@
 import type z from "zod";
 
-import { SystemField } from "@calcom/features/bookings/lib/SystemField";
+import { SystemField } from "@calcom/lib/bookings/SystemField";
 import type { bookingResponsesDbSchema } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
 import { contructEmailFromPhoneNumber } from "@calcom/lib/contructEmailFromPhoneNumber";
 import { getBookingWithResponses } from "@calcom/lib/getBooking";
diff --git a/packages/lib/server/getLuckyUser.integration-test.ts b/packages/features/bookings/lib/getLuckyUser.integration-test.ts
similarity index 100%
rename from packages/lib/server/getLuckyUser.integration-test.ts
rename to packages/features/bookings/lib/getLuckyUser.integration-test.ts
diff --git a/packages/features/bookings/lib/getLuckyUser.ts b/packages/features/bookings/lib/getLuckyUser.ts
index 6571645b98929e..ceb7a27540373c 100644
--- a/packages/features/bookings/lib/getLuckyUser.ts
+++ b/packages/features/bookings/lib/getLuckyUser.ts
@@ -3,15 +3,15 @@ import type { FormResponse, Fields } from "@calcom/app-store/routing-forms/types
 import { zodRoutes } from "@calcom/app-store/routing-forms/zod";
 import dayjs from "@calcom/dayjs";
 import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";
-import { mergeOverlappingRanges } from "@calcom/lib/date-ranges";
+import { mergeOverlappingRanges } from "@calcom/features/schedules/lib/date-ranges";
 import logger from "@calcom/lib/logger";
 import { raqbQueryValueSchema } from "@calcom/lib/raqb/zod";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import type { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { HostRepository } from "@calcom/lib/server/repository/host";
 import type { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
-import type { UserRepository } from "@calcom/lib/server/repository/user";
+import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { Prisma } from "@calcom/prisma/client";
 import type { User, Booking, SelectedCalendar } from "@calcom/prisma/client";
 import type { AttributeType } from "@calcom/prisma/enums";
diff --git a/packages/features/bookings/lib/handleBookingRequested.ts b/packages/features/bookings/lib/handleBookingRequested.ts
index a09629a7e17c06..d9813ce6f99cf8 100644
--- a/packages/features/bookings/lib/handleBookingRequested.ts
+++ b/packages/features/bookings/lib/handleBookingRequested.ts
@@ -6,7 +6,7 @@ import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import type { Prisma } from "@calcom/prisma/client";
 import { WebhookTriggerEvents, WorkflowTriggerEvents } from "@calcom/prisma/enums";
 import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts
index 12f6b60c85eaab..71cfd3a9f76050 100644
--- a/packages/features/bookings/lib/handleCancelBooking.ts
+++ b/packages/features/bookings/lib/handleCancelBooking.ts
@@ -5,10 +5,13 @@ import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApi
 import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
 import dayjs from "@calcom/dayjs";
 import { sendCancelledEmailsAndSMS } from "@calcom/emails";
+import EventManager from "@calcom/features/bookings/lib/EventManager";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { processNoShowFeeOnCancellation } from "@calcom/features/bookings/lib/payment/processNoShowFeeOnCancellation";
 import { processPaymentRefund } from "@calcom/features/bookings/lib/payment/processPaymentRefund";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { sendCancelledReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import type { GetSubscriberOptions } from "@calcom/features/webhooks/lib/getWebhooks";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import {
@@ -17,8 +20,6 @@ import {
 } from "@calcom/features/webhooks/lib/scheduleTrigger";
 import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import type { EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload";
-import EventManager from "@calcom/features/bookings/lib/EventManager";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import { HttpError } from "@calcom/lib/http-error";
@@ -27,10 +28,10 @@ import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
+// TODO: Prisma import would be used from DI in a followup PR when we remove `handler` export
 import prisma from "@calcom/prisma";
-import type { Prisma, WorkflowReminder } from "@calcom/prisma/client";
+import type { Prisma, PrismaClient, WorkflowReminder } from "@calcom/prisma/client";
 import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
 import { BookingStatus } from "@calcom/prisma/enums";
 import { bookingMetadataSchema, bookingCancelInput } from "@calcom/prisma/zod-utils";
@@ -38,10 +39,16 @@ import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
 import { getAllWorkflowsFromEventType } from "@calcom/trpc/server/routers/viewer/workflows/util";
 import type { CalendarEvent } from "@calcom/types/Calendar";
 
+import type {
+  CancelRegularBookingData,
+  CancelBookingMeta,
+  HandleCancelBookingResponse,
+} from "./dto/BookingCancel";
 import { getAllCredentialsIncludeServiceAccountKey } from "./getAllCredentialsForUsersOnEvent/getAllCredentials";
 import { getBookingToDelete } from "./getBookingToDelete";
 import { handleInternalNote } from "./handleInternalNote";
 import cancelAttendeeSeat from "./handleSeats/cancel/cancelAttendeeSeat";
+import type { IBookingCancelService } from "./interfaces/IBookingCancelService";
 
 const log = logger.getSubLogger({ prefix: ["handleCancelBooking"] });
 
@@ -60,14 +67,6 @@ export type CancelBookingInput = {
   bookingData: z.infer<typeof bookingCancelInput>;
 } & PlatformParams;
 
-export type HandleCancelBookingResponse = {
-  success: boolean;
-  message: string;
-  onlyRemovedAttendee: boolean;
-  bookingId: number;
-  bookingUid: string;
-};
-
 async function handler(input: CancelBookingInput) {
   const body = input.bookingData;
   const {
@@ -79,6 +78,7 @@ async function handler(input: CancelBookingInput) {
     cancelledBy,
     cancelSubsequentBookings,
     internalNote,
+    skipCancellationReasonValidation = false,
   } = bookingCancelInput.parse(body);
   const bookingToDelete = await getBookingToDelete(id, uid);
   const {
@@ -117,7 +117,12 @@ async function handler(input: CancelBookingInput) {
   const isCancellationUserHost =
     bookingToDelete.userId == userId || bookingToDelete.user.email === cancelledBy;
 
-  if (!platformClientId && !cancellationReason?.trim() && isCancellationUserHost) {
+  if (
+    !platformClientId &&
+    !cancellationReason?.trim() &&
+    isCancellationUserHost &&
+    !skipCancellationReasonValidation
+  ) {
     throw new HttpError({
       statusCode: 400,
       message: "Cancellation reason is required when you are the host",
@@ -587,4 +592,24 @@ async function handler(input: CancelBookingInput) {
   } satisfies HandleCancelBookingResponse;
 }
 
+type BookingCancelServiceDependencies = {
+  prismaClient: PrismaClient;
+};
+/**
+ * Takes care of cancelling bookings. This includes regular bookings, recurring bookings, seated bookings, etc.
+ * Handles both individual booking cancellations and bulk cancellations for recurring events.
+ */
+export class BookingCancelService implements IBookingCancelService {
+  constructor(private readonly deps: BookingCancelServiceDependencies) {}
+
+  async cancelBooking(input: { bookingData: CancelRegularBookingData; bookingMeta?: CancelBookingMeta }) {
+    const cancelBookingInput: CancelBookingInput = {
+      bookingData: input.bookingData,
+      ...(input.bookingMeta || {}),
+    };
+    // TODO: Deps to be passed to it later when we stop exporting handler
+    return handler(cancelBookingInput);
+  }
+}
+
 export default handler;
diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts
index b85fde89512e99..91a59dd71fe45e 100644
--- a/packages/features/bookings/lib/handleConfirmation.ts
+++ b/packages/features/bookings/lib/handleConfirmation.ts
@@ -13,12 +13,12 @@ import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/
 import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser";
 import type { EventManagerUser } from "@calcom/features/bookings/lib/EventManager";
 import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { SchedulingType } from "@calcom/prisma/enums";
diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
index 80f28a1fac2a5f..ffec09d50f8945 100644
--- a/packages/features/bookings/lib/handleNewBooking.ts
+++ b/packages/features/bookings/lib/handleNewBooking.ts
@@ -1,10 +1,12 @@
 import short, { uuid } from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
-
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import processExternalId from "@calcom/app-store/_utils/calendars/processExternalId";
 import { getPaymentAppData } from "@calcom/app-store/_utils/payments/getPaymentAppData";
-import { getFirstDelegationConferencingCredentialAppLocation } from "@calcom/app-store/delegationCredential";
-import { enrichHostsWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
+import {
+  enrichHostsWithDelegationCredentials,
+  getFirstDelegationConferencingCredentialAppLocation,
+} from "@calcom/app-store/delegationCredential";
 import { metadata as GoogleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";
 import {
   getLocationValueForDB,
@@ -12,29 +14,37 @@ import {
   OrganizerDefaultConferencingAppType,
 } from "@calcom/app-store/locations";
 import { getAppFromSlug } from "@calcom/app-store/utils";
-import { eventTypeAppMetadataOptionalSchema } from "@calcom/app-store/zod-utils";
-import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
+import {
+  eventTypeMetaDataSchemaWithTypedApps,
+  eventTypeAppMetadataOptionalSchema,
+} from "@calcom/app-store/zod-utils";
 import dayjs from "@calcom/dayjs";
 import { scheduleMandatoryReminder } from "@calcom/ee/workflows/lib/reminders/scheduleMandatoryReminder";
 import getICalUID from "@calcom/emails/lib/getICalUID";
 import { CalendarEventBuilder } from "@calcom/features/CalendarEventBuilder";
 import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager";
+import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 import type { BookingDataSchemaGetter } from "@calcom/features/bookings/lib/dto/types";
-import type { CreateRegularBookingData, CreateBookingMeta } from "@calcom/features/bookings/lib/dto/types";
+import type {
+  CreateRegularBookingData,
+  CreateBookingMeta,
+  BookingHandlerInput,
+} from "@calcom/features/bookings/lib/dto/types";
 import type { CheckBookingAndDurationLimitsService } from "@calcom/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
 import { handlePayment } from "@calcom/features/bookings/lib/handlePayment";
 import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhookTrigger";
 import { isEventTypeLoggingEnabled } from "@calcom/features/bookings/lib/isEventTypeLoggingEnabled";
 import type { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
-import { getCheckBookingAndDurationLimitsService } from "@calcom/features/di/containers/BookingLimits";
-import { getCacheService } from "@calcom/features/di/containers/Cache";
-import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser";
+import { getSpamCheckService } from "@calcom/features/di/watchlist/containers/SpamCheckService.container";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import AssignmentReasonRecorder from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { getEventName, updateHostInEventName } from "@calcom/features/eventtypes/lib/eventNaming";
 import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { getFullName } from "@calcom/features/form-builder/utils";
 import { handleAnalyticsEvents } from "@calcom/features/tasker/tasks/analytics/handleAnalyticsEvents";
+import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { UsersRepository } from "@calcom/features/users/users.repository";
 import type { GetSubscriberOptions } from "@calcom/features/webhooks/lib/getWebhooks";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
@@ -48,24 +58,22 @@ import { groupHostsByGroupId } from "@calcom/lib/bookings/hostGroupUtils";
 import { shouldIgnoreContactOwner } from "@calcom/lib/bookings/routing/utils";
 import { DEFAULT_GROUP_ID } from "@calcom/lib/constants";
 import { ErrorCode } from "@calcom/lib/errorCodes";
-import { getErrorFromUnknown } from "@calcom/lib/errors";
+import { getErrorFromUnknown, ErrorWithCode } from "@calcom/lib/errors";
 import { extractBaseEmail } from "@calcom/lib/extract-base-email";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import { HttpError } from "@calcom/lib/http-error";
-import type { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
 import logger from "@calcom/lib/logger";
 import { getPiiFreeCalendarEvent, getPiiFreeEventType } from "@calcom/lib/piiFreeData";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import type { PrismaAttributeRepository as AttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import type { HostRepository } from "@calcom/lib/server/repository/host";
+import type { PrismaOOORepository as OooRepository } from "@calcom/lib/server/repository/ooo";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import type { PrismaClient } from "@calcom/prisma";
-import { prisma } from "@calcom/prisma";
 import type { DestinationCalendar, Prisma, User, AssignmentReasonEnum } from "@calcom/prisma/client";
 import {
   BookingStatus,
@@ -87,10 +95,12 @@ import type { CredentialForCalendarService } from "@calcom/types/Credential";
 import type { EventResult, PartialReference } from "@calcom/types/EventManager";
 
 import type { EventPayloadType, EventTypeInfo } from "../../webhooks/lib/sendPayload";
+import type { BookingRepository } from "../repositories/BookingRepository";
 import { BookingActionMap, BookingEmailSmsHandler } from "./BookingEmailSmsHandler";
 import { getAllCredentialsIncludeServiceAccountKey } from "./getAllCredentialsForUsersOnEvent/getAllCredentials";
 import { refreshCredentials } from "./getAllCredentialsForUsersOnEvent/refreshCredentials";
 import getBookingDataSchema from "./getBookingDataSchema";
+import { LuckyUserService } from "./getLuckyUser";
 import { addVideoCallDataToEvent } from "./handleNewBooking/addVideoCallDataToEvent";
 import { checkActiveBookingsLimitForBooker } from "./handleNewBooking/checkActiveBookingsLimitForBooker";
 import { checkIfBookerEmailIsBlocked } from "./handleNewBooking/checkIfBookerEmailIsBlocked";
@@ -145,7 +155,9 @@ function getICalSequence(originalRescheduledBooking: BookingType | null) {
   return originalRescheduledBooking.iCalSequence + 1;
 }
 
-type CreatedBooking = Booking & { appsStatus?: AppsStatus[]; paymentUid?: string; paymentId?: number };
+type CreatedBooking = Booking & {
+  isShortCircuitedBooking?: boolean;
+} & { appsStatus?: AppsStatus[]; paymentUid?: string; paymentId?: number };
 type ReturnTypeCreateBooking = Awaited<ReturnType<typeof createBooking>>;
 export const buildDryRunBooking = ({
   eventTypeId,
@@ -384,27 +396,6 @@ function buildTroubleshooterData({
   return troubleshooterData;
 }
 
-export type PlatformParams = {
-  platformClientId?: string;
-  platformCancelUrl?: string;
-  platformBookingUrl?: string;
-  platformRescheduleUrl?: string;
-  platformBookingLocation?: string;
-  areCalendarEventsEnabled?: boolean;
-};
-
-export type BookingHandlerInput = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  bookingData: Record<string, any>;
-  userId?: number;
-  // These used to come from headers but now we're passing them as params
-  hostname?: string;
-  forcedSlug?: string;
-  skipAvailabilityCheck?: boolean;
-  skipEventLimitsCheck?: boolean;
-  skipCalendarSyncTaskCreation?: boolean;
-} & PlatformParams;
-
 function formatAvailabilitySnapshot(data: {
   dateRanges: { start: dayjs.Dayjs; end: dayjs.Dayjs }[];
   oooExcludedDateRanges: { start: dayjs.Dayjs; end: dayjs.Dayjs }[];
@@ -422,8 +413,62 @@ function formatAvailabilitySnapshot(data: {
   };
 }
 
+export interface IBookingServiceDependencies {
+  cacheService: CacheService;
+  checkBookingAndDurationLimitsService: CheckBookingAndDurationLimitsService;
+  prismaClient: PrismaClient;
+  bookingRepository: BookingRepository;
+  featuresRepository: FeaturesRepository;
+  checkBookingLimitsService: CheckBookingLimitsService;
+  luckyUserService: LuckyUserService;
+  hostRepository: HostRepository;
+  oooRepository: OooRepository;
+  userRepository: UserRepository;
+  attributeRepository: AttributeRepository;
+}
+
+/**
+ * TODO: Ideally we should send organizationId directly to handleNewBooking.
+ * webapp can derive from domain and API V2 knows it already through its endpoint URL
+ */
+async function getEventOrganizationId({
+  eventType,
+}: {
+  eventType: {
+    userId: number | null;
+    team: {
+      parentId: number | null;
+    } | null;
+    parent: {
+      team: {
+        parentId: number | null;
+      } | null;
+    } | null;
+  };
+}) {
+  let eventOrganizationId: number | null = null;
+  const team = eventType.team ?? eventType.parent?.team ?? null;
+  eventOrganizationId = team?.parentId ?? null;
+
+  if (eventOrganizationId) {
+    return eventOrganizationId;
+  }
+
+  if (eventType.userId) {
+    // TODO: Moving it to instance based access through DI in a followup
+    const profile = await ProfileRepository.findFirstForUserId({
+      userId: eventType.userId,
+    });
+    eventOrganizationId = profile?.organizationId ?? null;
+    return eventOrganizationId;
+  }
+
+  return eventOrganizationId;
+}
+
 async function handler(
   input: BookingHandlerInput,
+  deps: IBookingServiceDependencies,
   bookingDataSchemaGetter: BookingDataSchemaGetter = getBookingDataSchema
 ) {
   const {
@@ -442,6 +487,15 @@ async function handler(
     skipCalendarSyncTaskCreation = false,
   } = input;
 
+  const {
+    prismaClient: prisma,
+    bookingRepository,
+    userRepository,
+    cacheService,
+    checkBookingAndDurationLimitsService,
+    luckyUserService,
+  } = deps;
+
   const isPlatformBooking = !!platformClientId;
 
   const eventType = await getEventType({
@@ -492,7 +546,25 @@ async function handler(
   const loggerWithEventDetails = createLoggerWithEventDetails(eventTypeId, reqBody.user, eventTypeSlug);
   const emailsAndSmsHandler = new BookingEmailSmsHandler({ logger: loggerWithEventDetails });
 
-  await checkIfBookerEmailIsBlocked({ loggedInUserId: userId, bookerEmail });
+  try {
+    await checkIfBookerEmailIsBlocked({
+      loggedInUserId: userId,
+      bookerEmail,
+      verificationCode: reqBody.verificationCode,
+    });
+  } catch (error) {
+    if (error instanceof ErrorWithCode) {
+      throw new HttpError({ statusCode: 403, message: error.message });
+    }
+    throw error;
+  }
+
+  const spamCheckService = getSpamCheckService();
+  const eventOrganizationId = await getEventOrganizationId({
+    eventType,
+  });
+
+  spamCheckService.startCheck({ email: bookerEmail, organizationId: eventOrganizationId });
 
   if (!rawBookingData.rescheduleUid) {
     await checkActiveBookingsLimitForBooker({
@@ -543,7 +615,7 @@ async function handler(
   const bookingSeat = reqBody.rescheduleUid ? await getSeatedBooking(reqBody.rescheduleUid) : null;
   const rescheduleUid = bookingSeat ? bookingSeat.booking.uid : reqBody.rescheduleUid;
   const isNormalBookingOrFirstRecurringSlot = input.bookingData.allRecurringDates
-    ? input.bookingData.isFirstRecurringSlot
+    ? !!input.bookingData.isFirstRecurringSlot
     : true;
 
   let originalRescheduledBooking = rescheduleUid
@@ -569,11 +641,9 @@ async function handler(
     (!isConfirmedByDefault && !userReschedulingIsOwner) ||
     eventType.schedulingType === SchedulingType.ROUND_ROBIN
   ) {
-    const bookingRepo = new BookingRepository(prisma);
-
     const requiresPayment = !Number.isNaN(paymentAppData.price) && paymentAppData.price > 0;
 
-    const existingBooking = await bookingRepo.getValidBookingFromEventTypeForAttendee({
+    const existingBooking = await bookingRepository.getValidBookingFromEventTypeForAttendee({
       eventTypeId,
       bookerEmail,
       bookerPhoneNumber,
@@ -610,7 +680,6 @@ async function handler(
     }
   }
 
-  const cacheService = getCacheService();
   const shouldServeCache = await cacheService.getShouldServeCache(_shouldServeCache, eventType.team?.id);
 
   const isTeamEventType =
@@ -723,7 +792,6 @@ async function handler(
   });
 
   if (!skipEventLimitsCheck) {
-    const checkBookingAndDurationLimitsService = getCheckBookingAndDurationLimitsService();
     await checkBookingAndDurationLimitsService.checkBookingAndDurationLimits({
       eventType,
       reqBodyStart: reqBody.start,
@@ -783,7 +851,11 @@ async function handler(
         },
       }),
     };
-    if (input.bookingData.allRecurringDates && input.bookingData.isFirstRecurringSlot) {
+    if (
+      input.bookingData.allRecurringDates &&
+      input.bookingData.isFirstRecurringSlot &&
+      input.bookingData.numSlotsToCheckForAvailability
+    ) {
       const isTeamEvent =
         eventType.schedulingType === SchedulingType.COLLECTIVE ||
         eventType.schedulingType === SchedulingType.ROUND_ROBIN;
@@ -940,7 +1012,6 @@ async function handler(
             memberId: eventTypeWithUsers.users[0].id ?? null,
             teamId: eventType.teamId,
           });
-          const luckyUserService = getLuckyUserService();
           const newLuckyUser = await luckyUserService.getLuckyUser({
             // find a lucky user that is not already in the luckyUsers array
             availableUsers: freeUsers,
@@ -965,7 +1036,9 @@ async function handler(
           }
           if (
             input.bookingData.isFirstRecurringSlot &&
-            eventType.schedulingType === SchedulingType.ROUND_ROBIN
+            eventType.schedulingType === SchedulingType.ROUND_ROBIN &&
+            input.bookingData.numSlotsToCheckForAvailability &&
+            input.bookingData.allRecurringDates
           ) {
             // for recurring round robin events check if lucky user is available for next slots
             try {
@@ -1135,13 +1208,31 @@ async function handler(
     ? process.env.BLACKLISTED_GUEST_EMAILS.split(",")
     : [];
 
+  const guestEmails = (reqGuests || []).map((email) => extractBaseEmail(email).toLowerCase());
+  const guestUsers = await userRepository.findManyByEmailsWithEmailVerificationSettings({
+    emails: guestEmails,
+  });
+
+  const emailToRequiresVerification = new Map<string, boolean>();
+  for (const user of guestUsers) {
+    const matchedBase = extractBaseEmail(user.matchedEmail ?? user.email).toLowerCase();
+    emailToRequiresVerification.set(matchedBase, user.requiresBookerEmailVerification === true);
+  }
+
   const guestsRemoved: string[] = [];
   const guests = (reqGuests || []).reduce((guestArray, guest) => {
     const baseGuestEmail = extractBaseEmail(guest).toLowerCase();
+
     if (blacklistedGuestEmails.some((e) => e.toLowerCase() === baseGuestEmail)) {
       guestsRemoved.push(guest);
       return guestArray;
     }
+
+    if (emailToRequiresVerification.get(baseGuestEmail)) {
+      guestsRemoved.push(guest);
+      return guestArray;
+    }
+
     // If it's a team event, remove the team member from guests
     if (isTeamEventType && users.some((user) => user.email === guest)) {
       return guestArray;
@@ -1392,6 +1483,88 @@ async function handler(
     organizerUser.id
   );
 
+  const spamCheckResult = await spamCheckService.waitForCheck();
+
+  if (spamCheckResult.isBlocked) {
+    const DECOY_ORGANIZER_NAMES = ["Alex Smith", "Jordan Taylor", "Sam Johnson", "Chris Morgan"];
+    const randomOrganizerName =
+      DECOY_ORGANIZER_NAMES[Math.floor(Math.random() * DECOY_ORGANIZER_NAMES.length)];
+
+    const eventName = getEventName({
+      ...eventNameObject,
+      host: randomOrganizerName,
+    });
+
+    return {
+      id: 0,
+      uid,
+      iCalUID: "",
+      status: BookingStatus.ACCEPTED,
+      eventTypeId: eventType.id,
+      user: {
+        name: randomOrganizerName,
+        timeZone: "UTC",
+        email: null,
+      },
+      userId: null,
+      title: eventName,
+      startTime: new Date(reqBody.start),
+      endTime: new Date(reqBody.end),
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      attendees: [
+        {
+          id: 0,
+          email: bookerEmail,
+          name: fullName,
+          timeZone: reqBody.timeZone,
+          locale: null,
+          phoneNumber: null,
+          bookingId: null,
+          noShow: null,
+        },
+      ],
+      oneTimePassword: null,
+      smsReminderNumber: null,
+      metadata: {},
+      idempotencyKey: null,
+      userPrimaryEmail: null,
+      description: eventType.description || null,
+      customInputs: null,
+      responses: null,
+      location: bookingLocation,
+      paid: false,
+      cancellationReason: null,
+      rejectionReason: null,
+      dynamicEventSlugRef: null,
+      dynamicGroupSlugRef: null,
+      fromReschedule: null,
+      recurringEventId: null,
+      scheduledJobs: [],
+      rescheduledBy: null,
+      destinationCalendarId: null,
+      reassignReason: null,
+      reassignById: null,
+      rescheduled: false,
+      isRecorded: false,
+      iCalSequence: 0,
+      rating: null,
+      ratingFeedback: null,
+      noShowHost: null,
+      cancelledBy: null,
+      creationSource: CreationSource.WEBAPP,
+      references: [],
+      payment: [],
+      isDryRun: false,
+      paymentRequired: false,
+      paymentUid: undefined,
+      luckyUsers: [],
+      paymentId: undefined,
+      seatReferenceUid: undefined,
+      isShortCircuitedBooking: true, // Renamed from isSpamDecoy to avoid exposing spam detection to blocked users
+    };
+  }
+
   // For seats, if the booking already exists then we want to add the new attendee to the existing booking
   if (eventType.seatsPerTimeSlot) {
     const newBooking = await handleSeats({
@@ -1617,9 +1790,9 @@ async function handler(
       if (booking && booking.id && eventType.seatsPerTimeSlot) {
         const currentAttendee = booking.attendees.find(
           (attendee) =>
-            attendee.email === input.bookingData.responses.email ||
-            (input.bookingData.responses.attendeePhoneNumber &&
-              attendee.phoneNumber === input.bookingData.responses.attendeePhoneNumber)
+            attendee.email === bookingData.responses.email ||
+            (bookingData.responses.attendeePhoneNumber &&
+              attendee.phoneNumber === bookingData.responses.attendeePhoneNumber)
         );
 
         // Save description to bookingSeat
@@ -2432,17 +2605,6 @@ async function handler(
   };
 }
 
-export default handler;
-
-export interface IBookingServiceDependencies {
-  cacheService: CacheService;
-  checkBookingAndDurationLimitsService: CheckBookingAndDurationLimitsService;
-  prismaClient: PrismaClient;
-  bookingRepository: BookingRepository;
-  featuresRepository: FeaturesRepository;
-  checkBookingLimitsService: CheckBookingLimitsService;
-}
-
 /**
  * Takes care of creating/rescheduling non-recurring, non-instant bookings. Such bookings could be TeamBooking, UserBooking, SeatedUserBooking, SeatedTeamBooking, etc.
  * We can't name it CoreBookingService because non-instant booking also creates a booking but it is entirely different from the regular booking.
@@ -2452,19 +2614,29 @@ export class RegularBookingService implements IBookingService {
   constructor(private readonly deps: IBookingServiceDependencies) {}
 
   async createBooking(input: { bookingData: CreateRegularBookingData; bookingMeta?: CreateBookingMeta }) {
-    // deps to be passed to handler in follow-up PR
-    return handler({ bookingData: input.bookingData, ...input.bookingMeta });
+    return handler({ bookingData: input.bookingData, ...input.bookingMeta }, this.deps);
   }
 
   async rescheduleBooking(input: { bookingData: CreateRegularBookingData; bookingMeta?: CreateBookingMeta }) {
-    return handler({ bookingData: input.bookingData, ...input.bookingMeta });
+    return handler({ bookingData: input.bookingData, ...input.bookingMeta }, this.deps);
   }
 
-  async rescheduleBookingForApiV1(input: {
+  /**
+   * @deprecated Exists only till API v1 is removed.
+   */
+  async createBookingForApiV1(input: {
     bookingData: CreateRegularBookingData;
     bookingMeta?: CreateBookingMeta;
     bookingDataSchemaGetter: BookingDataSchemaGetter;
   }) {
-    return handler({ bookingData: input.bookingData, ...input.bookingMeta }, input.bookingDataSchemaGetter);
+    const bookingMeta = input.bookingMeta ?? {};
+    return handler(
+      {
+        bookingData: input.bookingData,
+        ...bookingMeta,
+      },
+      this.deps,
+      input.bookingDataSchemaGetter
+    );
   }
 }
diff --git a/packages/features/bookings/lib/handleNewBooking/checkActiveBookingsLimitForBooker.ts b/packages/features/bookings/lib/handleNewBooking/checkActiveBookingsLimitForBooker.ts
index 6b565ae4af96c7..0dec8cf173aeb6 100644
--- a/packages/features/bookings/lib/handleNewBooking/checkActiveBookingsLimitForBooker.ts
+++ b/packages/features/bookings/lib/handleNewBooking/checkActiveBookingsLimitForBooker.ts
@@ -61,7 +61,9 @@ const checkActiveBookingsLimit = async ({
 
   if (bookingsCount >= maxActiveBookingsPerBooker) {
     log.warn(`Maximum booking limit reached for ${bookerEmail} for event type ${eventTypeId}`);
-    throw new ErrorWithCode(ErrorCode.BookerLimitExceeded, ErrorCode.BookerLimitExceeded);
+    throw new ErrorWithCode(ErrorCode.BookerLimitExceeded, ErrorCode.BookerLimitExceeded, {
+      count: maxActiveBookingsPerBooker,
+    });
   }
 };
 
diff --git a/packages/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits.ts b/packages/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits.ts
index fc7775d1bef1db..504d96246692f4 100644
--- a/packages/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits.ts
+++ b/packages/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits.ts
@@ -1,7 +1,7 @@
 import dayjs from "@calcom/dayjs";
 import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
-import type { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
-import { checkDurationLimits } from "@calcom/lib/intervalLimits/server/checkDurationLimits";
+import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
+import { checkDurationLimits } from "@calcom/features/bookings/lib/checkDurationLimits";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 
 import type { NewBookingEventType } from "./getEventTypesFromDB";
diff --git a/packages/features/bookings/lib/handleNewBooking/checkIfBookerEmailIsBlocked.ts b/packages/features/bookings/lib/handleNewBooking/checkIfBookerEmailIsBlocked.ts
index 4f4aa17649c48c..274b061948f9dc 100644
--- a/packages/features/bookings/lib/handleNewBooking/checkIfBookerEmailIsBlocked.ts
+++ b/packages/features/bookings/lib/handleNewBooking/checkIfBookerEmailIsBlocked.ts
@@ -1,27 +1,28 @@
+import { ErrorCode } from "@calcom/lib/errorCodes";
+import { ErrorWithCode } from "@calcom/lib/errors";
 import { extractBaseEmail } from "@calcom/lib/extract-base-email";
-import { HttpError } from "@calcom/lib/http-error";
 import prisma from "@calcom/prisma";
+import { verifyCodeUnAuthenticated } from "@calcom/trpc/server/routers/viewer/auth/util";
 
 export const checkIfBookerEmailIsBlocked = async ({
   bookerEmail,
   loggedInUserId,
+  verificationCode,
 }: {
   bookerEmail: string;
   loggedInUserId?: number;
+  verificationCode?: string;
 }) => {
   const baseEmail = extractBaseEmail(bookerEmail);
+
   const blacklistedGuestEmails = process.env.BLACKLISTED_GUEST_EMAILS
     ? process.env.BLACKLISTED_GUEST_EMAILS.split(",")
     : [];
 
-  const blacklistedEmail = blacklistedGuestEmails.find(
+  const blacklistedByEnv = blacklistedGuestEmails.find(
     (guestEmail: string) => guestEmail.toLowerCase() === baseEmail.toLowerCase()
   );
 
-  if (!blacklistedEmail) {
-    return false;
-  }
-
   const user = await prisma.user.findFirst({
     where: {
       OR: [
@@ -46,17 +47,46 @@ export const checkIfBookerEmailIsBlocked = async ({
     select: {
       id: true,
       email: true,
+      requiresBookerEmailVerification: true,
     },
   });
 
+  const blockedByUserSetting = user?.requiresBookerEmailVerification ?? false;
+  const shouldBlock = !!blacklistedByEnv || blockedByUserSetting;
+
+  if (!shouldBlock) {
+    return false;
+  }
+
   if (!user) {
-    throw new HttpError({ statusCode: 403, message: "Cannot use this email to create the booking." });
+    throw new ErrorWithCode(ErrorCode.BookerEmailBlocked, "Cannot use this email to create the booking.");
   }
 
   if (user.id !== loggedInUserId) {
-    throw new HttpError({
-      statusCode: 403,
-      message: `Attendee email has been blocked. Make sure to login as ${bookerEmail} to use this email for creating a booking.`,
-    });
+    // If a verification code is provided, validate it
+    if (verificationCode) {
+      let isValid = false;
+
+      try {
+        isValid = await verifyCodeUnAuthenticated(baseEmail, verificationCode);
+      } catch {
+        throw new ErrorWithCode(
+          ErrorCode.UnableToValidateVerificationCode,
+          "There was an error validating the verification code"
+        );
+      }
+
+      if (!isValid) {
+        throw new ErrorWithCode(ErrorCode.InvalidVerificationCode, "Invalid verification code");
+      }
+
+      return false;
+    }
+
+    throw new ErrorWithCode(
+      ErrorCode.BookerEmailRequiresLogin,
+      `Attendee email has been blocked. Make sure to login as ${bookerEmail} to use this email for creating a booking.`,
+      { email: bookerEmail }
+    );
   }
 };
diff --git a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts
index 8280d73709952e..57f6fe60902cbc 100644
--- a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts
+++ b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts
@@ -3,7 +3,7 @@ import type { Logger } from "tslog";
 import dayjs from "@calcom/dayjs";
 import type { Dayjs } from "@calcom/dayjs";
 import { checkForConflicts } from "@calcom/features/bookings/lib/conflictChecker/checkForConflicts";
-import { buildDateRanges } from "@calcom/lib/date-ranges";
+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";
 import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";
 import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability";
 import { ErrorCode } from "@calcom/lib/errorCodes";
diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
index 7e60482df243a9..26394861bf9ce5 100644
--- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
+++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
@@ -4,7 +4,7 @@ import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/
 import type { DefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
-import { withSelectedCalendars } from "@calcom/lib/server/repository/user";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
@@ -97,6 +97,7 @@ const getEventTypesFromDBSelect = {
       team: {
         select: {
           id: true,
+          parentId: true,
           bookingLimits: true,
           includeManagedEventsInLimits: true,
         },
diff --git a/packages/features/bookings/lib/handleNewBooking/getRequiresConfirmationFlags.ts b/packages/features/bookings/lib/handleNewBooking/getRequiresConfirmationFlags.ts
index 98421db2718948..c3c354209c13f1 100644
--- a/packages/features/bookings/lib/handleNewBooking/getRequiresConfirmationFlags.ts
+++ b/packages/features/bookings/lib/handleNewBooking/getRequiresConfirmationFlags.ts
@@ -1,5 +1,5 @@
 import dayjs from "@calcom/dayjs";
-import { checkIfFreeEmailDomain } from "@calcom/lib/freeEmailDomainCheck/checkIfFreeEmailDomain";
+import { checkIfFreeEmailDomain } from "@calcom/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 
 import type { getEventTypeResponse } from "./getEventTypesFromDB";
@@ -56,7 +56,7 @@ const _determineRequiresConfirmation = async (
   const requiresConfirmationForFreeEmail = eventType?.requiresConfirmationForFreeEmail;
 
   if (requiresConfirmationForFreeEmail) {
-    requiresConfirmation = await checkIfFreeEmailDomain(bookerEmail);
+    requiresConfirmation = await checkIfFreeEmailDomain({ email: bookerEmail });
   }
 
   if (rcThreshold) {
diff --git a/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts b/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts
index d7f6afce7aae79..bb9f1d4767f4b1 100644
--- a/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts
+++ b/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts
@@ -3,13 +3,14 @@ import type { Logger } from "tslog";
 import { enrichUsersWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
 import type { RoutingFormResponse } from "@calcom/features/bookings/lib/getLuckyUser";
 import { getQualifiedHostsService } from "@calcom/features/di/containers/QualifiedHosts";
+import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";
 import { checkIfUsersAreBlocked } from "@calcom/features/watchlist/operations/check-if-users-are-blocked.controller";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { HttpError } from "@calcom/lib/http-error";
 import { getPiiFreeUser } from "@calcom/lib/piiFreeData";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
-import { withSelectedCalendars } from "@calcom/lib/server/repository/user";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
 import { userSelect } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
@@ -130,7 +131,11 @@ const _loadAndValidateUsers = async ({
   if (!users) throw new HttpError({ statusCode: 404, message: "eventTypeUser.notFound" });
 
   // Determine if users are locked
-  const containsBlockedUser = await checkIfUsersAreBlocked(users);
+  const containsBlockedUser = await checkIfUsersAreBlocked({
+    users,
+    organizationId: null,
+    span: sentrySpan,
+  });
 
   if (containsBlockedUser) throw new HttpError({ statusCode: 404, message: "eventTypeUser.notFound" });
 
diff --git a/packages/features/bookings/lib/handleNewBooking/loadUsers.ts b/packages/features/bookings/lib/handleNewBooking/loadUsers.ts
index 048ef5b2d4eced..d52794c67f885c 100644
--- a/packages/features/bookings/lib/handleNewBooking/loadUsers.ts
+++ b/packages/features/bookings/lib/handleNewBooking/loadUsers.ts
@@ -7,7 +7,7 @@ import {
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { withSelectedCalendars, UserRepository } from "@calcom/lib/server/repository/user";
+import { withSelectedCalendars, UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma, { userSelect } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
diff --git a/packages/features/bookings/lib/handleNewBooking/originalRescheduledBookingUtils.ts b/packages/features/bookings/lib/handleNewBooking/originalRescheduledBookingUtils.ts
index 356a47197733cf..96efeebe6af86f 100644
--- a/packages/features/bookings/lib/handleNewBooking/originalRescheduledBookingUtils.ts
+++ b/packages/features/bookings/lib/handleNewBooking/originalRescheduledBookingUtils.ts
@@ -1,6 +1,6 @@
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { Prisma } from "@calcom/prisma/client";
 import { BookingStatus } from "@calcom/prisma/enums";
 import prisma from "@calcom/prisma";
diff --git a/packages/features/bookings/lib/handleNewBooking/test/booking-validations.test.ts b/packages/features/bookings/lib/handleNewBooking/test/booking-validations.test.ts
index eed0db94b98ff3..1d4cddcc822201 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/booking-validations.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/booking-validations.test.ts
@@ -3,6 +3,7 @@
  * These specifications verify the business rules and validation behavior for booking creation
  */
 import prismaMock from "../../../../../../tests/libs/__mocks__/prisma";
+
 import {
   createBookingScenario,
   TestData,
@@ -15,7 +16,7 @@ import {
 import { getMockRequestDataForBooking } from "@calcom/web/test/utils/bookingScenario/getMockRequestDataForBooking";
 import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown";
 
-import { afterEach, vi } from "vitest";
+import { afterEach, beforeEach, vi } from "vitest";
 import { describe, expect } from "vitest";
 
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -23,6 +24,33 @@ import { test } from "@calcom/web/test/fixtures/fixtures";
 
 import { getNewBookingHandler } from "./getNewBookingHandler";
 
+vi.mock("@calcom/trpc/server/routers/viewer/auth/util", () => ({
+  verifyCodeUnAuthenticated: vi.fn(),
+}));
+
+const { mockFindManyByEmailsWithEmailVerificationSettings, mockFindByEmailWithEmailVerificationSetting } =
+  vi.hoisted(() => ({
+    mockFindManyByEmailsWithEmailVerificationSettings: vi.fn(),
+    mockFindByEmailWithEmailVerificationSetting: vi.fn(),
+  }));
+
+vi.mock("@calcom/features/users/repositories/UserRepository", async (importOriginal) => {
+  const actual = await importOriginal();
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const OriginalUserRepository = (actual as any).UserRepository;
+
+  return {
+    ...actual,
+    UserRepository: vi.fn().mockImplementation((prisma) => {
+      const realInstance = new OriginalUserRepository(prisma);
+      realInstance.findManyByEmailsWithEmailVerificationSettings =
+        mockFindManyByEmailsWithEmailVerificationSettings;
+      realInstance.findByEmailWithEmailVerificationSetting = mockFindByEmailWithEmailVerificationSetting;
+      return realInstance;
+    }),
+  };
+});
+
 function addToBlacklistedEmails(emails: string[]) {
   process.env.BLACKLISTED_GUEST_EMAILS = emails.join(",");
 }
@@ -31,8 +59,14 @@ function resetBlacklistedEmails() {
   delete process.env.BLACKLISTED_GUEST_EMAILS;
 }
 
-afterEach(() => { 
+beforeEach(() => {
+  mockFindManyByEmailsWithEmailVerificationSettings.mockResolvedValue([]);
+  mockFindByEmailWithEmailVerificationSetting.mockResolvedValue(null);
+});
+
+afterEach(() => {
   resetBlacklistedEmails();
+  vi.clearAllMocks();
 });
 
 describe("Booking Validation Specifications", () => {
@@ -93,9 +127,11 @@ describe("Booking Validation Specifications", () => {
       });
 
       // Non logged in user should not be able to book
-      await expect(handleNewBooking({
-        bookingData: mockBookingData,
-      })).rejects.toThrow(
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow(
         "Attendee email has been blocked. Make sure to login as organizer@example.com to use this email for creating a booking."
       );
 
@@ -169,9 +205,11 @@ describe("Booking Validation Specifications", () => {
       });
 
       // Should prevent booking when blacklisted email has no verified user in database
-      await expect(handleNewBooking({
-        bookingData: mockBookingData,
-      })).rejects.toThrow("Cannot use this email to create the booking.");
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow("Cannot use this email to create the booking.");
     });
   });
 
@@ -225,9 +263,11 @@ describe("Booking Validation Specifications", () => {
               title: "Existing Booking",
               status: BookingStatus.ACCEPTED,
               // Booker already has a booking in future
-              attendees: [{
-                email: booker.email,
-              }],
+              attendees: [
+                {
+                  email: booker.email,
+                },
+              ],
             },
           ],
         })
@@ -235,7 +275,6 @@ describe("Booking Validation Specifications", () => {
 
       await mockCalendarToHaveNoBusySlots("googlecalendar", {});
 
-
       const mockBookingData = getMockRequestDataForBooking({
         data: {
           eventTypeId: 1,
@@ -261,9 +300,11 @@ describe("Booking Validation Specifications", () => {
       );
 
       // Second booking should be rejected
-      await expect(handleNewBooking({
-        bookingData: mockBookingData,
-      })).rejects.toThrow("booker_limit_exceeded_error");
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow("booker_limit_exceeded_error");
     });
 
     test("enforces booking limits with reschedule option when enabled", async () => {
@@ -315,9 +356,11 @@ describe("Booking Validation Specifications", () => {
               endTime: `${plus1DateString}T10:30:00.000Z`,
               title: "Existing Booking",
               status: BookingStatus.ACCEPTED,
-              attendees: [{
-                email: booker.email,
-              }],
+              attendees: [
+                {
+                  email: booker.email,
+                },
+              ],
             },
             {
               uid: "existing-booking-2",
@@ -327,9 +370,11 @@ describe("Booking Validation Specifications", () => {
               endTime: `${plus2DateString}T10:30:00.000Z`,
               title: "Existing Booking",
               status: BookingStatus.ACCEPTED,
-              attendees: [{
-                email: booker.email,
-              }],
+              attendees: [
+                {
+                  email: booker.email,
+                },
+              ],
             },
           ],
         })
@@ -362,4 +407,739 @@ describe("Booking Validation Specifications", () => {
       }
     });
   });
+
+  describe("User Email Verification Setting", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    test("should block booking when main booker requires verification and is not logged in", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "user@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "user@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+        },
+      });
+
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow(
+        "Attendee email has been blocked. Make sure to login as user@example.com to use this email for creating a booking."
+      );
+    });
+
+    test("should allow booking when main booker requires verification but is logged in", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "user@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "user@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+        },
+      });
+
+      const createdBooking = await handleNewBooking({
+        bookingData: mockBookingData,
+        userId: 201,
+      });
+
+      expect(createdBooking).toEqual(
+        expect.objectContaining({
+          id: expect.any(Number),
+          uid: expect.any(String),
+          status: BookingStatus.ACCEPTED,
+        })
+      );
+    });
+
+    test("should create booking when main booker provides valid verification code", async () => {
+      const handleNewBooking = getNewBookingHandler();
+      const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
+
+      vi.mocked(verifyCodeUnAuthenticated).mockResolvedValue(true);
+
+      const booker = getBooker({
+        email: "user@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "user@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+          verificationCode: "valid-code-123",
+        },
+      });
+
+      const createdBooking = await handleNewBooking({
+        bookingData: mockBookingData,
+      });
+
+      expect(createdBooking).toEqual(
+        expect.objectContaining({
+          id: expect.any(Number),
+          uid: expect.any(String),
+          status: BookingStatus.ACCEPTED,
+        })
+      );
+
+      expect(verifyCodeUnAuthenticated).toHaveBeenCalledWith("user@example.com", "valid-code-123");
+    });
+
+    test("should require verification when secondary email of user with verification setting is used as main booker", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "secondary@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "primary@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+        secondaryEmails: [{ email: "secondary@example.com", emailVerified: new Date() }],
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+        },
+      });
+
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow(
+        "Attendee email has been blocked. Make sure to login as secondary@example.com to use this email for creating a booking."
+      );
+    });
+
+    test("should filter out guest that requires verification", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "booker@example.com",
+        name: "Booker",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const guestWithVerification = getOrganizer({
+        name: "Guest",
+        email: "guest-with-verification@example.com",
+        id: 202,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [guestWithVerification],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      mockFindManyByEmailsWithEmailVerificationSettings.mockResolvedValue([
+        {
+          email: "guest-with-verification@example.com",
+          matchedEmail: "guest-with-verification@example.com",
+          requiresBookerEmailVerification: true,
+        },
+      ]);
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+            guests: ["guest-with-verification@example.com", "regular-guest@example.com"],
+          },
+        },
+      });
+
+      const createdBooking = await handleNewBooking({
+        bookingData: mockBookingData,
+      });
+
+      expect(createdBooking).toEqual(
+        expect.objectContaining({
+          id: expect.any(Number),
+          uid: expect.any(String),
+          status: BookingStatus.ACCEPTED,
+        })
+      );
+
+      const booking = await prismaMock.booking.findFirst({
+        where: { id: createdBooking.id },
+        include: { attendees: true },
+      });
+
+      const guestEmails = booking?.attendees.map((a) => a.email).filter((e) => e !== booker.email);
+      expect(guestEmails).toEqual(["regular-guest@example.com"]);
+      expect(guestEmails).not.toContain("guest-with-verification@example.com");
+    });
+
+    test("should filter out secondary email with verification when added as guest", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "booker@example.com",
+        name: "Booker",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithSecondaryEmail = getOrganizer({
+        name: "User",
+        email: "primary@example.com",
+        id: 202,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+        secondaryEmails: [{ email: "secondary@example.com", emailVerified: new Date() }],
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithSecondaryEmail],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      mockFindManyByEmailsWithEmailVerificationSettings.mockResolvedValue([
+        {
+          email: "primary@example.com",
+          matchedEmail: "secondary@example.com",
+          requiresBookerEmailVerification: true,
+        },
+      ]);
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+            guests: ["secondary@example.com", "regular-guest@example.com"],
+          },
+        },
+      });
+
+      const createdBooking = await handleNewBooking({
+        bookingData: mockBookingData,
+      });
+
+      expect(createdBooking).toEqual(
+        expect.objectContaining({
+          id: expect.any(Number),
+          uid: expect.any(String),
+          status: BookingStatus.ACCEPTED,
+        })
+      );
+
+      const booking = await prismaMock.booking.findFirst({
+        where: { id: createdBooking.id },
+        include: { attendees: true },
+      });
+
+      const guestEmails = booking?.attendees.map((a) => a.email).filter((e) => e !== booker.email);
+      expect(guestEmails).toEqual(["regular-guest@example.com"]);
+      expect(guestEmails).not.toContain("secondary@example.com");
+    });
+
+    test("should match plus-addressed email to base email for verification check", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "user+tag@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "user@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+        },
+      });
+
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow("Attendee email has been blocked");
+    });
+
+    test("should filter only guests requiring verification from multiple guests", async () => {
+      const handleNewBooking = getNewBookingHandler();
+
+      const booker = getBooker({
+        email: "booker@example.com",
+        name: "Booker",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const guest1 = getOrganizer({
+        name: "Guest1",
+        email: "guest1-verify@example.com",
+        id: 202,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      const guest3 = getOrganizer({
+        name: "Guest3",
+        email: "guest3-verify@example.com",
+        id: 203,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [guest1, guest3],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      mockFindManyByEmailsWithEmailVerificationSettings.mockResolvedValue([
+        {
+          email: "guest1-verify@example.com",
+          matchedEmail: "guest1-verify@example.com",
+          requiresBookerEmailVerification: true,
+        },
+        {
+          email: "guest3-verify@example.com",
+          matchedEmail: "guest3-verify@example.com",
+          requiresBookerEmailVerification: true,
+        },
+      ]);
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+            guests: [
+              "guest1-verify@example.com",
+              "guest2-no-verify@example.com",
+              "guest3-verify@example.com",
+              "guest4-no-verify@example.com",
+            ],
+          },
+        },
+      });
+
+      const createdBooking = await handleNewBooking({
+        bookingData: mockBookingData,
+      });
+
+      expect(createdBooking).toEqual(
+        expect.objectContaining({
+          id: expect.any(Number),
+          uid: expect.any(String),
+          status: BookingStatus.ACCEPTED,
+        })
+      );
+
+      const booking = await prismaMock.booking.findFirst({
+        where: { id: createdBooking.id },
+        include: { attendees: true },
+      });
+
+      const guestEmails = booking?.attendees.map((a) => a.email).filter((e) => e !== booker.email);
+      expect(guestEmails).toEqual(
+        expect.arrayContaining(["guest2-no-verify@example.com", "guest4-no-verify@example.com"])
+      );
+      expect(guestEmails).not.toContain("guest1-verify@example.com");
+      expect(guestEmails).not.toContain("guest3-verify@example.com");
+      expect(guestEmails?.length).toBe(2);
+    });
+
+    test("should throw error when invalid verification code is provided", async () => {
+      const handleNewBooking = getNewBookingHandler();
+      const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
+
+      vi.mocked(verifyCodeUnAuthenticated).mockResolvedValue(false);
+
+      const booker = getBooker({
+        email: "user@example.com",
+        name: "User",
+      });
+
+      const organizer = getOrganizer({
+        name: "Organizer",
+        email: "organizer@example.com",
+        id: 101,
+        schedules: [TestData.schedules.IstWorkHours],
+        credentials: [getGoogleCalendarCredential()],
+        selectedCalendars: [TestData.selectedCalendars.google],
+        emailVerified: new Date(),
+      });
+
+      const userWithVerificationRequired = getOrganizer({
+        name: "User",
+        email: "user@example.com",
+        id: 201,
+        schedules: [TestData.schedules.IstWorkHours],
+        emailVerified: new Date(),
+        requiresBookerEmailVerification: true,
+      });
+
+      await createBookingScenario(
+        getScenarioData({
+          eventTypes: [
+            {
+              id: 1,
+              slotInterval: 30,
+              length: 30,
+              users: [
+                {
+                  id: 101,
+                },
+              ],
+            },
+          ],
+          organizer,
+          usersApartFromOrganizer: [userWithVerificationRequired],
+          apps: [TestData.apps["google-calendar"]],
+        })
+      );
+
+      await mockCalendarToHaveNoBusySlots("googlecalendar", {});
+
+      const mockBookingData = getMockRequestDataForBooking({
+        data: {
+          eventTypeId: 1,
+          responses: {
+            email: booker.email,
+            name: booker.name,
+            location: { optionValue: "", value: "New York" },
+          },
+          verificationCode: "invalid-code",
+        },
+      });
+
+      await expect(
+        handleNewBooking({
+          bookingData: mockBookingData,
+        })
+      ).rejects.toThrow("Invalid verification code");
+
+      expect(verifyCodeUnAuthenticated).toHaveBeenCalledWith("user@example.com", "invalid-code");
+    });
+  });
 });
diff --git a/packages/features/bookings/lib/handleNewBooking/test/buildDryRunBooking.test.ts b/packages/features/bookings/lib/handleNewBooking/test/buildDryRunBooking.test.ts
index cd81340acf332d..51a271c5044183 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/buildDryRunBooking.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/buildDryRunBooking.test.ts
@@ -6,6 +6,7 @@ import { buildDryRunBooking } from "../../handleNewBooking";
 
 vi.mock("@calcom/prisma", () => ({
   default: {}, // empty object as default export
+  prisma: {},
 }));
 
 describe("buildDryRunBooking", () => {
diff --git a/packages/features/bookings/lib/handleNewBooking/test/buildEventForTeamEventType.test.ts b/packages/features/bookings/lib/handleNewBooking/test/buildEventForTeamEventType.test.ts
index df5f504163adc1..77ef9de0b57326 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/buildEventForTeamEventType.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/buildEventForTeamEventType.test.ts
@@ -12,6 +12,7 @@ vi.mock("@calcom/lib/server/i18n", () => ({
 vi.mock("@calcom/prisma", () => {
   return {
     default: vi.fn(),
+    prisma: {},
   };
 });
 
diff --git a/packages/features/bookings/lib/handleNewBooking/test/email-verification-booking.test.ts b/packages/features/bookings/lib/handleNewBooking/test/email-verification-booking.test.ts
index 07ff10c9e0dbbd..2424d3dbea0130 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/email-verification-booking.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/email-verification-booking.test.ts
@@ -19,6 +19,8 @@ import { vi, describe, expect, beforeEach } from "vitest";
 
 import { test } from "@calcom/web/test/fixtures/fixtures";
 
+import { getNewBookingHandler } from "./getNewBookingHandler";
+
 vi.mock("@calcom/trpc/server/routers/viewer/auth/util", () => ({
   verifyCodeUnAuthenticated: vi.fn(),
 }));
@@ -36,7 +38,7 @@ describe("handleNewBooking - Email Verification", () => {
     test(
       "should throw error when email verification is required but no verification code is provided",
       async () => {
-        const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
+        const handleNewBooking = getNewBookingHandler();
         const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
 
         const booker = getBooker({
@@ -96,7 +98,7 @@ describe("handleNewBooking - Email Verification", () => {
     test(
       "should throw error when email verification is required and verification code is invalid",
       async () => {
-        const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
+        const handleNewBooking = getNewBookingHandler();
         const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
 
         vi.mocked(verifyCodeUnAuthenticated).mockRejectedValue(new Error("Invalid verification code"));
@@ -159,7 +161,7 @@ describe("handleNewBooking - Email Verification", () => {
     test(
       "should successfully create booking when email verification is required and valid verification code is provided",
       async () => {
-        const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
+        const handleNewBooking = getNewBookingHandler();
         const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
 
         vi.mocked(verifyCodeUnAuthenticated).mockResolvedValue(undefined);
@@ -220,7 +222,7 @@ describe("handleNewBooking - Email Verification", () => {
     test(
       "should handle rate limiting error from verification service",
       async () => {
-        const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
+        const handleNewBooking = getNewBookingHandler();
         const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
 
         const rateLimitError = new Error("Rate limit exceeded");
@@ -285,7 +287,7 @@ describe("handleNewBooking - Email Verification", () => {
     test(
       "should proceed normally when email verification is not required",
       async () => {
-        const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
+        const handleNewBooking = getNewBookingHandler();
         const { verifyCodeUnAuthenticated } = await import("@calcom/trpc/server/routers/viewer/auth/util");
 
         const booker = getBooker({
diff --git a/packages/features/bookings/lib/handleNewBooking/test/getNewBookingHandler.ts b/packages/features/bookings/lib/handleNewBooking/test/getNewBookingHandler.ts
index 7db09dc1e263ba..9f221a8d904646 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/getNewBookingHandler.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/getNewBookingHandler.ts
@@ -1,6 +1,15 @@
-async function handler(input: any) {
-  const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;
-  return handleNewBooking(input);
+import type { BookingHandlerInput } from "@calcom/features/bookings/lib/dto/types";
+
+async function handler(input: BookingHandlerInput) {
+  const { getRegularBookingService } = await import(
+    "@calcom/features/bookings/di/RegularBookingService.container"
+  );
+  const regularBookingService = getRegularBookingService();
+  const { bookingData, ...bookingMeta } = input;
+  return regularBookingService.createBooking({
+    bookingData,
+    bookingMeta,
+  });
 }
 
 export function getNewBookingHandler() {
diff --git a/packages/features/bookings/lib/handleNewBooking/test/handleNewRecurringBooking.test.ts b/packages/features/bookings/lib/handleNewBooking/test/handleNewRecurringBooking.test.ts
index 0b1b2b6f065922..9453f3e3200465 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/handleNewRecurringBooking.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/handleNewRecurringBooking.test.ts
@@ -8,7 +8,6 @@ import {
   mockCalendarToHaveNoBusySlots,
   mockSuccessfulVideoMeetingCreation,
   TestData,
-  Timezones,
 } from "@calcom/web/test/utils/bookingScenario/bookingScenario";
 import {
   expectBookingCreatedWebhookToHaveBeenFired,
@@ -22,13 +21,12 @@ import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAn
 import { v4 as uuidv4 } from "uuid";
 import { describe, expect } from "vitest";
 
+import { getRecurringBookingService } from "@calcom/features/bookings/di/RecurringBookingService.container";
 import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
-import { BookingStatus, SchedulingType } from "@calcom/prisma/enums";
+import { BookingStatus } from "@calcom/prisma/enums";
 import { test } from "@calcom/web/test/fixtures/fixtures";
 
-import { handleNewRecurringBooking } from "../../handleNewRecurringBooking";
-
 const DAY_IN_MS = 1000 * 60 * 60 * 24;
 
 function getPlusDayDate(date: string, days: number) {
@@ -153,10 +151,13 @@ describe("handleNewRecurringBooking", () => {
               };
             });
 
+          const recurringBookingService = getRecurringBookingService();
           // Call handleNewRecurringBooking directly instead of through API
-          const createdBookings = await handleNewRecurringBooking({
+          const createdBookings = await recurringBookingService.createBooking({
             bookingData: bookingDataArray,
-            userId: -1, // Simulating anonymous user like in the API test
+            bookingMeta: {
+              userId: -1, // Simulating anonymous user like in the API test
+            },
           });
 
           expect(createdBookings.length).toBe(numOfSlotsToBeBooked);
@@ -177,7 +178,7 @@ describe("handleNewRecurringBooking", () => {
 
             await expectBookingToBeInDatabase({
               description: "",
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
               uid: createdBooking.uid!,
               eventTypeId: mockBookingData.eventTypeId,
               status: BookingStatus.ACCEPTED,
@@ -211,16 +212,14 @@ describe("handleNewRecurringBooking", () => {
           expectSuccessfulBookingCreationEmails({
             booker,
             booking: {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               uid: createdBookings[0].uid!,
               urlOrigin: WEBSITE_URL,
             },
             organizer,
             emails,
             bookingTimeRange: {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               start: createdBookings[0].startTime!,
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
               end: createdBookings[0].endTime!,
             },
             iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID",
@@ -253,302 +252,6 @@ describe("handleNewRecurringBooking", () => {
         },
         timeout
       );
-
-      test.skip(
-        `should fail recurring booking if second slot is already booked`,
-        async ({}) => {
-          const booker = getBooker({
-            email: "booker@example.com",
-            name: "Booker",
-          });
-
-          const organizer = getOrganizer({
-            name: "Organizer",
-            email: "organizer@example.com",
-            id: 101,
-            schedules: [TestData.schedules.IstWorkHours],
-            credentials: [getGoogleCalendarCredential()],
-            selectedCalendars: [TestData.selectedCalendars.google],
-            destinationCalendar: {
-              integration: "google_calendar",
-              externalId: "organizer@google-calendar.com",
-            },
-          });
-
-          const recurrence = getRecurrence({
-            type: "weekly",
-            numberOfOccurrences: 3,
-          });
-          const plus1DateString = getDate({ dateIncrement: 1 }).dateString;
-          const plus2DateString = getDate({ dateIncrement: 2 }).dateString;
-          await createBookingScenario(
-            getScenarioData({
-              webhooks: [
-                {
-                  userId: organizer.id,
-                  eventTriggers: ["BOOKING_CREATED"],
-                  subscriberUrl: "http://my-webhook.example.com",
-                  active: true,
-                  eventTypeId: 1,
-                  appId: null,
-                },
-              ],
-              eventTypes: [
-                {
-                  id: 1,
-                  slotInterval: 30,
-                  length: 30,
-                  recurringEvent: recurrence,
-                  users: [
-                    {
-                      id: 101,
-                    },
-                  ],
-                  destinationCalendar: {
-                    integration: "google_calendar",
-                    externalId: "event-type-1@google-calendar.com",
-                  },
-                },
-              ],
-              bookings: [
-                {
-                  uid: "booking-1-uid",
-                  eventTypeId: 1,
-                  userId: organizer.id,
-                  status: BookingStatus.ACCEPTED,
-                  startTime: `${plus2DateString}T04:00:00.000Z`,
-                  endTime: `${plus2DateString}T04:30:00.000Z`,
-                },
-              ],
-              organizer,
-              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
-            })
-          );
-
-          mockSuccessfulVideoMeetingCreation({
-            metadataLookupKey: "dailyvideo",
-            videoMeetingData: {
-              id: "MOCK_ID",
-              password: "MOCK_PASS",
-              url: `http://mock-dailyvideo.example.com/meeting-1`,
-            },
-          });
-
-          mockCalendarToHaveNoBusySlots("googlecalendar", {
-            create: {
-              id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
-              iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID",
-            },
-          });
-
-          const recurringCountInRequest = 2;
-          const mockBookingData = getMockRequestDataForBooking({
-            data: {
-              eventTypeId: 1,
-              start: `${plus1DateString}T04:00:00.000Z`,
-              end: `${plus1DateString}T04:30:00.000Z`,
-              recurringEventId: uuidv4(),
-              recurringCount: recurringCountInRequest,
-              responses: {
-                email: booker.email,
-                name: booker.name,
-                location: { optionValue: "", value: "integrations:daily" },
-              },
-            },
-          });
-
-          const numOfSlotsToBeBooked = 4;
-
-          // Create an array of booking data for multiple slots
-          const bookingDataArray = Array(numOfSlotsToBeBooked)
-            .fill(mockBookingData)
-            .map((mockBookingData, index) => {
-              return {
-                ...mockBookingData,
-                start: getPlusDayDate(mockBookingData.start, index).toISOString(),
-                end: getPlusDayDate(mockBookingData.end, index).toISOString(),
-              };
-            });
-
-          await expect(
-            async () =>
-              await handleNewRecurringBooking({
-                bookingData: bookingDataArray,
-                userId: -1,
-              })
-          ).rejects.toThrow(ErrorCode.NoAvailableUsersFound);
-        },
-        timeout
-      );
-    });
-
-    describe("Round robin event type:", () => {
-      test.skip("should fail recurring booking if a fixed host is not available on the second slot", async () => {
-        const booker = getBooker({
-          email: "booker@example.com",
-          name: "Booker",
-        });
-
-        const organizer = getOrganizer({
-          name: "Organizer",
-          email: "organizer@example.com",
-          id: 101,
-          defaultScheduleId: null,
-          teams: [
-            {
-              membership: {
-                accepted: true,
-              },
-              team: {
-                id: 1,
-                name: "Team 1",
-                slug: "team-1",
-              },
-            },
-          ],
-          schedules: [TestData.schedules.IstMorningShift],
-          credentials: [getGoogleCalendarCredential()],
-          selectedCalendars: [TestData.selectedCalendars.google],
-          destinationCalendar: {
-            integration: TestData.apps["google-calendar"].type,
-            externalId: "organizer@google-calendar.com",
-          },
-        });
-
-        const otherTeamMembers = [
-          {
-            name: "Other Team Member 1",
-            username: "other-team-member-1",
-            timeZone: Timezones["+5:30"],
-            defaultScheduleId: null,
-            email: "other-team-member-1@example.com",
-            id: 102,
-            schedules: [TestData.schedules.IstMorningShift],
-            credentials: [getGoogleCalendarCredential()],
-            selectedCalendars: [TestData.selectedCalendars.google],
-            destinationCalendar: {
-              integration: TestData.apps["google-calendar"].type,
-              externalId: "other-team-member-1@google-calendar.com",
-            },
-          },
-        ];
-
-        const recurrence = getRecurrence({
-          type: "weekly",
-          numberOfOccurrences: 3,
-        });
-
-        const plus1DateString = getDate({ dateIncrement: 1 }).dateString;
-        const plus2DateString = getDate({ dateIncrement: 2 }).dateString;
-
-        await createBookingScenario(
-          getScenarioData({
-            webhooks: [
-              {
-                userId: organizer.id,
-                eventTriggers: ["BOOKING_CREATED"],
-                subscriberUrl: "http://my-webhook.example.com",
-                active: true,
-                eventTypeId: 1,
-                appId: null,
-              },
-            ],
-            eventTypes: [
-              {
-                id: 1,
-                slotInterval: 30,
-                schedulingType: SchedulingType.ROUND_ROBIN,
-                length: 30,
-                recurringEvent: recurrence,
-                hosts: [
-                  {
-                    userId: 101,
-                    isFixed: false,
-                  },
-                  {
-                    userId: 102,
-                    isFixed: true,
-                  },
-                ],
-                destinationCalendar: {
-                  integration: "google_calendar",
-                  externalId: "event-type-1@google-calendar.com",
-                },
-              },
-            ],
-            bookings: [
-              {
-                userId: 102,
-                attendees: [
-                  {
-                    email: "IntegrationTestUser102@example.com",
-                  },
-                ],
-                eventTypeId: 1,
-                status: "ACCEPTED",
-                startTime: `${plus2DateString}T04:00:00.000Z`,
-                endTime: `${plus2DateString}T04:30:00.000Z`,
-              },
-            ],
-            organizer,
-            usersApartFromOrganizer: otherTeamMembers,
-            apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
-          })
-        );
-
-        mockSuccessfulVideoMeetingCreation({
-          metadataLookupKey: "dailyvideo",
-          videoMeetingData: {
-            id: "MOCK_ID",
-            password: "MOCK_PASS",
-            url: `http://mock-dailyvideo.example.com/meeting-1`,
-          },
-        });
-
-        mockCalendarToHaveNoBusySlots("googlecalendar", {
-          create: {
-            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
-            iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID",
-          },
-        });
-
-        const recurringCountInRequest = 4;
-        const mockBookingData = getMockRequestDataForBooking({
-          data: {
-            eventTypeId: 1,
-            start: `${plus1DateString}T04:00:00.000Z`,
-            end: `${plus1DateString}T04:30:00.000Z`,
-            recurringEventId: uuidv4(),
-            recurringCount: recurringCountInRequest,
-            responses: {
-              email: booker.email,
-              name: booker.name,
-              location: { optionValue: "", value: "integrations:daily" },
-            },
-          },
-        });
-
-        const numOfSlotsToBeBooked = 4;
-
-        // Create an array of booking data for multiple slots
-        const bookingDataArray = Array(numOfSlotsToBeBooked)
-          .fill(mockBookingData)
-          .map((mockBookingData, index) => {
-            return {
-              ...mockBookingData,
-              schedulingType: SchedulingType.ROUND_ROBIN,
-              start: getPlusDayDate(mockBookingData.start, index).toISOString(),
-              end: getPlusDayDate(mockBookingData.end, index).toISOString(),
-            };
-          });
-
-        await expect(() =>
-          handleNewRecurringBooking({
-            bookingData: bookingDataArray,
-            userId: -1,
-          })
-        ).rejects.toThrow(ErrorCode.NoAvailableUsersFound);
-      });
     });
   });
 
diff --git a/packages/features/bookings/lib/handleNewBooking/test/spam-booking.integration-test.ts b/packages/features/bookings/lib/handleNewBooking/test/spam-booking.integration-test.ts
new file mode 100644
index 00000000000000..aa2e8ea5f4f1fd
--- /dev/null
+++ b/packages/features/bookings/lib/handleNewBooking/test/spam-booking.integration-test.ts
@@ -0,0 +1,873 @@
+import {
+  createBookingScenario,
+  TestData,
+  getGoogleCalendarCredential,
+  getOrganizer,
+  getBooker,
+  getScenarioData,
+  mockCalendarToHaveNoBusySlots,
+  mockCalendarToCrashOnGetAvailability,
+  BookingLocations,
+  createOrganization,
+} from "@calcom/web/test/utils/bookingScenario/bookingScenario";
+import { getMockRequestDataForBooking } from "@calcom/web/test/utils/bookingScenario/getMockRequestDataForBooking";
+import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown";
+
+import { describe, expect, vi } from "vitest";
+
+import { prisma } from "@calcom/prisma";
+import { WatchlistType, BookingStatus } from "@calcom/prisma/enums";
+import { test } from "@calcom/web/test/fixtures/fixtures";
+
+import { getNewBookingHandler } from "./getNewBookingHandler";
+
+const timeout = process.env.CI ? 5000 : 20000;
+
+const createTestWatchlistEntry = async (overrides: {
+  type: WatchlistType;
+  value: string;
+  organizationId: number | null;
+  action: "BLOCK" | "REPORT";
+}) => {
+  return prisma.watchlist.create({
+    data: {
+      type: overrides.type,
+      value: overrides.value,
+      action: overrides.action,
+      createdById: 0,
+      organizationId: overrides.organizationId,
+      isGlobal: overrides.organizationId !== null ? false : true,
+    },
+  });
+};
+
+const createGlobalWatchlistEntry = async (overrides: {
+  type: WatchlistType;
+  value: string;
+  action: "BLOCK" | "REPORT";
+}) => {
+  return createTestWatchlistEntry({
+    type: overrides.type,
+    value: overrides.value,
+    action: overrides.action,
+    organizationId: null,
+  });
+};
+
+const createOrganizationWatchlistEntry = async (
+  organizationId: number,
+  overrides: {
+    type: WatchlistType;
+    value: string;
+    action: "BLOCK" | "REPORT";
+  }
+) => {
+  return createTestWatchlistEntry({
+    type: overrides.type,
+    value: overrides.value,
+    action: overrides.action,
+    organizationId,
+  });
+};
+
+const expectDecoyBookingResponse = (booking: Record<string, unknown>) => {
+  expect(booking).toHaveProperty("isShortCircuitedBooking", true);
+  expect(booking).toHaveProperty("uid");
+  expect(booking.uid).toBeTruthy();
+  expect(booking).toHaveProperty("status", BookingStatus.ACCEPTED);
+  expect(booking).toHaveProperty("id", 0);
+};
+
+const expectNoBookingInDatabase = async (bookerEmail: string) => {
+  const bookings = await prisma.booking.findMany({
+    where: {
+      attendees: {
+        some: {
+          email: bookerEmail,
+        },
+      },
+    },
+  });
+  expect(bookings).toHaveLength(0);
+};
+
+describe("handleNewBooking - Spam Detection", () => {
+  setupAndTeardown();
+
+  describe("Global Watchlist Blocking:", () => {
+    test(
+      "should block booking when email is in global watchlist and return decoy response",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "spammer@example.com";
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Blocked Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+        });
+
+        await createGlobalWatchlistEntry({
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        console.log("watchlists", await prisma.watchlist.findMany());
+
+        await createBookingScenario(
+          getScenarioData({
+            eventTypes: [
+              {
+                id: 1,
+                slotInterval: 30,
+                length: 30,
+                users: [
+                  {
+                    id: 101,
+                  },
+                ],
+              },
+            ],
+            organizer,
+            apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+          })
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should fail with there are no available users instead of returning decoy response because spam check happens in parallel with availability check",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "spammer@example.com";
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Blocked Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+        });
+
+        await createGlobalWatchlistEntry({
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        await createBookingScenario(
+          getScenarioData({
+            eventTypes: [
+              {
+                id: 1,
+                slotInterval: 30,
+                length: 30,
+                users: [
+                  {
+                    id: 101,
+                  },
+                ],
+              },
+            ],
+            organizer,
+            apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+          })
+        );
+
+        await mockCalendarToCrashOnGetAvailability("googlecalendar");
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        await expect(async () => {
+          await handleNewBooking({
+            bookingData: mockBookingData,
+          });
+        }).rejects.toThrow("no_available_users_found_error");
+      },
+      timeout
+    );
+
+    test(
+      "should block booking when domain is in global watchlist and return decoy response",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedDomain = "globalspammydomain.com";
+        const blockedEmail = `user@${blockedDomain}`;
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Global Domain Blocked Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+        });
+
+        await createGlobalWatchlistEntry({
+          type: WatchlistType.DOMAIN,
+          value: blockedDomain,
+          action: "BLOCK",
+        });
+
+        await createBookingScenario(
+          getScenarioData({
+            eventTypes: [
+              {
+                id: 1,
+                slotInterval: 30,
+                length: 30,
+                users: [
+                  {
+                    id: 101,
+                  },
+                ],
+              },
+            ],
+            organizer,
+            apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+          })
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should allow booking when spamCheckService.startCheck throws error (fail-open behavior)",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const bookerEmail = "failopen@example.com";
+
+        const booker = getBooker({
+          email: bookerEmail,
+          name: "Fail Open Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+        });
+
+        await createBookingScenario(
+          getScenarioData({
+            eventTypes: [
+              {
+                id: 1,
+                slotInterval: 30,
+                length: 30,
+                users: [
+                  {
+                    id: 101,
+                  },
+                ],
+              },
+            ],
+            organizer,
+            apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+          })
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        // Mock the SpamCheckService to throw an error during isBlocked check
+        const { getSpamCheckService } = await import(
+          "@calcom/features/di/watchlist/containers/SpamCheckService.container"
+        );
+        const spamCheckService = getSpamCheckService();
+        const originalIsBlocked = spamCheckService["isBlocked"].bind(spamCheckService);
+
+        // Use vi.spyOn to mock the private method
+        const isBlockedSpy = vi.spyOn(spamCheckService as never, "isBlocked");
+        isBlockedSpy.mockRejectedValue(new Error("Database connection failed"));
+
+        try {
+          const createdBooking = await handleNewBooking({
+            bookingData: mockBookingData,
+          });
+
+          // Should NOT be a decoy response - booking should succeed due to fail-open behavior
+          expect(createdBooking).not.toHaveProperty("isShortCircuitedBooking");
+          expect(createdBooking.status).toBe(BookingStatus.ACCEPTED);
+          expect(createdBooking.id).not.toBe(0);
+          expect(createdBooking.attendees[0].email).toBe(bookerEmail);
+        } finally {
+          // Restore original implementation and clean up spy
+          isBlockedSpy.mockRestore();
+          spamCheckService["isBlocked"] = originalIsBlocked;
+        }
+      },
+      timeout
+    );
+  });
+
+  describe("Organization Watchlist Blocking:", () => {
+    test(
+      "should block booking when email is in organization watchlist and return decoy response",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "org-spammer@example.com";
+
+        // Create organization with a team
+        const org = await createOrganization({
+          name: "Test Org",
+          slug: "test-org",
+          withTeam: true,
+        });
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Org Blocked Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+          organizationId: org.id,
+        });
+
+        await createOrganizationWatchlistEntry(org.id, {
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        // Use the child team ID for the eventType
+        const teamId = org.children && org.children.length > 0 ? org.children[0].id : null;
+
+        await createBookingScenario(
+          getScenarioData(
+            {
+              eventTypes: [
+                {
+                  id: 1,
+                  slotInterval: 30,
+                  length: 30,
+                  teamId,
+                  users: [
+                    {
+                      id: 101,
+                    },
+                  ],
+                },
+              ],
+              organizer,
+              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+            },
+            { id: org.id }
+          )
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should block booking when domain is in organization watchlist and return decoy response",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedDomain = "spammydomain.com";
+        const blockedEmail = `user@${blockedDomain}`;
+
+        // Create organization with a team
+        const org = await createOrganization({
+          name: "Test Org",
+          slug: "test-org",
+          withTeam: true,
+        });
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Domain Blocked Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+          organizationId: org.id,
+        });
+
+        await createOrganizationWatchlistEntry(org.id, {
+          type: WatchlistType.DOMAIN,
+          value: blockedDomain,
+          action: "BLOCK",
+        });
+
+        // Use the child team ID for the eventType
+        const teamId = org.children && org.children.length > 0 ? org.children[0].id : null;
+
+        await createBookingScenario(
+          getScenarioData(
+            {
+              eventTypes: [
+                {
+                  id: 1,
+                  slotInterval: 30,
+                  length: 30,
+                  teamId,
+                  users: [
+                    {
+                      id: 101,
+                    },
+                  ],
+                },
+              ],
+              organizer,
+              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+            },
+            { id: org.id }
+          )
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should NOT block booking when email is in a different organization's watchlist",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "different-org-user@example.com";
+
+        // Create two different organizations with teams
+        const organizerOrg = await createOrganization({
+          name: "Organizer Org",
+          slug: "organizer-org",
+          withTeam: true,
+        });
+
+        const differentOrg = await createOrganization({
+          name: "Different Org",
+          slug: "different-org",
+          withTeam: true,
+        });
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+          organizationId: organizerOrg.id,
+        });
+
+        // Block email in a DIFFERENT organization
+        await createOrganizationWatchlistEntry(differentOrg.id, {
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        // Use the child team ID for the eventType
+        const teamId =
+          organizerOrg.children && organizerOrg.children.length > 0 ? organizerOrg.children[0].id : null;
+
+        await createBookingScenario(
+          getScenarioData(
+            {
+              eventTypes: [
+                {
+                  id: 1,
+                  slotInterval: 30,
+                  length: 30,
+                  teamId,
+                  users: [
+                    {
+                      id: 101,
+                    },
+                  ],
+                },
+              ],
+              organizer,
+              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+            },
+            { id: organizerOrg.id }
+          )
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        // Should NOT be a decoy response - booking should succeed
+        expect(createdBooking).not.toHaveProperty("isShortCircuitedBooking");
+        expect(createdBooking.status).toBe(BookingStatus.ACCEPTED);
+        expect(createdBooking.id).not.toBe(0);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should block booking for managed event when email is in organization watchlist",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "managed-event-spammer@example.com";
+
+        // Create organization with a team
+        const org = await createOrganization({
+          name: "Managed Event Org",
+          slug: "managed-event-org",
+          withTeam: true,
+        });
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "Managed Event Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+          organizationId: org.id,
+        });
+
+        await createOrganizationWatchlistEntry(org.id, {
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        // Get the child team ID
+        const teamId = org.children && org.children.length > 0 ? org.children[0].id : null;
+
+        // Create a parent event type and a managed (child) event type
+        await createBookingScenario(
+          getScenarioData(
+            {
+              eventTypes: [
+                // Parent event type
+                {
+                  id: 1,
+                  slotInterval: 30,
+                  length: 30,
+                  teamId,
+                  users: [
+                    {
+                      id: 101,
+                    },
+                  ],
+                },
+                // Managed event type (child) - has parent but no teamId
+                {
+                  id: 2,
+                  slotInterval: 30,
+                  length: 30,
+                  parent: { id: 1 }, // References parent event type
+                  users: [
+                    {
+                      id: 101,
+                    },
+                  ],
+                },
+              ],
+              organizer,
+              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+            },
+            { id: org.id }
+          )
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        // Try to book the managed event (id: 2)
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 2, // Booking the managed event
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        // Should return a decoy response since email is blocked in the organization
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+
+    test(
+      "should block booking for user event in organization when email is in organization watchlist",
+      async () => {
+        const handleNewBooking = getNewBookingHandler();
+        const blockedEmail = "user-event-spammer@example.com";
+
+        // Create organization
+        const org = await createOrganization({
+          name: "User Event Org",
+          slug: "user-event-org",
+          withTeam: false,
+        });
+
+        const booker = getBooker({
+          email: blockedEmail,
+          name: "User Event Booker",
+        });
+
+        const organizer = getOrganizer({
+          name: "Organizer",
+          email: "organizer@example.com",
+          id: 101,
+          schedules: [TestData.schedules.IstWorkHours],
+          credentials: [getGoogleCalendarCredential()],
+          selectedCalendars: [TestData.selectedCalendars.google],
+          organizationId: org.id,
+        });
+
+        await createOrganizationWatchlistEntry(org.id, {
+          type: WatchlistType.EMAIL,
+          value: blockedEmail,
+          action: "BLOCK",
+        });
+
+        // Create a user event (no teamId) but with a profile linking to the organization
+        await createBookingScenario(
+          getScenarioData(
+            {
+              eventTypes: [
+                {
+                  id: 1,
+                  slotInterval: 30,
+                  length: 30,
+                  // User Event Type has userId set
+                  userId: 101,
+                },
+              ],
+              organizer,
+              apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],
+            },
+            { id: org.id }
+          )
+        );
+
+        await mockCalendarToHaveNoBusySlots("googlecalendar", {
+          create: {
+            id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID",
+          },
+        });
+
+        const mockBookingData = getMockRequestDataForBooking({
+          data: {
+            user: organizer.username,
+            eventTypeId: 1,
+            responses: {
+              email: booker.email,
+              name: booker.name,
+              location: { optionValue: "", value: BookingLocations.CalVideo },
+            },
+          },
+        });
+
+        const createdBooking = await handleNewBooking({
+          bookingData: mockBookingData,
+        });
+
+        // Should return a decoy response since email is blocked in the organization
+        expectDecoyBookingResponse(createdBooking);
+        expect(createdBooking.attendees[0].email).toBe(blockedEmail);
+        await expectNoBookingInDatabase(blockedEmail);
+      },
+      timeout
+    );
+  });
+});
diff --git a/packages/features/bookings/lib/handleNewRecurringBooking.ts b/packages/features/bookings/lib/handleNewRecurringBooking.ts
index f188c0fe2013a8..47a8f143508437 100644
--- a/packages/features/bookings/lib/handleNewRecurringBooking.ts
+++ b/packages/features/bookings/lib/handleNewRecurringBooking.ts
@@ -1,5 +1,4 @@
 import type { CreateBookingMeta, CreateRecurringBookingData } from "@calcom/features/bookings/lib/dto/types";
-import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import type { BookingResponse } from "@calcom/features/bookings/types";
 import { SchedulingType } from "@calcom/prisma/enums";
 import type { AppsStatus } from "@calcom/types/Calendar";
@@ -11,10 +10,14 @@ export type BookingHandlerInput = {
   bookingData: CreateRecurringBookingData;
 } & CreateBookingMeta;
 
-export const handleNewRecurringBooking = async (input: BookingHandlerInput): Promise<BookingResponse[]> => {
+export const handleNewRecurringBooking = async (
+  input: BookingHandlerInput,
+  deps: IRecurringBookingServiceDependencies
+): Promise<BookingResponse[]> => {
   const data = input.bookingData;
+  const { regularBookingService } = deps;
   const createdBookings: BookingResponse[] = [];
-  const allRecurringDates: { start: string | undefined; end: string | undefined }[] = data.map((booking) => {
+  const allRecurringDates: { start: string; end: string | undefined }[] = data.map((booking) => {
     return { start: booking.start, end: booking.end };
   });
   const appsStatus: AppsStatus[] | undefined = undefined;
@@ -51,11 +54,13 @@ export const handleNewRecurringBooking = async (input: BookingHandlerInput): Pro
       noEmail: input.noEmail !== undefined ? input.noEmail : false,
     };
 
-    const firstBookingResult = await handleNewBooking({
+    const firstBookingResult = await regularBookingService.createBooking({
       bookingData: recurringEventData,
-      hostname: input.hostname || "",
-      forcedSlug: input.forcedSlug as string | undefined,
-      ...handleBookingMeta,
+      bookingMeta: {
+        hostname: input.hostname || "",
+        forcedSlug: input.forcedSlug as string | undefined,
+        ...handleBookingMeta,
+      },
     });
     luckyUsers = firstBookingResult.luckyUsers;
   }
@@ -92,11 +97,13 @@ export const handleNewRecurringBooking = async (input: BookingHandlerInput): Pro
       luckyUsers,
     };
 
-    const promiseEachRecurringBooking: ReturnType<typeof handleNewBooking> = handleNewBooking({
-      hostname: input.hostname || "",
-      forcedSlug: input.forcedSlug as string | undefined,
+    const promiseEachRecurringBooking = regularBookingService.createBooking({
       bookingData: recurringEventData,
-      ...handleBookingMeta,
+      bookingMeta: {
+        hostname: input.hostname || "",
+        forcedSlug: input.forcedSlug as string | undefined,
+        ...handleBookingMeta,
+      },
     });
 
     const eachRecurringBooking = await promiseEachRecurringBooking;
@@ -132,8 +139,7 @@ export class RecurringBookingService implements IBookingService {
     bookingMeta?: CreateBookingMeta;
   }): Promise<BookingResponse[]> {
     const handlerInput = { bookingData: input.bookingData, ...(input.bookingMeta || {}) };
-    // FOLLOW-UP: Pass on dependencies to the handler
-    return handleNewRecurringBooking(handlerInput);
+    return handleNewRecurringBooking(handlerInput, this.deps);
   }
 
   async rescheduleBooking(input: {
@@ -141,7 +147,6 @@ export class RecurringBookingService implements IBookingService {
     bookingMeta?: CreateBookingMeta;
   }): Promise<BookingResponse[]> {
     const handlerInput = { bookingData: input.bookingData, ...(input.bookingMeta || {}) };
-    // FOLLOW-UP: Pass on dependencies to the handler
-    return handleNewRecurringBooking(handlerInput);
+    return handleNewRecurringBooking(handlerInput, this.deps);
   }
 }
diff --git a/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts b/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts
index 9517f7f88b95e8..e3e2acc7a9f738 100644
--- a/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts
+++ b/packages/features/bookings/lib/handleSeats/cancel/cancelAttendeeSeat.ts
@@ -1,16 +1,16 @@
 import { getCalendar } from "@calcom/app-store/_utils/getCalendar";
+import { getAllDelegationCredentialsForUserIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
+import { getDelegationCredentialOrFindRegularCredential } from "@calcom/app-store/delegationCredential";
 import { sendCancelledSeatEmailsAndSMS } from "@calcom/emails";
+import { updateMeeting } from "@calcom/features/conferencing/lib/videoClient";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload";
 import { getRichDescription } from "@calcom/lib/CalEventParser";
-import { getAllDelegationCredentialsForUserIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
-import { getDelegationCredentialOrFindRegularCredential } from "@calcom/app-store/delegationCredential";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
-import { updateMeeting } from "@calcom/app-store/videoClient";
 import prisma from "@calcom/prisma";
 import { WebhookTriggerEvents } from "@calcom/prisma/enums";
 import { bookingCancelAttendeeSeatSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/bookings/lib/handleSeats/handleSeats.ts b/packages/features/bookings/lib/handleSeats/handleSeats.ts
index be2c592392d58e..3473da579c5878 100644
--- a/packages/features/bookings/lib/handleSeats/handleSeats.ts
+++ b/packages/features/bookings/lib/handleSeats/handleSeats.ts
@@ -4,7 +4,7 @@ import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhoo
 import type { EventPayloadType } from "@calcom/features/webhooks/lib/sendPayload";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
 
diff --git a/packages/features/bookings/lib/handleSeats/lib/lastAttendeeDeleteBooking.ts b/packages/features/bookings/lib/handleSeats/lib/lastAttendeeDeleteBooking.ts
index c162be8d169d75..1d50c02c8da7f0 100644
--- a/packages/features/bookings/lib/handleSeats/lib/lastAttendeeDeleteBooking.ts
+++ b/packages/features/bookings/lib/handleSeats/lib/lastAttendeeDeleteBooking.ts
@@ -2,7 +2,7 @@
 import { getCalendar } from "@calcom/app-store/_utils/getCalendar";
 import { getAllDelegationCredentialsForUserIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
 import { getDelegationCredentialOrFindRegularCredential } from "@calcom/app-store/delegationCredential";
-import { deleteMeeting } from "@calcom/app-store/videoClient";
+import { deleteMeeting } from "@calcom/features/conferencing/lib/videoClient";
 import prisma from "@calcom/prisma";
 import type { Attendee } from "@calcom/prisma/client";
 import { BookingStatus } from "@calcom/prisma/enums";
diff --git a/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.test.ts b/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.test.ts
index db914bea6761d9..cf4a00d3e592f4 100644
--- a/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.test.ts
+++ b/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.test.ts
@@ -1,7 +1,7 @@
 import type { Mock } from "vitest";
 import { describe, expect, it, vi, afterEach } from "vitest";
 
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 
 import { FilterHostsService } from "./filterHostsBySameRoundRobinHost";
 
diff --git a/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.ts b/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.ts
index b34f7c46a19a1e..587c37836d9193 100644
--- a/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.ts
+++ b/packages/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost.ts
@@ -1,5 +1,5 @@
 import { isRerouting } from "@calcom/lib/bookings/routing/utils";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 
 export interface IFilterHostsService {
   bookingRepo: BookingRepository;
diff --git a/packages/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials.ts b/packages/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials.ts
index 611a3c48aff0a9..27483c327cd228 100644
--- a/packages/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials.ts
+++ b/packages/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials.ts
@@ -5,7 +5,7 @@ import {
 import type { EventType } from "@calcom/features/users/lib/getRoutedUsers";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import type { RoutingFormResponse } from "@calcom/features/bookings/lib/getLuckyUser";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 import type { SchedulingType } from "@calcom/prisma/enums";
 import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential";
diff --git a/packages/features/bookings/lib/index.ts b/packages/features/bookings/lib/index.ts
index c0602ec11d5b47..a6c78e87f1fe16 100644
--- a/packages/features/bookings/lib/index.ts
+++ b/packages/features/bookings/lib/index.ts
@@ -6,3 +6,4 @@ export {
 export { createBooking } from "./create-booking";
 export { createRecurringBooking } from "./create-recurring-booking";
 export { createInstantBooking } from "./create-instant-booking";
+export type { BookingResponse } from "../types";
diff --git a/packages/features/bookings/lib/interfaces/IBookingCancelService.ts b/packages/features/bookings/lib/interfaces/IBookingCancelService.ts
new file mode 100644
index 00000000000000..adc99efd9d3d34
--- /dev/null
+++ b/packages/features/bookings/lib/interfaces/IBookingCancelService.ts
@@ -0,0 +1,12 @@
+import type {
+  CancelRegularBookingData,
+  CancelBookingMeta,
+  HandleCancelBookingResponse,
+} from "../dto/BookingCancel";
+
+export interface IBookingCancelService {
+  cancelBooking(input: {
+    bookingData: CancelRegularBookingData;
+    bookingMeta?: CancelBookingMeta;
+  }): Promise<HandleCancelBookingResponse>;
+}
diff --git a/packages/features/bookings/lib/payment/getBooking.ts b/packages/features/bookings/lib/payment/getBooking.ts
index 2d33d57d3b4a9c..004f57d484ee6c 100644
--- a/packages/features/bookings/lib/payment/getBooking.ts
+++ b/packages/features/bookings/lib/payment/getBooking.ts
@@ -1,7 +1,7 @@
 import { workflowSelect } from "@calcom/ee/workflows/lib/getAllWorkflows";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { enrichUserWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { HttpError as HttpCode } from "@calcom/lib/http-error";
 import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
diff --git a/packages/features/bookings/lib/payment/handleNoShowFee.test.ts b/packages/features/bookings/lib/payment/handleNoShowFee.test.ts
index 735126e8f4d837..e2a9537a3c7440 100644
--- a/packages/features/bookings/lib/payment/handleNoShowFee.test.ts
+++ b/packages/features/bookings/lib/payment/handleNoShowFee.test.ts
@@ -1,14 +1,14 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
-// eslint-disable-next-line no-restricted-imports
+ 
 import { PaymentServiceMap } from "@calcom/app-store/payment.services.generated";
 import { sendNoShowFeeChargedEmail } from "@calcom/emails";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { ErrorWithCode } from "@calcom/lib/errors";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 
 import { handleNoShowFee } from "./handleNoShowFee";
 
@@ -30,20 +30,20 @@ vi.mock("@calcom/lib/server/i18n", () => ({
   getTranslation: vi.fn().mockResolvedValue((key: string) => key),
 }));
 
-vi.mock("@calcom/lib/server/repository/credential", () => ({
+vi.mock("@calcom/features/credentials/repositories/CredentialRepository", () => ({
   CredentialRepository: {
     findPaymentCredentialByAppIdAndUserIdOrTeamId: vi.fn(),
     findPaymentCredentialByAppIdAndTeamId: vi.fn(),
   },
 }));
 
-vi.mock("@calcom/lib/server/repository/membership", () => ({
+vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
   MembershipRepository: {
     findUniqueByUserIdAndTeamId: vi.fn(),
   },
 }));
 
-vi.mock("@calcom/lib/server/repository/team", () => ({
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository", () => ({
   TeamRepository: vi.fn().mockImplementation(() => ({
     findParentOrganizationByTeamId: vi.fn(),
   })),
diff --git a/packages/features/bookings/lib/payment/handleNoShowFee.ts b/packages/features/bookings/lib/payment/handleNoShowFee.ts
index b5f102366f350e..3725ba224b380d 100644
--- a/packages/features/bookings/lib/payment/handleNoShowFee.ts
+++ b/packages/features/bookings/lib/payment/handleNoShowFee.ts
@@ -7,9 +7,9 @@ import { ErrorCode } from "@calcom/lib/errorCodes";
 import { ErrorWithCode } from "@calcom/lib/errors";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { CalendarEvent } from "@calcom/types/Calendar";
diff --git a/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.test.ts b/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.test.ts
index 4971fd41a37190..d18078b1115400 100644
--- a/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.test.ts
+++ b/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.test.ts
@@ -1,13 +1,13 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import type { Payment } from "@calcom/prisma/client";
 
 import { handleNoShowFee } from "./handleNoShowFee";
 import { processNoShowFeeOnCancellation } from "./processNoShowFeeOnCancellation";
 import { shouldChargeNoShowCancellationFee } from "./shouldChargeNoShowCancellationFee";
 
-vi.mock("@calcom/lib/server/repository/membership", () => ({
+vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
   MembershipRepository: {
     findUniqueByUserIdAndTeamId: vi.fn(),
   },
diff --git a/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.ts b/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.ts
index 4d8a82188f48d1..9015d72af54636 100644
--- a/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.ts
+++ b/packages/features/bookings/lib/payment/processNoShowFeeOnCancellation.ts
@@ -1,6 +1,6 @@
 import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
 import logger from "@calcom/lib/logger";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import type { Payment } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/packages/lib/server/repository/booking.test.ts b/packages/features/bookings/repositories/BookingRepository.test.ts
similarity index 99%
rename from packages/lib/server/repository/booking.test.ts
rename to packages/features/bookings/repositories/BookingRepository.test.ts
index 4ca0f192f21f56..1638f899f9077a 100644
--- a/packages/lib/server/repository/booking.test.ts
+++ b/packages/features/bookings/repositories/BookingRepository.test.ts
@@ -4,7 +4,7 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 
 import { BookingStatus, RRTimestampBasis } from "@calcom/prisma/enums";
 
-import { BookingRepository } from "./booking";
+import { BookingRepository } from "./BookingRepository";
 
 const createAttendeeNoShowTestBookings = async () => {
   await Promise.all([
diff --git a/packages/lib/server/repository/booking.ts b/packages/features/bookings/repositories/BookingRepository.ts
similarity index 90%
rename from packages/lib/server/repository/booking.ts
rename to packages/features/bookings/repositories/BookingRepository.ts
index 67e18e8d367823..aad9ba1595817c 100644
--- a/packages/lib/server/repository/booking.ts
+++ b/packages/features/bookings/repositories/BookingRepository.ts
@@ -1,3 +1,4 @@
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
@@ -6,8 +7,6 @@ import { RRTimestampBasis, BookingStatus } from "@calcom/prisma/enums";
 import { bookingMinimalSelect } from "@calcom/prisma/selects/booking";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
 
-import { UserRepository } from "./user";
-
 export type FormResponse = Record<
   // Field ID
   string,
@@ -132,6 +131,65 @@ export class BookingRepository {
     });
   }
 
+  async getBookingWithEventTypeTeamId({ bookingId }: { bookingId: number }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        id: bookingId,
+      },
+      select: {
+        userId: true,
+        eventType: {
+          select: {
+            teamId: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findByUidIncludeEventType({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        userId: true,
+        user: {
+          select: {
+            id: true,
+            email: true,
+          },
+        },
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        eventType: {
+          select: {
+            teamId: true,
+            hosts: {
+              select: {
+                userId: true,
+                user: {
+                  select: {
+                    email: true,
+                  },
+                },
+              },
+            },
+            users: {
+              select: {
+                id: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
   /** Determines if the user is the organizer, team admin, or org admin that the booking was created under */
   async doesUserIdHaveAccessToBooking({ userId, bookingId }: { userId: number; bookingId: number }) {
     const booking = await this.prismaClient.booking.findUnique({
@@ -188,6 +246,59 @@ export class BookingRepository {
     });
   }
 
+  async findByUidIncludeReport({ bookingUid }: { bookingUid: string }) {
+    return await this.prismaClient.booking.findUnique({
+      where: {
+        uid: bookingUid,
+      },
+      select: {
+        id: true,
+        uid: true,
+        startTime: true,
+        status: true,
+        recurringEventId: true,
+        attendees: {
+          select: {
+            email: true,
+          },
+        },
+        seatsReferences: {
+          select: {
+            referenceUid: true,
+            attendee: {
+              select: {
+                email: true,
+              },
+            },
+          },
+        },
+        report: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+  }
+
+  async getActiveRecurringBookingsFromDate({
+    recurringEventId,
+    fromDate,
+  }: {
+    recurringEventId: string;
+    fromDate: Date;
+  }) {
+    return await this.prismaClient.booking.findMany({
+      where: {
+        recurringEventId,
+        startTime: { gte: fromDate },
+        status: { in: [BookingStatus.ACCEPTED, BookingStatus.PENDING] },
+      },
+      select: { id: true, uid: true },
+      orderBy: { startTime: "asc" },
+    });
+  }
+
   private async _findAllExistingBookingsForEventTypeBetween({
     eventTypeId,
     seatedEvent = false,
@@ -387,6 +498,21 @@ export class BookingRepository {
     });
   }
 
+  async findFirstBookingFromResponse({ responseId }: { responseId: number }) {
+    const booking = await this.prismaClient.booking.findFirst({
+      where: {
+        routedFromRoutingFormReponse: {
+          id: responseId,
+        },
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    return booking;
+  }
+
   async findBookingByUidWithEventType({ bookingUid }: { bookingUid: string }) {
     return await this.prismaClient.booking.findUnique({
       where: {
diff --git a/packages/features/bookings/services/BookingAccessService.ts b/packages/features/bookings/services/BookingAccessService.ts
new file mode 100644
index 00000000000000..779435dfb40419
--- /dev/null
+++ b/packages/features/bookings/services/BookingAccessService.ts
@@ -0,0 +1,98 @@
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import type { PrismaClient } from "@calcom/prisma";
+
+import { BookingRepository } from "../repositories/BookingRepository";
+
+type BookingForAccessCheck = NonNullable<Awaited<ReturnType<BookingRepository["findByUidIncludeEventType"]>>>;
+
+export class BookingAccessService {
+  constructor(private prismaClient: PrismaClient) {}
+
+  private isUserAHost(userId: number, booking: BookingForAccessCheck): boolean {
+    const hostMap = new Map<number, { id: number; email: string }>();
+
+    const addHost = (id: number, email: string) => {
+      if (!hostMap.has(id)) {
+        hostMap.set(id, { id, email });
+      }
+    };
+
+    booking?.eventType?.hosts?.forEach((host: { userId: number; user: { email: string } }) =>
+      addHost(host.userId, host.user.email)
+    );
+    booking?.eventType?.users?.forEach((user: { id: number; email: string }) => addHost(user.id, user.email));
+
+    if (booking?.user?.id && booking?.user?.email) {
+      addHost(booking.user.id, booking.user.email);
+    }
+
+    const attendeeEmails = new Set(booking.attendees?.map((attendee: { email: string }) => attendee.email));
+    const filteredHosts = Array.from(hostMap.values()).filter(
+      (host) => attendeeEmails.has(host.email) || host.id === booking.user?.id
+    );
+
+    return filteredHosts.some((host) => host.id === userId);
+  }
+
+  /**
+   * Determines if a user has access to a booking based on:
+   * 1. Being the booking organizer
+   * 2. Being one of the hosts in a multi-host booking
+   * 3. Being a team/org admin where the event type belongs
+   * 4. Being an org admin where the booking organizer belongs (for personal bookings)
+   * 5. Being a team admin of any team the booking organizer belongs to (for personal bookings)
+   */
+  async doesUserIdHaveAccessToBooking({
+    userId,
+    bookingUid,
+  }: {
+    userId: number;
+    bookingUid: string;
+  }): Promise<boolean> {
+    const bookingRepo = new BookingRepository(this.prismaClient);
+    const userRepo = new UserRepository(this.prismaClient);
+
+    const booking = await bookingRepo.findByUidIncludeEventType({ bookingUid });
+
+    if (!booking) return false;
+
+    if (userId === booking.userId) return true;
+
+    if (this.isUserAHost(userId, booking)) return true;
+
+    // If booking has a teamId, check if user is admin of that team/org
+    if (booking.eventType?.teamId) {
+      const isAdminOrUser = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: booking.eventType.teamId,
+      });
+      return isAdminOrUser;
+    }
+
+    if (!booking.userId) return false;
+
+    const bookingOwner = await userRepo.getUserOrganizationAndTeams({ userId: booking.userId });
+
+    if (!bookingOwner) return false;
+
+    // Check if user is admin of booking organizer's organization
+    if (bookingOwner.organizationId) {
+      const isOrgAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: bookingOwner.organizationId,
+      });
+      if (isOrgAdmin) return true;
+    }
+
+    // Check if user is admin of any team the booking organizer belongs to
+    for (const membership of bookingOwner.teams) {
+      const isTeamAdmin = await userRepo.isAdminOfTeamOrParentOrg({
+        userId,
+        teamId: membership.teamId,
+      });
+      if (isTeamAdmin) return true;
+    }
+
+    return false;
+  }
+}
diff --git a/packages/features/bookings/types.ts b/packages/features/bookings/types.ts
index 1e5f131d707cfc..a3c03769b1e5cb 100644
--- a/packages/features/bookings/types.ts
+++ b/packages/features/bookings/types.ts
@@ -1,6 +1,7 @@
 import type { ErrorOption, FieldPath } from "react-hook-form";
 
-import type { SchedulingType } from "@calcom/prisma/client";
+import type { RegularBookingCreateResult } from "@calcom/features/bookings/lib/dto/types";
+import type { SchedulingType } from "@calcom/prisma/enums";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import type { AppsStatus } from "@calcom/types/Calendar";
 
@@ -93,13 +94,8 @@ export type RecurringBookingCreateBody = BookingCreateBody & {
   schedulingType?: SchedulingType;
 };
 
-export type BookingResponse = Awaited<
-  ReturnType<typeof import("@calcom/features/bookings/lib/handleNewBooking").default>
->;
-
-export type InstantBookingResponse = Awaited<
-  ReturnType<typeof import("@calcom/features/instant-meeting/handleInstantMeeting").default>
->;
+// TODO: Instead of using the two different names, we want to use RegularBookingCreateResult name only but the name BookingResponse is used at ton of places and would be fixed in a separate followup PR.
+export type BookingResponse = RegularBookingCreateResult;
 
 export type MarkNoShowResponse = Awaited<
   ReturnType<typeof import("@calcom/features/handleMarkNoShow").default>
diff --git a/packages/features/bot-detection/BotDetectionService.test.ts b/packages/features/bot-detection/BotDetectionService.test.ts
index fb023562551d83..fc164d8bdb633c 100644
--- a/packages/features/bot-detection/BotDetectionService.test.ts
+++ b/packages/features/bot-detection/BotDetectionService.test.ts
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { HttpError } from "@calcom/lib/http-error";
-import type { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 
 import { BotDetectionService } from "./BotDetectionService";
 
diff --git a/packages/features/bot-detection/BotDetectionService.ts b/packages/features/bot-detection/BotDetectionService.ts
index e80d8d1135ba6e..33e4716859481f 100644
--- a/packages/features/bot-detection/BotDetectionService.ts
+++ b/packages/features/bot-detection/BotDetectionService.ts
@@ -4,7 +4,7 @@ import type { IncomingHttpHeaders } from "http";
 import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
-import type { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 
 interface BotDetectionConfig {
   eventTypeId?: number;
diff --git a/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts b/packages/features/busyTimes/lib/getBusyTimesFromLimits.ts
similarity index 95%
rename from packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts
rename to packages/features/busyTimes/lib/getBusyTimesFromLimits.ts
index 50aee6ee2655a2..d0b16d783e8c3b 100644
--- a/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts
+++ b/packages/features/busyTimes/lib/getBusyTimesFromLimits.ts
@@ -1,20 +1,19 @@
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
 import type { EventType } from "@calcom/features/availability/lib/getUserAvailability";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { getCheckBookingLimitsService } from "@calcom/features/di/containers/BookingLimits";
 import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";
+import { descendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
+import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
+import LimitManager from "@calcom/lib/intervalLimits/limitManager";
+import { isBookingWithinPeriod } from "@calcom/lib/intervalLimits/utils";
 import { getPeriodStartDatesBetween } from "@calcom/lib/intervalLimits/utils/getPeriodStartDatesBetween";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import { performance } from "@calcom/lib/server/perfObserver";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
 import prisma from "@calcom/prisma";
 import type { EventBusyDetails } from "@calcom/types/Calendar";
 
-import { descendingLimitKeys, intervalLimitKeyToUnit } from "../intervalLimit";
-import type { IntervalLimit } from "../intervalLimitSchema";
-import LimitManager from "../limitManager";
-import { isBookingWithinPeriod } from "../utils";
-
 const _getBusyTimesFromLimits = async (
   bookingLimits: IntervalLimit | null,
   durationLimits: IntervalLimit | null,
diff --git a/packages/lib/getBusyTimes.test.ts b/packages/features/busyTimes/services/getBusyTimes.test.ts
similarity index 100%
rename from packages/lib/getBusyTimes.test.ts
rename to packages/features/busyTimes/services/getBusyTimes.test.ts
diff --git a/packages/lib/getBusyTimes.ts b/packages/features/busyTimes/services/getBusyTimes.ts
similarity index 98%
rename from packages/lib/getBusyTimes.ts
rename to packages/features/busyTimes/services/getBusyTimes.ts
index 4932cc36c456b8..27fc99985f2a1c 100644
--- a/packages/lib/getBusyTimes.ts
+++ b/packages/features/busyTimes/services/getBusyTimes.ts
@@ -1,6 +1,7 @@
 import dayjs from "@calcom/dayjs";
 import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";
-import { subtract } from "@calcom/lib/date-ranges";
+import { getDefinedBufferTimes } from "@calcom/features/eventtypes/lib/getDefinedBufferTimes";
+import { subtract } from "@calcom/features/schedules/lib/date-ranges";
 import { stringToDayjs } from "@calcom/lib/dayjs";
 import { intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
 import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
@@ -8,7 +9,7 @@ import logger from "@calcom/lib/logger";
 import { getPiiFreeBooking } from "@calcom/lib/piiFreeData";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import { performance } from "@calcom/lib/server/perfObserver";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import prisma from "@calcom/prisma";
 import type { Booking, EventType } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
@@ -17,8 +18,6 @@ import { BookingStatus } from "@calcom/prisma/enums";
 import type { EventBusyDetails } from "@calcom/types/Calendar";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";
 
-import { getDefinedBufferTimes } from "../features/eventtypes/lib/getDefinedBufferTimes";
-
 export interface IBusyTimesService {
   bookingRepo: BookingRepository;
 }
diff --git a/packages/features/calendar-cache/lib/getShouldServeCache.test.ts b/packages/features/calendar-cache/lib/getShouldServeCache.test.ts
new file mode 100644
index 00000000000000..4d2d844f171610
--- /dev/null
+++ b/packages/features/calendar-cache/lib/getShouldServeCache.test.ts
@@ -0,0 +1,92 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { IFeaturesRepository } from "@calcom/features/flags/features.repository.interface";
+
+import { CacheService } from "./getShouldServeCache";
+
+describe("CacheService.getShouldServeCache", () => {
+  const mockFeaturesRepository: IFeaturesRepository = {
+    checkIfTeamHasFeature: vi.fn(),
+    checkIfFeatureIsEnabledGlobally: vi.fn(),
+    checkIfUserHasFeature: vi.fn(),
+  };
+
+  const cacheService = new CacheService({ featuresRepository: mockFeaturesRepository });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("when shouldServeCache is explicitly set to boolean", () => {
+    it("should return true when shouldServeCache is true", async () => {
+      const result = await cacheService.getShouldServeCache(true, 123);
+      expect(result).toBe(true);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+
+    it("should return false when shouldServeCache is false", async () => {
+      const result = await cacheService.getShouldServeCache(false, 123);
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("when shouldServeCache is undefined", () => {
+    it("should return false when no teamId is provided", async () => {
+      const result = await cacheService.getShouldServeCache(undefined, undefined);
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+
+    it("should return false when teamId is null", async () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result = await cacheService.getShouldServeCache(undefined, null as any);
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+
+    it("should return false when teamId is 0", async () => {
+      const result = await cacheService.getShouldServeCache(undefined, 0);
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+
+    it("should check feature repository when teamId is provided and return true if feature is enabled", async () => {
+      vi.mocked(mockFeaturesRepository.checkIfTeamHasFeature).mockResolvedValue(true);
+
+      const result = await cacheService.getShouldServeCache(undefined, 123);
+
+      expect(result).toBe(true);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).toHaveBeenCalledWith(123, "calendar-cache-serve");
+    });
+
+    it("should check feature repository when teamId is provided and return false if feature is disabled", async () => {
+      vi.mocked(mockFeaturesRepository.checkIfTeamHasFeature).mockResolvedValue(false);
+
+      const result = await cacheService.getShouldServeCache(undefined, 456);
+
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).toHaveBeenCalledWith(456, "calendar-cache-serve");
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should prioritize explicit shouldServeCache over teamId check", async () => {
+      vi.mocked(mockFeaturesRepository.checkIfTeamHasFeature).mockResolvedValue(true);
+
+      const result = await cacheService.getShouldServeCache(false, 123);
+
+      expect(result).toBe(false);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).not.toHaveBeenCalled();
+    });
+
+    it("should handle positive teamId correctly", async () => {
+      vi.mocked(mockFeaturesRepository.checkIfTeamHasFeature).mockResolvedValue(true);
+
+      const result = await cacheService.getShouldServeCache(undefined, 999);
+
+      expect(result).toBe(true);
+      expect(mockFeaturesRepository.checkIfTeamHasFeature).toHaveBeenCalledWith(999, "calendar-cache-serve");
+    });
+  });
+});
diff --git a/packages/features/calendar-cache/lib/getShouldServeCache.ts b/packages/features/calendar-cache/lib/getShouldServeCache.ts
index d445d5e0397108..73d4e86687bef7 100644
--- a/packages/features/calendar-cache/lib/getShouldServeCache.ts
+++ b/packages/features/calendar-cache/lib/getShouldServeCache.ts
@@ -9,7 +9,7 @@ export class CacheService {
 
   async getShouldServeCache(shouldServeCache?: boolean | undefined, teamId?: number) {
     if (typeof shouldServeCache === "boolean") return shouldServeCache;
-    if (!teamId) return undefined;
+    if (!teamId) return false;
     return await this.dependencies.featuresRepository.checkIfTeamHasFeature(teamId, "calendar-cache-serve");
   }
 }
diff --git a/packages/features/calendar-subscription/adapters/GoogleCalendarSubscription.adapter.ts b/packages/features/calendar-subscription/adapters/GoogleCalendarSubscription.adapter.ts
index 0ea84b636990ec..01f1d00291809b 100644
--- a/packages/features/calendar-subscription/adapters/GoogleCalendarSubscription.adapter.ts
+++ b/packages/features/calendar-subscription/adapters/GoogleCalendarSubscription.adapter.ts
@@ -3,6 +3,7 @@ import { v4 as uuid } from "uuid";
 
 import { CalendarAuth } from "@calcom/app-store/googlecalendar/lib/CalendarAuth";
 import dayjs from "@calcom/dayjs";
+import { CalendarCacheEventService } from "@calcom/features/calendar-subscription/lib/cache/CalendarCacheEventService";
 import logger from "@calcom/lib/logger";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 
@@ -117,12 +118,12 @@ export class GoogleCalendarSubscriptionAdapter implements ICalendarSubscriptionP
     };
 
     if (!syncToken) {
-      const now = dayjs();
+      const now = dayjs().startOf("day");
       // first sync or unsync (3 months)
-      const threeMonths = now.add(3, "month");
+      const monthsAhead = now.add(CalendarCacheEventService.MONTHS_AHEAD, "month").endOf("day");
 
       const timeMinISO = now.toISOString();
-      const timeMaxISO = threeMonths.toISOString();
+      const timeMaxISO = monthsAhead.toISOString();
       params.timeMin = timeMinISO;
       params.timeMax = timeMaxISO;
     } else {
@@ -151,8 +152,21 @@ export class GoogleCalendarSubscriptionAdapter implements ICalendarSubscriptionP
   }
 
   private parseEvents(events: calendar_v3.Schema$Event[]): CalendarSubscriptionEventItem[] {
+    const now = dayjs().startOf("day");
+    const monthsAhead = now.add(CalendarCacheEventService.MONTHS_AHEAD, "month").endOf("day");
+
+    function filterEventsWithoutId(event: calendar_v3.Schema$Event) {
+      return typeof event.id === "string" && !!event.id;
+    }
+
+    function filterEventsByDateRange(event: calendar_v3.Schema$Event) {
+      const start = dayjs(event.start?.dateTime || event.start?.date);
+      return !start.isBefore(now) && !start.isAfter(monthsAhead);
+    }
+
     return events
-      .filter((event) => typeof event.id === "string" && !!event.id)
+      .filter(filterEventsWithoutId)
+      .filter(filterEventsByDateRange)
       .map((event) => {
         // empty or opaque is busy
         const busy = !event.transparency || event.transparency === "opaque";
diff --git a/packages/features/calendar-subscription/adapters/__tests__/GoogleCalendarSubscriptionAdapter.test.ts b/packages/features/calendar-subscription/adapters/__tests__/GoogleCalendarSubscriptionAdapter.test.ts
index 9ff5fb664d496c..15e2f1434bcdab 100644
--- a/packages/features/calendar-subscription/adapters/__tests__/GoogleCalendarSubscriptionAdapter.test.ts
+++ b/packages/features/calendar-subscription/adapters/__tests__/GoogleCalendarSubscriptionAdapter.test.ts
@@ -2,11 +2,25 @@ import "../__mocks__/CalendarAuth";
 
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
+import dayjs from "@calcom/dayjs";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
 
 import { GoogleCalendarSubscriptionAdapter } from "../GoogleCalendarSubscription.adapter";
 
+const addMonthsFromNow = (months: number) => {
+  const date = dayjs();
+  return date.add(months, "months").startOf("day");
+};
+
+const today = dayjs().startOf("day");
+
+const oneWeekFromNow = today.add(7, "days");
+
+const eventEndTime = oneWeekFromNow.add(1, "hours");
+
+const channelExpirationDate = new Date(Date.now() + 86400000);
+
 vi.mock("uuid", () => ({
   v4: vi.fn().mockReturnValue("test-uuid"),
 }));
@@ -30,16 +44,16 @@ const mockSelectedCalendar: SelectedCalendar = {
   watchAttempts: 0,
   maxAttempts: 3,
   unwatchAttempts: 0,
-  createdAt: new Date(),
-  updatedAt: new Date(),
+  createdAt: today.toDate(),
+  updatedAt: today.toDate(),
   channelId: "test-channel-id",
   channelKind: "web_hook",
   channelResourceId: "test-resource-id",
   channelResourceUri: "test-resource-uri",
-  channelExpiration: new Date(Date.now() + 86400000),
-  syncSubscribedAt: new Date(),
+  channelExpiration: channelExpirationDate,
+  syncSubscribedAt: today.toDate(),
   syncToken: "test-sync-token",
-  syncedAt: new Date(),
+  syncedAt: today.toDate(),
   syncErrorAt: null,
   syncErrorCount: 0,
 };
@@ -176,7 +190,7 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
           id: "test-channel-id",
           resourceId: "test-resource-id",
           resourceUri: "test-resource-uri",
-          expiration: "1640995200000",
+          expiration: String(channelExpirationDate.getTime()),
         },
       };
 
@@ -202,17 +216,18 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
         id: "test-channel-id",
         resourceId: "test-resource-id",
         resourceUri: "test-resource-uri",
-        expiration: new Date(1640995200000),
+        expiration: channelExpirationDate,
       });
     });
 
     test("should handle expiration as ISO string", async () => {
+      const mockExpirationDate = new Date(Date.now() + 10000000);
       const mockWatchResponse = {
         data: {
           id: "test-channel-id",
           resourceId: "test-resource-id",
           resourceUri: "test-resource-uri",
-          expiration: "2023-12-01T10:00:00Z",
+          expiration: mockExpirationDate.toISOString(),
         },
       };
 
@@ -220,7 +235,7 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
 
       const result = await adapter.subscribe(mockSelectedCalendar, mockCredential);
 
-      expect(result.expiration).toEqual(new Date("2023-12-01T10:00:00Z"));
+      expect(result.expiration).toEqual(mockExpirationDate);
     });
 
     test("should handle missing expiration", async () => {
@@ -265,6 +280,19 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
   });
 
   describe("fetchEvents", () => {
+    const commonEventData = {
+      iCalUID: "event-1@cal.com",
+      summary: "Test Event",
+      description: "Test Description",
+      location: "Test Location",
+      status: "confirmed",
+      transparency: "opaque",
+      kind: "calendar#event",
+      etag: "test-etag",
+      created: today.toISOString(),
+      updated: today.toISOString(),
+    };
+
     test("should fetch events with sync token", async () => {
       const mockEventsResponse = {
         data: {
@@ -272,23 +300,14 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
           items: [
             {
               id: "event-1",
-              iCalUID: "event-1@cal.com",
-              summary: "Test Event",
-              description: "Test Description",
-              location: "Test Location",
+              ...commonEventData,
               start: {
-                dateTime: "2023-12-01T10:00:00Z",
+                dateTime: oneWeekFromNow.toISOString(),
                 timeZone: "UTC",
               },
               end: {
-                dateTime: "2023-12-01T11:00:00Z",
+                dateTime: eventEndTime.toISOString(),
               },
-              status: "confirmed",
-              transparency: "opaque",
-              kind: "calendar#event",
-              etag: "test-etag",
-              created: "2023-12-01T09:00:00Z",
-              updated: "2023-12-01T09:30:00Z",
             },
           ],
         },
@@ -312,8 +331,8 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
           {
             id: "event-1",
             iCalUID: "event-1@cal.com",
-            start: new Date("2023-12-01T10:00:00Z"),
-            end: new Date("2023-12-01T11:00:00Z"),
+            start: oneWeekFromNow.toDate(),
+            end: eventEndTime.toDate(),
             busy: true,
             summary: "Test Event",
             description: "Test Description",
@@ -325,14 +344,14 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
             timeZone: "UTC",
             recurringEventId: null,
             originalStartDate: null,
-            createdAt: new Date("2023-12-01T09:00:00Z"),
-            updatedAt: new Date("2023-12-01T09:30:00Z"),
+            createdAt: today.toDate(),
+            updatedAt: today.toDate(),
           },
         ],
       });
     });
 
-    test("should fetch events without sync token (initial sync)", async () => {
+    test("should fetch events without sync token (initial sync) with a 3-month range", async () => {
       const calendarWithoutSyncToken = {
         ...mockSelectedCalendar,
         syncToken: null,
@@ -349,34 +368,37 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
 
       const result = await adapter.fetchEvents(calendarWithoutSyncToken, mockCredential);
 
+      const expectedTimeMin = today.startOf("day").toISOString();
+      const expectedTimeMax = addMonthsFromNow(3).endOf("day").toISOString();
+
       expect(mockClient.events.list).toHaveBeenCalledWith({
         calendarId: "test@example.com",
         pageToken: undefined,
         singleEvents: true,
-        timeMin: expect.any(String),
-        timeMax: expect.any(String),
+        timeMin: expectedTimeMin,
+        timeMax: expectedTimeMax,
       });
 
       expect(result.syncToken).toBe("initial-sync-token");
     });
 
     test("should handle all-day events", async () => {
+      const allDayStart = oneWeekFromNow.startOf("day");
+      const allDayEnd = oneWeekFromNow.endOf("day");
+
       const mockEventsResponse = {
         data: {
           nextSyncToken: "new-sync-token",
           items: [
             {
               id: "event-1",
-              iCalUID: "event-1@cal.com",
-              summary: "All Day Event",
+              ...commonEventData,
               start: {
-                date: "2023-12-01",
+                date: allDayStart.toISOString().split("T")[0],
               },
               end: {
-                date: "2023-12-02",
+                date: allDayEnd.toISOString().split("T")[0],
               },
-              status: "confirmed",
-              transparency: "opaque",
             },
           ],
         },
@@ -387,8 +409,8 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
       const result = await adapter.fetchEvents(mockSelectedCalendar, mockCredential);
 
       expect(result.items[0].isAllDay).toBe(true);
-      expect(result.items[0].start).toEqual(new Date("2023-12-01"));
-      expect(result.items[0].end).toEqual(new Date("2023-12-02"));
+      expect(result.items[0].start).toEqual(new Date(allDayStart.toISOString().split("T")[0]));
+      expect(result.items[0].end).toEqual(new Date(allDayEnd.toISOString().split("T")[0]));
     });
 
     test("should handle free events (transparent)", async () => {
@@ -398,15 +420,14 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
           items: [
             {
               id: "event-1",
-              iCalUID: "event-1@cal.com",
+              ...commonEventData,
               summary: "Free Event",
               start: {
-                dateTime: "2023-12-01T10:00:00Z",
+                dateTime: oneWeekFromNow.toISOString(),
               },
               end: {
-                dateTime: "2023-12-01T11:00:00Z",
+                dateTime: eventEndTime.toISOString(),
               },
-              status: "confirmed",
               transparency: "transparent",
             },
           ],
@@ -421,6 +442,9 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
     });
 
     test("should handle pagination", async () => {
+      const date2 = new Date(oneWeekFromNow.toDate());
+      date2.setDate(date2.getDate() + 1);
+
       const mockEventsResponse1 = {
         data: {
           nextPageToken: "page-2",
@@ -428,8 +452,8 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
             {
               id: "event-1",
               summary: "Event 1",
-              start: { dateTime: "2023-12-01T10:00:00Z" },
-              end: { dateTime: "2023-12-01T11:00:00Z" },
+              start: { dateTime: oneWeekFromNow.toISOString() },
+              end: { dateTime: eventEndTime.toISOString() },
             },
           ],
         },
@@ -442,8 +466,8 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
             {
               id: "event-2",
               summary: "Event 2",
-              start: { dateTime: "2023-12-01T12:00:00Z" },
-              end: { dateTime: "2023-12-01T13:00:00Z" },
+              start: { dateTime: date2.toISOString() },
+              end: { dateTime: new Date(date2.getTime() + 3600000).toISOString() },
             },
           ],
         },
@@ -468,19 +492,19 @@ describe("GoogleCalendarSubscriptionAdapter", () => {
             {
               id: "event-1",
               summary: "Valid Event",
-              start: { dateTime: "2023-12-01T10:00:00Z" },
-              end: { dateTime: "2023-12-01T11:00:00Z" },
+              start: { dateTime: oneWeekFromNow.toISOString() },
+              end: { dateTime: eventEndTime.toISOString() },
             },
             {
               summary: "Invalid Event",
-              start: { dateTime: "2023-12-01T12:00:00Z" },
-              end: { dateTime: "2023-12-01T13:00:00Z" },
+              start: { dateTime: oneWeekFromNow.toISOString() },
+              end: { dateTime: eventEndTime.toISOString() },
             },
             {
               id: "",
               summary: "Empty ID Event",
-              start: { dateTime: "2023-12-01T14:00:00Z" },
-              end: { dateTime: "2023-12-01T15:00:00Z" },
+              start: { dateTime: oneWeekFromNow.toISOString() },
+              end: { dateTime: eventEndTime.toISOString() },
             },
           ],
         },
diff --git a/packages/features/calendar-subscription/lib/cache/CalendarCacheEventRepository.ts b/packages/features/calendar-subscription/lib/cache/CalendarCacheEventRepository.ts
index bece5e1420762f..fd1f44d310d25f 100644
--- a/packages/features/calendar-subscription/lib/cache/CalendarCacheEventRepository.ts
+++ b/packages/features/calendar-subscription/lib/cache/CalendarCacheEventRepository.ts
@@ -83,9 +83,7 @@ export class CalendarCacheEventRepository implements ICalendarCacheEventReposito
   async deleteStale() {
     return this.prismaClient.calendarCacheEvent.deleteMany({
       where: {
-        end: {
-          lte: new Date(),
-        },
+        end: { lte: new Date() },
       },
     });
   }
diff --git a/packages/features/calendar-subscription/lib/cache/CalendarCacheEventService.ts b/packages/features/calendar-subscription/lib/cache/CalendarCacheEventService.ts
index 906103c58758fb..220ca532973624 100644
--- a/packages/features/calendar-subscription/lib/cache/CalendarCacheEventService.ts
+++ b/packages/features/calendar-subscription/lib/cache/CalendarCacheEventService.ts
@@ -9,6 +9,7 @@ const log = logger.getSubLogger({ prefix: ["CalendarCacheEventService"] });
  * Service to handle calendar cache
  */
 export class CalendarCacheEventService {
+  static MONTHS_AHEAD: number = 3;
   constructor(
     private deps: {
       calendarCacheEventRepository: ICalendarCacheEventRepository;
diff --git a/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventRepository.test.ts b/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventRepository.test.ts
index 88f1450dbec7bf..d2f2328039d00c 100644
--- a/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventRepository.test.ts
+++ b/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventRepository.test.ts
@@ -239,9 +239,7 @@ describe("CalendarCacheEventRepository", () => {
 
       expect(mockPrismaClient.calendarCacheEvent.deleteMany).toHaveBeenCalledWith({
         where: {
-          end: {
-            lte: expect.any(Date),
-          },
+          end: { lte: expect.any(Date) },
         },
       });
     });
diff --git a/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventService.test.ts b/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventService.test.ts
index 88b93174c259f1..a6727757d7cafd 100644
--- a/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventService.test.ts
+++ b/packages/features/calendar-subscription/lib/cache/__tests__/CalendarCacheEventService.test.ts
@@ -284,7 +284,7 @@ describe("CalendarCacheEventService", () => {
           description: null,
           location: null,
           status: "confirmed",
-          isAllDay: undefined,
+          isAllDay: false,
           timeZone: null,
           recurringEventId: null,
           originalStartDate: null,
@@ -306,7 +306,7 @@ describe("CalendarCacheEventService", () => {
           summary: null,
           description: null,
           location: null,
-          isAllDay: undefined,
+          isAllDay: false,
           timeZone: null,
           originalStartTime: null,
           recurringEventId: null,
@@ -346,9 +346,8 @@ describe("CalendarCacheEventService", () => {
       expect(CalendarCacheEventService.isCalendarTypeSupported("unknown_calendar")).toBe(false);
     });
 
-    test("should return false for null or undefined", () => {
+    test("should return false for null", () => {
       expect(CalendarCacheEventService.isCalendarTypeSupported(null)).toBe(false);
-      expect(CalendarCacheEventService.isCalendarTypeSupported(undefined)).toBe(false);
     });
   });
 });
diff --git a/packages/features/calendar-subscription/lib/sync/CalendarSyncService.ts b/packages/features/calendar-subscription/lib/sync/CalendarSyncService.ts
index 0f4e425e993429..e283cc403f4850 100644
--- a/packages/features/calendar-subscription/lib/sync/CalendarSyncService.ts
+++ b/packages/features/calendar-subscription/lib/sync/CalendarSyncService.ts
@@ -1,6 +1,6 @@
 import type { CalendarSubscriptionEventItem } from "@calcom/features/calendar-subscription/lib/CalendarSubscriptionPort.interface";
 import logger from "@calcom/lib/logger";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 
 const log = logger.getSubLogger({ prefix: ["CalendarSyncService"] });
diff --git a/packages/features/calendar-view/LargeCalendar.tsx b/packages/features/calendar-view/LargeCalendar.tsx
index 0659df79dab82b..53b8acf257d9e5 100644
--- a/packages/features/calendar-view/LargeCalendar.tsx
+++ b/packages/features/calendar-view/LargeCalendar.tsx
@@ -1,14 +1,15 @@
-import { useMemo, useEffect } from "react";
+import { useEffect, useMemo } from "react";
 
 import dayjs from "@calcom/dayjs";
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import { useAvailableTimeSlots } from "@calcom/features/bookings/Booker/components/hooks/useAvailableTimeSlots";
+import { useBookerTime } from "@calcom/features/bookings/Booker/components/hooks/useBookerTime";
 import type { BookerEvent } from "@calcom/features/bookings/types";
 import { Calendar } from "@calcom/features/calendars/weeklyview";
-import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
 import { localStorage } from "@calcom/lib/webstorage";
+import type { BookingStatus } from "@calcom/prisma/enums";
 
-import { useOverlayCalendarStore } from "../bookings/Booker/components/OverlayCalendar/store";
+import { useBookings } from "../../platform/atoms/hooks/bookings/useBookings";
 import type { useScheduleForEventReturnType } from "../bookings/Booker/utils/event";
 import { getQueryParam } from "../bookings/Booker/utils/query-param";
 
@@ -22,14 +23,14 @@ export const LargeCalendar = ({
   schedule?: useScheduleForEventReturnType["data"];
   isLoading: boolean;
   event: {
-    data?: Pick<BookerEvent, "length"> | null;
+    data?: Pick<BookerEvent, "length" | "id"> | null;
   };
 }) => {
   const selectedDate = useBookerStoreContext((state) => state.selectedDate);
   const selectedEventDuration = useBookerStoreContext((state) => state.selectedDuration);
-  const overlayEvents = useOverlayCalendarStore((state) => state.overlayBusyDates);
   const displayOverlay =
     getQueryParam("overlayCalendar") === "true" || localStorage?.getItem("overlayCalendarSwitchDefault");
+  const { timezone } = useBookerTime();
 
   const eventDuration = selectedEventDuration || event?.data?.length || 30;
 
@@ -40,25 +41,38 @@ export const LargeCalendar = ({
     .add(extraDays - 1, "day")
     .toDate();
 
+  const { data: upcomingBookings } = useBookings({
+    take: 150,
+    skip: 0,
+    status: ["upcoming", "past", "recurring"],
+    eventTypeId: event?.data?.id,
+    afterStart: startDate.toISOString(),
+    beforeEnd: endDate.toISOString(),
+  });
+
   // HACK: force rerender when overlay events change
   // Sine we dont use react router here we need to force rerender (ATOM SUPPORT)
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
+
   useEffect(() => {}, [displayOverlay]);
 
   const overlayEventsForDate = useMemo(() => {
-    if (!overlayEvents || !displayOverlay) return [];
-    return overlayEvents.map((event, id) => {
+    if (!upcomingBookings) return [];
+
+    return upcomingBookings?.map((booking) => {
       return {
-        id,
-        start: dayjs(event.start).toDate(),
-        end: dayjs(event.end).toDate(),
-        title: "Busy",
+        id: booking.id,
+        title: booking.title ?? `Busy`,
+        start: new Date(booking.start),
+        end: new Date(booking.end),
         options: {
-          status: "ACCEPTED",
+          borderColor: "black",
+          status: booking.status.toUpperCase() as BookingStatus,
+          "data-test-id": "troubleshooter-busy-event",
+          className: "border-[1.5px]",
         },
-      } as CalendarEvent;
+      };
     });
-  }, [overlayEvents, displayOverlay]);
+  }, [upcomingBookings]);
 
   return (
     <div className="h-full [--calendar-dates-sticky-offset:66px]">
@@ -73,6 +87,7 @@ export const LargeCalendar = ({
         gridCellsPerHour={60 / eventDuration}
         hoverEventDuration={eventDuration}
         hideHeader
+        timezone={timezone}
       />
     </div>
   );
diff --git a/packages/features/calendars/lib/getConnectedDestinationCalendars.ts b/packages/features/calendars/lib/getConnectedDestinationCalendars.ts
index fdcbafadbe07b9..518e8e6a7afe32 100644
--- a/packages/features/calendars/lib/getConnectedDestinationCalendars.ts
+++ b/packages/features/calendars/lib/getConnectedDestinationCalendars.ts
@@ -6,7 +6,7 @@ import {
 import { isDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { DestinationCalendarRepository } from "@calcom/lib/server/repository/destinationCalendar";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import type { PrismaClient } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
diff --git a/packages/features/calendars/weeklyview/components/Calendar.tsx b/packages/features/calendars/weeklyview/components/Calendar.tsx
index 878a82a0dbf3b0..ef8844f0dd7fcb 100644
--- a/packages/features/calendars/weeklyview/components/Calendar.tsx
+++ b/packages/features/calendars/weeklyview/components/Calendar.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, useRef } from "react";
 
 import classNames from "@calcom/ui/classNames";
 
-import { useBookerTime } from "../../../bookings/Booker/components/hooks/useBookerTime";
 import { useCalendarStore } from "../state/store";
 import "../styles/styles.css";
 import type { CalendarComponentProps } from "../types/state";
@@ -23,7 +22,6 @@ export function Calendar(props: CalendarComponentProps) {
   const containerOffset = useRef<HTMLDivElement | null>(null);
   const schedulerGrid = useRef<HTMLOListElement | null>(null);
   const initialState = useCalendarStore((state) => state.initState);
-  const { timezone } = useBookerTime();
 
   const startDate = useCalendarStore((state) => state.startDate);
   const endDate = useCalendarStore((state) => state.endDate);
@@ -32,6 +30,7 @@ export function Calendar(props: CalendarComponentProps) {
   const usersCellsStopsPerHour = useCalendarStore((state) => state.gridCellsPerHour || 4);
   const availableTimeslots = useCalendarStore((state) => state.availableTimeslots);
   const hideHeader = useCalendarStore((state) => state.hideHeader);
+  const timezone = useCalendarStore((state) => state.timezone);
 
   const days = useMemo(() => getDaysBetweenDates(startDate, endDate), [startDate, endDate]);
 
diff --git a/packages/features/calendars/weeklyview/state/store.ts b/packages/features/calendars/weeklyview/state/store.ts
index af1b52358d688e..c3c0e92a8d6218 100644
--- a/packages/features/calendars/weeklyview/state/store.ts
+++ b/packages/features/calendars/weeklyview/state/store.ts
@@ -1,6 +1,7 @@
 import { create } from "zustand";
 
 import dayjs from "@calcom/dayjs";
+import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
 
 import type {
   CalendarComponentProps,
@@ -18,6 +19,7 @@ const defaultState: CalendarComponentProps = {
   startHour: 0,
   endHour: 23,
   gridCellsPerHour: 4,
+  timezone: CURRENT_TIMEZONE,
 };
 
 export const useCalendarStore = create<CalendarStoreProps>((set) => ({
@@ -62,7 +64,7 @@ export const useCalendarStore = create<CalendarStoreProps>((set) => ({
         }
 
         // We call this callback if we have it -> Allows you to change your state outside of the component
-        state.onDateChange && state.onDateChange(newStartDate, newEndDate);
+        state.onDateChange?.(newStartDate, newEndDate);
         return {
           startDate: newStartDate,
           endDate: newEndDate,
@@ -70,7 +72,7 @@ export const useCalendarStore = create<CalendarStoreProps>((set) => ({
       }
       const newStartDate = dayjs(startDate).subtract(1, state.view).toDate();
       const newEndDate = dayjs(endDate).subtract(1, state.view).toDate();
-      state.onDateChange && state.onDateChange(newStartDate, newEndDate);
+      state.onDateChange?.(newStartDate, newEndDate);
       return {
         startDate: newStartDate,
         endDate: newEndDate,
diff --git a/packages/features/calendars/weeklyview/types/state.ts b/packages/features/calendars/weeklyview/types/state.ts
index f16b4597bfd713..a9fc46301b2e19 100644
--- a/packages/features/calendars/weeklyview/types/state.ts
+++ b/packages/features/calendars/weeklyview/types/state.ts
@@ -127,6 +127,10 @@ export type CalendarState = {
    * Optional boolean to  hide the main header. Default the header will be visible.
    */
   hideHeader?: boolean;
+  /**
+   * Timezone to use for displaying times in the calendar
+   */
+  timezone: string;
 };
 
 export type CalendarComponentProps = CalendarPublicActions & CalendarState & { isPending?: boolean };
diff --git a/packages/features/conferencing/README.md b/packages/features/conferencing/README.md
index 1557b498da2234..2980e825491222 100644
--- a/packages/features/conferencing/README.md
+++ b/packages/features/conferencing/README.md
@@ -1,3 +1,3 @@
 # Conferencing related code will live here
 
-- [ ] Maybe migrate `videoClient` here
+- [x] Maybe migrate `videoClient` here
diff --git a/packages/app-store/videoClient.ts b/packages/features/conferencing/lib/videoClient.ts
similarity index 87%
rename from packages/app-store/videoClient.ts
rename to packages/features/conferencing/lib/videoClient.ts
index 0495d8800e75e3..ed4e8e54698186 100644
--- a/packages/app-store/videoClient.ts
+++ b/packages/features/conferencing/lib/videoClient.ts
@@ -3,7 +3,7 @@ import { v5 as uuidv5 } from "uuid";
 
 import { DailyLocationType } from "@calcom/app-store/constants";
 import { getDailyAppKeys } from "@calcom/app-store/dailyvideo/lib/getDailyAppKeys";
-import { VideoApiAdapterMap } from "@calcom/app-store/video.adapters.generated";
+import { getVideoAdapters } from "@calcom/app-store/getVideoAdapters";
 import { sendBrokenIntegrationEmail } from "@calcom/emails";
 import { getUid } from "@calcom/lib/CalEventParser";
 import logger from "@calcom/lib/logger";
@@ -14,49 +14,12 @@ import type { GetRecordingsResponseSchema, GetAccessLinkResponseSchema } from "@
 import type { CalendarEvent, EventBusyDate } from "@calcom/types/Calendar";
 import type { CredentialPayload } from "@calcom/types/Credential";
 import type { EventResult, PartialReference } from "@calcom/types/EventManager";
-import type { VideoApiAdapter, VideoApiAdapterFactory, VideoCallData } from "@calcom/types/VideoApiAdapter";
+import type { VideoCallData } from "@calcom/types/VideoApiAdapter";
 
-const log = logger.getSubLogger({ prefix: ["[lib] videoClient"] });
+const log = logger.getSubLogger({ prefix: ["[features/conferencing/lib] videoClient"] });
 
 const translator = short();
 
-// factory
-const getVideoAdapters = async (withCredentials: CredentialPayload[]): Promise<VideoApiAdapter[]> => {
-  const videoAdapters: VideoApiAdapter[] = [];
-
-  for (const cred of withCredentials) {
-    const appName = cred.type.split("_").join(""); // Transform `zoom_video` to `zoomvideo`;
-    log.silly("Getting video adapter for", safeStringify({ appName, cred: getPiiFreeCredential(cred) }));
-
-    let videoAdapterImport = VideoApiAdapterMap[appName as keyof typeof VideoApiAdapterMap];
-
-    // fallback: transforms zoom_video to zoom
-    if (!videoAdapterImport) {
-      const appTypeVariant = cred.type.substring(0, cred.type.lastIndexOf("_"));
-      log.silly(`Adapter not found for ${appName}, trying fallback ${appTypeVariant}`);
-
-      videoAdapterImport = VideoApiAdapterMap[appTypeVariant as keyof typeof VideoApiAdapterMap];
-    }
-
-    if (!videoAdapterImport) {
-      log.error(`Couldn't get adapter for ${appName}`);
-      continue;
-    }
-
-    const videoAdapterModule = await videoAdapterImport;
-    const makeVideoApiAdapter = videoAdapterModule.default as VideoApiAdapterFactory;
-
-    if (makeVideoApiAdapter) {
-      const videoAdapter = makeVideoApiAdapter(cred);
-      videoAdapters.push(videoAdapter);
-    } else {
-      log.error(`App ${appName} doesn't have a default VideoApiAdapter export`);
-    }
-  }
-
-  return videoAdapters;
-};
-
 const getBusyVideoTimes = async (withCredentials: CredentialPayload[]) =>
   Promise.all((await getVideoAdapters(withCredentials)).map((c) => c?.getAvailability())).then((results) =>
     results.reduce((acc, availability) => acc.concat(availability), [] as (EventBusyDate | undefined)[])
diff --git a/packages/features/credentials/deleteCredential.test.ts b/packages/features/credentials/deleteCredential.test.ts
index ebe279d33e8e97..d2618056ef2144 100644
--- a/packages/features/credentials/deleteCredential.test.ts
+++ b/packages/features/credentials/deleteCredential.test.ts
@@ -6,10 +6,10 @@ import {
 import { describe, test, expect, beforeEach } from "vitest";
 
 import { PrismaAppRepository } from "@calcom/features/apps/repository/PrismaAppRepository";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { DestinationCalendarRepository } from "@calcom/lib/server/repository/destinationCalendar";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 const testUser = {
diff --git a/packages/lib/server/repository/credential.ts b/packages/features/credentials/repositories/CredentialRepository.ts
similarity index 98%
rename from packages/lib/server/repository/credential.ts
rename to packages/features/credentials/repositories/CredentialRepository.ts
index e5ae810cda9983..d685a469c5989a 100644
--- a/packages/lib/server/repository/credential.ts
+++ b/packages/features/credentials/repositories/CredentialRepository.ts
@@ -1,11 +1,10 @@
+import { buildNonDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { prisma } from "@calcom/prisma";
 import type { Prisma, PrismaClient } from "@calcom/prisma/client";
 import { safeCredentialSelect } from "@calcom/prisma/selects/credential";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
 
-import { buildNonDelegationCredential } from "../../delegationCredential";
-
 const log = logger.getSubLogger({ prefix: ["CredentialRepository"] });
 
 type CredentialCreateInput = {
diff --git a/packages/lib/crmManager/tasker/crmScheduler.ts b/packages/features/crmManager/crmScheduler.ts
similarity index 100%
rename from packages/lib/crmManager/tasker/crmScheduler.ts
rename to packages/features/crmManager/crmScheduler.ts
diff --git a/packages/features/data-table/GUIDE.md b/packages/features/data-table/GUIDE.md
index fb4be41df3f452..c1d28d8324256b 100644
--- a/packages/features/data-table/GUIDE.md
+++ b/packages/features/data-table/GUIDE.md
@@ -976,7 +976,7 @@ From `packages/features/users/components/UserTable/UserListTable.tsx`:
 
 ### Example 2: Bookings List
 
-From `apps/web/modules/bookings/views/bookings-listing-view.tsx`:
+From `apps/web/modules/bookings/components/BookingsList.tsx`:
 
 ```tsx
 <DataTableWrapper
diff --git a/packages/lib/server/repository/__tests__/filterSegments/create.test.ts b/packages/features/data-table/__tests__/filterSegments/create.test.ts
similarity index 93%
rename from packages/lib/server/repository/__tests__/filterSegments/create.test.ts
rename to packages/features/data-table/__tests__/filterSegments/create.test.ts
index ff3d2b123680a5..6f197f607e4064 100644
--- a/packages/lib/server/repository/__tests__/filterSegments/create.test.ts
+++ b/packages/features/data-table/__tests__/filterSegments/create.test.ts
@@ -1,4 +1,4 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it } from "vitest";
 
@@ -6,8 +6,8 @@ import { ColumnFilterType } from "@calcom/features/data-table/lib/types";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
-import { FilterSegmentRepository } from "../../filterSegment";
-import type { TCreateFilterSegmentInputSchema } from "../../filterSegment.type";
+import { FilterSegmentRepository } from "../../repositories/filterSegment";
+import type { TCreateFilterSegmentInputSchema } from "../../repositories/filterSegment.type";
 
 const repository = new FilterSegmentRepository();
 
diff --git a/packages/lib/server/repository/__tests__/filterSegments/delete.test.ts b/packages/features/data-table/__tests__/filterSegments/delete.test.ts
similarity index 94%
rename from packages/lib/server/repository/__tests__/filterSegments/delete.test.ts
rename to packages/features/data-table/__tests__/filterSegments/delete.test.ts
index 9e1100b4fdf18c..8b9e46413633ed 100644
--- a/packages/lib/server/repository/__tests__/filterSegments/delete.test.ts
+++ b/packages/features/data-table/__tests__/filterSegments/delete.test.ts
@@ -1,12 +1,12 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it } from "vitest";
 
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
-import { FilterSegmentRepository } from "../../filterSegment";
-import { type TDeleteFilterSegmentInputSchema } from "../../filterSegment.type";
+import { FilterSegmentRepository } from "../../repositories/filterSegment";
+import { type TDeleteFilterSegmentInputSchema } from "../../repositories/filterSegment.type";
 
 const repository = new FilterSegmentRepository();
 
diff --git a/packages/lib/server/repository/__tests__/filterSegments/get.test.ts b/packages/features/data-table/__tests__/filterSegments/get.test.ts
similarity index 97%
rename from packages/lib/server/repository/__tests__/filterSegments/get.test.ts
rename to packages/features/data-table/__tests__/filterSegments/get.test.ts
index 202d370b993249..6b4d42fc22d94d 100644
--- a/packages/lib/server/repository/__tests__/filterSegments/get.test.ts
+++ b/packages/features/data-table/__tests__/filterSegments/get.test.ts
@@ -1,12 +1,12 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it } from "vitest";
 
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
-import { FilterSegmentRepository } from "../../filterSegment";
-import { type TListFilterSegmentsInputSchema } from "../../filterSegment.type";
+import { FilterSegmentRepository } from "../../repositories/filterSegment";
+import { type TListFilterSegmentsInputSchema } from "../../repositories/filterSegment.type";
 
 const repository = new FilterSegmentRepository();
 
diff --git a/packages/lib/server/repository/__tests__/filterSegments/update.test.ts b/packages/features/data-table/__tests__/filterSegments/update.test.ts
similarity index 96%
rename from packages/lib/server/repository/__tests__/filterSegments/update.test.ts
rename to packages/features/data-table/__tests__/filterSegments/update.test.ts
index 2b676b5a17e2d9..8cc3743aee6eaa 100644
--- a/packages/lib/server/repository/__tests__/filterSegments/update.test.ts
+++ b/packages/features/data-table/__tests__/filterSegments/update.test.ts
@@ -1,4 +1,4 @@
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it } from "vitest";
 
@@ -6,8 +6,8 @@ import { ColumnFilterType } from "@calcom/features/data-table/lib/types";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
-import { FilterSegmentRepository } from "../../filterSegment";
-import { type TUpdateFilterSegmentInputSchema } from "../../filterSegment.type";
+import { FilterSegmentRepository } from "../../repositories/filterSegment";
+import { type TUpdateFilterSegmentInputSchema } from "../../repositories/filterSegment.type";
 
 const repository = new FilterSegmentRepository();
 
diff --git a/packages/features/data-table/hooks/useDebouncedWidth.ts b/packages/features/data-table/hooks/useDebouncedWidth.ts
index 11019e03c31d99..60db166b9e1ff8 100644
--- a/packages/features/data-table/hooks/useDebouncedWidth.ts
+++ b/packages/features/data-table/hooks/useDebouncedWidth.ts
@@ -1,4 +1,6 @@
-// eslint-disable-next-line no-restricted-imports
+"use client";
+
+
 import debounce from "lodash/debounce";
 import { useState, useEffect } from "react";
 
diff --git a/packages/lib/server/repository/filterSegment.ts b/packages/features/data-table/repositories/filterSegment.ts
similarity index 100%
rename from packages/lib/server/repository/filterSegment.ts
rename to packages/features/data-table/repositories/filterSegment.ts
diff --git a/packages/lib/server/repository/filterSegment.type.ts b/packages/features/data-table/repositories/filterSegment.type.ts
similarity index 100%
rename from packages/lib/server/repository/filterSegment.type.ts
rename to packages/features/data-table/repositories/filterSegment.type.ts
diff --git a/packages/lib/server/repository/__tests__/delegationCredential.test.ts b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts
similarity index 96%
rename from packages/lib/server/repository/__tests__/delegationCredential.test.ts
rename to packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts
index 3c63a077be18b7..a6e3ffc602626e 100644
--- a/packages/lib/server/repository/__tests__/delegationCredential.test.ts
+++ b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts
@@ -1,13 +1,13 @@
-import prismock from "../../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it, beforeEach, vi } from "vitest";
 
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { encryptServiceAccountKey } from "@calcom/lib/server/serviceAccountKey";
 
-import { DelegationCredentialRepository } from "../delegationCredential";
-import { OrganizationRepository } from "../organization";
+import { DelegationCredentialRepository } from "./DelegationCredentialRepository";
 
-vi.mock("../organization", () => ({
+vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository", () => ({
   OrganizationRepository: {
     findByMemberEmail: vi.fn(),
   },
diff --git a/packages/lib/server/repository/delegationCredential.ts b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.ts
similarity index 98%
rename from packages/lib/server/repository/delegationCredential.ts
rename to packages/features/delegation-credentials/repositories/DelegationCredentialRepository.ts
index 8a137568bbf211..2cf8522b502602 100644
--- a/packages/lib/server/repository/delegationCredential.ts
+++ b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.ts
@@ -1,3 +1,4 @@
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import logger from "@calcom/lib/logger";
 import {
   serviceAccountKeySchema,
@@ -9,8 +10,6 @@ import {
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
-import { OrganizationRepository } from "./organization";
-
 export type { ServiceAccountKey };
 const repositoryLogger = logger.getSubLogger({ prefix: ["DelegationCredentialRepository"] });
 const delegationCredentialSafeSelect = {
diff --git a/packages/features/di/bookings/containers/InstantBookingCreateService.container.ts b/packages/features/di/bookings/containers/InstantBookingCreateService.container.ts
deleted file mode 100644
index 4be7f406cce70c..00000000000000
--- a/packages/features/di/bookings/containers/InstantBookingCreateService.container.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { DI_TOKENS } from "@calcom/features/di/tokens";
-
-import { createContainer } from "../../di";
-import {
-  type InstantBookingCreateService,
-  instantBookingCreateServiceModule,
-} from "../modules/InstantBookingCreateService.module";
-
-const container = createContainer();
-container.load(DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE_MODULE, instantBookingCreateServiceModule);
-
-export function getInstantBookingCreateService(): InstantBookingCreateService {
-  return container.get<InstantBookingCreateService>(DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE);
-}
diff --git a/packages/features/di/bookings/containers/RecurringBookingService.container.ts b/packages/features/di/bookings/containers/RecurringBookingService.container.ts
deleted file mode 100644
index 86575191f47f53..00000000000000
--- a/packages/features/di/bookings/containers/RecurringBookingService.container.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { bookingRepositoryModule } from "@calcom/features/di/modules/Booking";
-import { cacheModule } from "@calcom/features/di/modules/Cache";
-import { checkBookingAndDurationLimitsModule } from "@calcom/features/di/modules/CheckBookingAndDurationLimits";
-import { checkBookingLimitsModule } from "@calcom/features/di/modules/CheckBookingLimits";
-import { featuresRepositoryModule } from "@calcom/features/di/modules/Features";
-import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
-
-import { createContainer } from "../../di";
-import {
-  type RecurringBookingService,
-  recurringBookingServiceModule,
-} from "../modules/RecurringBookingService.module";
-
-const container = createContainer();
-container.load(DI_TOKENS.PRISMA_MODULE, prismaModule);
-container.load(DI_TOKENS.BOOKING_REPOSITORY_MODULE, bookingRepositoryModule);
-container.load(DI_TOKENS.CACHE_SERVICE_MODULE, cacheModule);
-container.load(DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE_MODULE, checkBookingLimitsModule);
-container.load(DI_TOKENS.FEATURES_REPOSITORY_MODULE, featuresRepositoryModule);
-container.load(
-  DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE_MODULE,
-  checkBookingAndDurationLimitsModule
-);
-container.load(DI_TOKENS.RECURRING_BOOKING_SERVICE_MODULE, recurringBookingServiceModule);
-
-export function getRecurringBookingService(): RecurringBookingService {
-  return container.get<RecurringBookingService>(DI_TOKENS.RECURRING_BOOKING_SERVICE);
-}
diff --git a/packages/features/di/bookings/modules/InstantBookingCreateService.module.ts b/packages/features/di/bookings/modules/InstantBookingCreateService.module.ts
deleted file mode 100644
index aebfe66c6f793e..00000000000000
--- a/packages/features/di/bookings/modules/InstantBookingCreateService.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { InstantBookingCreateService } from "@calcom/features/instant-meeting/handleInstantMeeting";
-import { DI_TOKENS } from "@calcom/features/di/tokens";
-
-import { createModule } from "../../di";
-
-export const instantBookingCreateServiceModule = createModule();
-
-instantBookingCreateServiceModule
-  .bind(DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE)
-  .toClass(InstantBookingCreateService);
-export type { InstantBookingCreateService };
diff --git a/packages/features/di/bookings/modules/RecurringBookingService.module.ts b/packages/features/di/bookings/modules/RecurringBookingService.module.ts
deleted file mode 100644
index b93e760fe59fca..00000000000000
--- a/packages/features/di/bookings/modules/RecurringBookingService.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RecurringBookingService } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
-import { DI_TOKENS } from "@calcom/features/di/tokens";
-
-import { createModule } from "../../di";
-
-export const recurringBookingServiceModule = createModule();
-
-recurringBookingServiceModule.bind(DI_TOKENS.RECURRING_BOOKING_SERVICE).toClass(RecurringBookingService, {
-  regularBookingService: DI_TOKENS.REGULAR_BOOKING_SERVICE,
-});
-
-export type { RecurringBookingService };
diff --git a/packages/features/di/containers/BookingLimits.ts b/packages/features/di/containers/BookingLimits.ts
index 614346ca14f29a..9aafc5e4df4223 100644
--- a/packages/features/di/containers/BookingLimits.ts
+++ b/packages/features/di/containers/BookingLimits.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import type { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
+import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 import { prismaModule } from "@calcom/prisma/prisma.module";
 
 import type { CheckBookingAndDurationLimitsService } from "../../bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
diff --git a/packages/features/di/containers/BusyTimes.ts b/packages/features/di/containers/BusyTimes.ts
index 153793d2de27a2..0c14211087efbf 100644
--- a/packages/features/di/containers/BusyTimes.ts
+++ b/packages/features/di/containers/BusyTimes.ts
@@ -1,7 +1,7 @@
+import type { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { prismaModule } from "@calcom/prisma/prisma.module";
 
-import type { BusyTimesService } from "@calcom/lib/getBusyTimes";
 import { createContainer } from "../di";
 import { bookingRepositoryModule } from "../modules/Booking";
 import { busyTimesModule } from "../modules/BusyTimes";
diff --git a/packages/features/di/containers/InsightsBooking.ts b/packages/features/di/containers/InsightsBooking.ts
index 822ecb0b8b8058..189b3213675eb9 100644
--- a/packages/features/di/containers/InsightsBooking.ts
+++ b/packages/features/di/containers/InsightsBooking.ts
@@ -3,8 +3,8 @@ import type {
   InsightsBookingServicePublicOptions,
   InsightsBookingServiceFilterOptions,
   InsightsBookingBaseService,
-} from "@calcom/lib/server/service/InsightsBookingBaseService";
-import type { InsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
+} from "@calcom/features/insights/services/InsightsBookingBaseService";
+import type { InsightsBookingService } from "@calcom/features/insights/services/InsightsBookingDIService";
 import { prismaModule } from "@calcom/prisma/prisma.module";
 
 import { createContainer } from "../di";
diff --git a/packages/features/di/containers/InsightsRouting.ts b/packages/features/di/containers/InsightsRouting.ts
index 4178f4ecc6fb2a..1a018a9b20d8fb 100644
--- a/packages/features/di/containers/InsightsRouting.ts
+++ b/packages/features/di/containers/InsightsRouting.ts
@@ -3,8 +3,8 @@ import type {
   InsightsRoutingServicePublicOptions,
   InsightsRoutingServiceFilterOptions,
   InsightsRoutingBaseService,
-} from "@calcom/lib/server/service/InsightsRoutingBaseService";
-import type { InsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
+} from "@calcom/features/insights/services/InsightsRoutingBaseService";
+import type { InsightsRoutingService } from "@calcom/features/insights/services/InsightsRoutingDIService";
 import { prismaModule } from "@calcom/prisma/prisma.module";
 
 import { createContainer } from "../di";
diff --git a/packages/features/di/modules/Booking.ts b/packages/features/di/modules/Booking.ts
index f2d973687f5a82..a1033f48a57316 100644
--- a/packages/features/di/modules/Booking.ts
+++ b/packages/features/di/modules/Booking.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 
 import { type Container, createModule } from "../di";
 
diff --git a/packages/features/di/modules/BusyTimes.ts b/packages/features/di/modules/BusyTimes.ts
index 2bf3ce2ebf396b..95fb960eb50033 100644
--- a/packages/features/di/modules/BusyTimes.ts
+++ b/packages/features/di/modules/BusyTimes.ts
@@ -1,5 +1,6 @@
-import type { IBusyTimesService } from "@calcom/lib/getBusyTimes";
-import { BusyTimesService } from "@calcom/lib/getBusyTimes";
+import type { IBusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
+import { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
+
 import { createModule } from "../di";
 import { DI_TOKENS } from "../tokens";
 
diff --git a/packages/features/di/modules/CheckBookingLimits.ts b/packages/features/di/modules/CheckBookingLimits.ts
index e6f72e8b30cd86..1dc5ae27311267 100644
--- a/packages/features/di/modules/CheckBookingLimits.ts
+++ b/packages/features/di/modules/CheckBookingLimits.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
+import { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 
 import { type Container, createModule } from "../di";
 
diff --git a/packages/features/di/modules/EventType.ts b/packages/features/di/modules/EventType.ts
index 153c3f0a7271e8..4cc4f2a75eb1a5 100644
--- a/packages/features/di/modules/EventType.ts
+++ b/packages/features/di/modules/EventType.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 
 import { createModule } from "../di";
 
diff --git a/packages/features/di/modules/InsightsBooking.ts b/packages/features/di/modules/InsightsBooking.ts
index 13d2d504334b6e..478f7d6f294bb0 100644
--- a/packages/features/di/modules/InsightsBooking.ts
+++ b/packages/features/di/modules/InsightsBooking.ts
@@ -1,5 +1,5 @@
-import type { IInsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
-import { InsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
+import type { IInsightsBookingService } from "@calcom/features/insights/services/InsightsBookingDIService";
+import { InsightsBookingService } from "@calcom/features/insights/services/InsightsBookingDIService";
 
 import { createModule } from "../di";
 import { DI_TOKENS } from "../tokens";
diff --git a/packages/features/di/modules/InsightsRouting.ts b/packages/features/di/modules/InsightsRouting.ts
index 29ed52b75ce9aa..c75ec59757f784 100644
--- a/packages/features/di/modules/InsightsRouting.ts
+++ b/packages/features/di/modules/InsightsRouting.ts
@@ -1,5 +1,5 @@
-import type { IInsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
-import { InsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
+import type { IInsightsRoutingService } from "@calcom/features/insights/services/InsightsRoutingDIService";
+import { InsightsRoutingService } from "@calcom/features/insights/services/InsightsRoutingDIService";
 
 import { createModule } from "../di";
 import { DI_TOKENS } from "../tokens";
diff --git a/packages/features/di/modules/Membership.ts b/packages/features/di/modules/Membership.ts
index fac1faa6cf0d44..c63f8f465e14d1 100644
--- a/packages/features/di/modules/Membership.ts
+++ b/packages/features/di/modules/Membership.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 
 import { createModule } from "../di";
 
diff --git a/packages/features/di/modules/Team.ts b/packages/features/di/modules/Team.ts
index 2052c536a568eb..2e0b5f1526ca32 100644
--- a/packages/features/di/modules/Team.ts
+++ b/packages/features/di/modules/Team.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 
 import { createModule } from "../di";
 
diff --git a/packages/features/di/modules/User.ts b/packages/features/di/modules/User.ts
index ba154e6ab910ce..e2eaf74eb5962b 100644
--- a/packages/features/di/modules/User.ts
+++ b/packages/features/di/modules/User.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
 
 import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
diff --git a/packages/features/di/tokens.ts b/packages/features/di/tokens.ts
index 9936078b304d5a..c0809b94bf6979 100644
--- a/packages/features/di/tokens.ts
+++ b/packages/features/di/tokens.ts
@@ -1,4 +1,6 @@
-import { BOOKING_DI_TOKENS } from "./bookings/tokens";
+import { BOOKING_DI_TOKENS } from "@calcom/features/bookings/di/tokens";
+
+import { WATCHLIST_DI_TOKENS } from "./watchlist/Watchlist.tokens";
 
 export const DI_TOKENS = {
   PRISMA_CLIENT: Symbol("PrismaClient"),
@@ -53,6 +55,7 @@ export const DI_TOKENS = {
   HOST_REPOSITORY_MODULE: Symbol("HostRepositoryModule"),
   ATTRIBUTE_REPOSITORY: Symbol("AttributeRepository"),
   ATTRIBUTE_REPOSITORY_MODULE: Symbol("AttributeRepositoryModule"),
-  // Booking service tokens
   ...BOOKING_DI_TOKENS,
+  // Watchlist service tokens
+  ...WATCHLIST_DI_TOKENS,
 };
diff --git a/packages/features/di/watchlist/Watchlist.tokens.ts b/packages/features/di/watchlist/Watchlist.tokens.ts
new file mode 100644
index 00000000000000..9321e9c408dd6b
--- /dev/null
+++ b/packages/features/di/watchlist/Watchlist.tokens.ts
@@ -0,0 +1,12 @@
+export const WATCHLIST_DI_TOKENS = {
+  // Core services
+  WATCHLIST_SERVICE: Symbol("WatchlistService"),
+  GLOBAL_BLOCKING_SERVICE: Symbol("GlobalBlockingService"),
+  ORGANIZATION_BLOCKING_SERVICE: Symbol("OrganizationBlockingService"),
+  AUDIT_SERVICE: Symbol("WatchlistAuditService"),
+
+  // Repositories
+  GLOBAL_WATCHLIST_REPOSITORY: Symbol("GlobalWatchlistRepository"),
+  ORGANIZATION_WATCHLIST_REPOSITORY: Symbol("OrganizationWatchlistRepository"),
+  AUDIT_REPOSITORY: Symbol("PrismaWatchlistAuditRepository"),
+};
diff --git a/packages/features/di/watchlist/containers/SpamCheckService.container.ts b/packages/features/di/watchlist/containers/SpamCheckService.container.ts
new file mode 100644
index 00000000000000..72664598d96640
--- /dev/null
+++ b/packages/features/di/watchlist/containers/SpamCheckService.container.ts
@@ -0,0 +1,11 @@
+import type { GlobalBlockingService } from "@calcom/features/watchlist/lib/service/GlobalBlockingService";
+import type { OrganizationBlockingService } from "@calcom/features/watchlist/lib/service/OrganizationBlockingService";
+import { SpamCheckService } from "@calcom/features/watchlist/lib/service/SpamCheckService";
+
+import { getGlobalBlockingService, getOrganizationBlockingService } from "./watchlist";
+
+export const getSpamCheckService = (): SpamCheckService => {
+  const globalBlockingService = getGlobalBlockingService() as GlobalBlockingService;
+  const organizationBlockingService = getOrganizationBlockingService() as OrganizationBlockingService;
+  return new SpamCheckService(globalBlockingService, organizationBlockingService);
+};
diff --git a/packages/features/di/watchlist/containers/watchlist.ts b/packages/features/di/watchlist/containers/watchlist.ts
new file mode 100644
index 00000000000000..718824662d0f5a
--- /dev/null
+++ b/packages/features/di/watchlist/containers/watchlist.ts
@@ -0,0 +1,66 @@
+import { createContainer } from "@evyweb/ioctopus";
+
+import { loggerServiceModule } from "@calcom/features/di/shared/services/logger.service";
+import { taskerServiceModule } from "@calcom/features/di/shared/services/tasker.service";
+import { SHARED_TOKENS } from "@calcom/features/di/shared/shared.tokens";
+import {
+  createWatchlistFeature,
+  type WatchlistFeature,
+} from "@calcom/features/watchlist/lib/facade/WatchlistFeature";
+import type { IGlobalWatchlistRepository } from "@calcom/features/watchlist/lib/interface/IWatchlistRepositories";
+import type { IOrganizationWatchlistRepository } from "@calcom/features/watchlist/lib/interface/IWatchlistRepositories";
+import type { GlobalBlockingService } from "@calcom/features/watchlist/lib/service/GlobalBlockingService";
+import type { OrganizationBlockingService } from "@calcom/features/watchlist/lib/service/OrganizationBlockingService";
+import type { WatchlistAuditService } from "@calcom/features/watchlist/lib/service/WatchlistAuditService";
+import type { WatchlistService } from "@calcom/features/watchlist/lib/service/WatchlistService";
+import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+
+import { WATCHLIST_DI_TOKENS } from "../Watchlist.tokens";
+import { watchlistModule } from "../modules/Watchlist.module";
+
+export const watchlistContainer = createContainer();
+
+prismaModuleLoader.loadModule(watchlistContainer);
+
+watchlistContainer.load(SHARED_TOKENS.LOGGER, loggerServiceModule);
+watchlistContainer.load(SHARED_TOKENS.TASKER, taskerServiceModule);
+
+watchlistContainer.load(WATCHLIST_DI_TOKENS.GLOBAL_WATCHLIST_REPOSITORY, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.ORGANIZATION_WATCHLIST_REPOSITORY, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.AUDIT_REPOSITORY, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.WATCHLIST_SERVICE, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.AUDIT_SERVICE, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.GLOBAL_BLOCKING_SERVICE, watchlistModule);
+watchlistContainer.load(WATCHLIST_DI_TOKENS.ORGANIZATION_BLOCKING_SERVICE, watchlistModule);
+
+export function getWatchlistService() {
+  return watchlistContainer.get<WatchlistService>(WATCHLIST_DI_TOKENS.WATCHLIST_SERVICE);
+}
+
+export function getGlobalBlockingService() {
+  return watchlistContainer.get<GlobalBlockingService>(WATCHLIST_DI_TOKENS.GLOBAL_BLOCKING_SERVICE);
+}
+
+export function getOrganizationBlockingService() {
+  return watchlistContainer.get<OrganizationBlockingService>(
+    WATCHLIST_DI_TOKENS.ORGANIZATION_BLOCKING_SERVICE
+  );
+}
+
+export function getAuditService() {
+  return watchlistContainer.get<WatchlistAuditService>(WATCHLIST_DI_TOKENS.AUDIT_SERVICE);
+}
+
+export function getGlobalWatchlistRepository() {
+  return watchlistContainer.get<IGlobalWatchlistRepository>(WATCHLIST_DI_TOKENS.GLOBAL_WATCHLIST_REPOSITORY);
+}
+
+export function getOrganizationWatchlistRepository() {
+  return watchlistContainer.get<IOrganizationWatchlistRepository>(
+    WATCHLIST_DI_TOKENS.ORGANIZATION_WATCHLIST_REPOSITORY
+  );
+}
+
+export async function getWatchlistFeature(): Promise<WatchlistFeature> {
+  return createWatchlistFeature(watchlistContainer);
+}
diff --git a/packages/features/di/watchlist/modules/Watchlist.module.ts b/packages/features/di/watchlist/modules/Watchlist.module.ts
new file mode 100644
index 00000000000000..243c01eabba81b
--- /dev/null
+++ b/packages/features/di/watchlist/modules/Watchlist.module.ts
@@ -0,0 +1,36 @@
+import { createModule } from "@evyweb/ioctopus";
+
+import { DI_TOKENS } from "@calcom/features/di/tokens";
+import { GlobalWatchlistRepository } from "@calcom/features/watchlist/lib/repository/GlobalWatchlistRepository";
+import { OrganizationWatchlistRepository } from "@calcom/features/watchlist/lib/repository/OrganizationWatchlistRepository";
+import { PrismaWatchlistAuditRepository } from "@calcom/features/watchlist/lib/repository/PrismaWatchlistAuditRepository";
+
+import { WATCHLIST_DI_TOKENS } from "../Watchlist.tokens";
+import { GlobalBlockingService } from "@calcom/features/watchlist/lib/service/GlobalBlockingService";
+import { OrganizationBlockingService } from "@calcom/features/watchlist/lib/service/OrganizationBlockingService";
+
+export const watchlistModule = createModule();
+
+watchlistModule.bind(WATCHLIST_DI_TOKENS.GLOBAL_BLOCKING_SERVICE).toClass(GlobalBlockingService, {
+  globalRepo: DI_TOKENS.GLOBAL_WATCHLIST_REPOSITORY,
+});
+
+watchlistModule.bind(WATCHLIST_DI_TOKENS.ORGANIZATION_BLOCKING_SERVICE).toClass(OrganizationBlockingService,{
+  orgRepo: DI_TOKENS.ORGANIZATION_WATCHLIST_REPOSITORY,
+});
+
+// Bind specialized repositories
+watchlistModule
+  .bind(WATCHLIST_DI_TOKENS.GLOBAL_WATCHLIST_REPOSITORY)
+  .toClass(GlobalWatchlistRepository, [DI_TOKENS.PRISMA_CLIENT]);
+
+watchlistModule
+  .bind(WATCHLIST_DI_TOKENS.ORGANIZATION_WATCHLIST_REPOSITORY)
+  .toClass(OrganizationWatchlistRepository, [DI_TOKENS.PRISMA_CLIENT]);
+
+// Bind remaining repositories
+watchlistModule
+  .bind(WATCHLIST_DI_TOKENS.AUDIT_REPOSITORY)
+  .toClass(PrismaWatchlistAuditRepository, [DI_TOKENS.PRISMA_CLIENT]);
+
+// Services are created in the facade to handle Deps pattern properly
diff --git a/packages/lib/__tests__/autoLock.test.ts b/packages/features/ee/api-keys/lib/autoLock.test.ts
similarity index 99%
rename from packages/lib/__tests__/autoLock.test.ts
rename to packages/features/ee/api-keys/lib/autoLock.test.ts
index b92847a84dc3ce..97ec4c9b9b45ff 100644
--- a/packages/lib/__tests__/autoLock.test.ts
+++ b/packages/features/ee/api-keys/lib/autoLock.test.ts
@@ -5,7 +5,7 @@ import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
 import { RedisService } from "@calcom/features/redis/RedisService";
 import prisma from "@calcom/prisma";
 
-import { handleAutoLock } from "../autoLock";
+import { handleAutoLock } from "./autoLock";
 
 // Mock the dependencies
 vi.mock("@calcom/features/redis/RedisService");
diff --git a/packages/lib/autoLock.ts b/packages/features/ee/api-keys/lib/autoLock.ts
similarity index 98%
rename from packages/lib/autoLock.ts
rename to packages/features/ee/api-keys/lib/autoLock.ts
index b22c2474542c14..3334c616540e51 100644
--- a/packages/lib/autoLock.ts
+++ b/packages/features/ee/api-keys/lib/autoLock.ts
@@ -1,10 +1,10 @@
 import type { RatelimitResponse } from "@unkey/ratelimit";
 
-import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
 import { RedisService } from "@calcom/features/redis/RedisService";
+import logger from "@calcom/lib/logger";
 import prisma from "@calcom/prisma";
 
-import logger from "./logger";
+import { hashAPIKey } from "./apiKeys";
 
 // This is the number of times a user can exceed the rate limit before being locked
 const DEFAULT_AUTOLOCK_THRESHOLD = 5;
diff --git a/packages/features/ee/billing/api/webhook/_invoice.paid.org.ts b/packages/features/ee/billing/api/webhook/_invoice.paid.org.ts
index 739b2a15dc0244..317bc027e558c4 100644
--- a/packages/features/ee/billing/api/webhook/_invoice.paid.org.ts
+++ b/packages/features/ee/billing/api/webhook/_invoice.paid.org.ts
@@ -1,11 +1,15 @@
 import { z } from "zod";
 
 import { Plan, SubscriptionStatus } from "@calcom/features/ee/billing/repository/IBillingRepository";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { InternalTeamBilling } from "@calcom/features/ee/billing/teams/internal-team-billing";
-import { createOrganizationFromOnboarding } from "@calcom/features/ee/organizations/lib/server/createOrganizationFromOnboarding";
+import { BillingEnabledOrgOnboardingService } from "@calcom/features/ee/organizations/lib/service/onboarding/BillingEnabledOrgOnboardingService";
+import stripe from "@calcom/features/ee/payments/server/stripe";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
+import { prisma } from "@calcom/prisma";
 
 import type { SWHMap } from "./__handler";
 
@@ -90,12 +94,37 @@ const handler = async (data: SWHMap["invoice.paid"]["data"]) => {
       };
     }
 
-    const { organization } = await createOrganizationFromOnboarding({
-      organizationOnboarding,
-      paymentSubscriptionId,
-      paymentSubscriptionItemId,
+    // Get the user who created the onboarding (for service instantiation)
+    const userRepo = new UserRepository(prisma);
+    const creator = organizationOnboarding.createdById
+      ? await userRepo.findById({ id: organizationOnboarding.createdById })
+      : null;
+
+    // Create a minimal user context for the service
+    // If no creator, use a system user context (webhook is system-initiated)
+    const userContext = creator
+      ? {
+          id: creator.id,
+          email: creator.email,
+          role: "ADMIN" as const,
+          name: creator.name || undefined,
+        }
+      : {
+          id: 0, // System user
+          email: organizationOnboarding.orgOwnerEmail,
+          role: "ADMIN" as const,
+        };
+
+    const onboardingService = new BillingEnabledOrgOnboardingService(userContext);
+    const { organization } = await onboardingService.createOrganization(organizationOnboarding, {
+      subscriptionId: paymentSubscriptionId,
+      subscriptionItemId: paymentSubscriptionItemId,
     });
 
+    // Get the Stripe subscription object
+    const stripeSubscription = await stripe.subscriptions.retrieve(paymentSubscriptionId);
+    const { subscriptionStart } = StripeBillingService.extractSubscriptionDates(stripeSubscription);
+
     const internalTeamBillingService = new InternalTeamBilling(organization);
     await internalTeamBillingService.saveTeamBilling({
       teamId: organization.id,
@@ -105,6 +134,7 @@ const handler = async (data: SWHMap["invoice.paid"]["data"]) => {
       // TODO: Write actual status when webhook events are added
       status: SubscriptionStatus.ACTIVE,
       planName: Plan.ORGANIZATION,
+      subscriptionStart,
     });
 
     logger.debug(`Marking onboarding as complete for organization ${organization.id}`);
diff --git a/packages/features/ee/billing/billing-service-factory.ts b/packages/features/ee/billing/billing-service-factory.ts
index 16ae5bbee69742..aa26ea520cab16 100644
--- a/packages/features/ee/billing/billing-service-factory.ts
+++ b/packages/features/ee/billing/billing-service-factory.ts
@@ -1,4 +1,4 @@
-import { StripeBillingService } from "./stripe-billling-service";
+import { StripeBillingService } from "./stripe-billing-service";
 
 export class BillingFactory {
   constructor() {
diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index 95d6f1a47230ad..76addb2cd62c8b 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -5,12 +5,12 @@ import dayjs from "@calcom/dayjs";
 import * as EmailManager from "@calcom/emails/email-manager";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { CreditType } from "@calcom/prisma/enums";
 
 import { CreditService } from "./credit-service";
-import { StripeBillingService } from "./stripe-billling-service";
+import { StripeBillingService } from "./stripe-billing-service";
 import { InternalTeamBilling } from "./teams/internal-team-billing";
 
 const MOCK_TX = {
@@ -66,8 +66,8 @@ vi.mock("@calcom/prisma/enums", async (importOriginal) => {
 });
 
 vi.mock("@calcom/lib/server/repository/credits");
-vi.mock("@calcom/lib/server/repository/membership");
-vi.mock("@calcom/lib/server/repository/team");
+vi.mock("@calcom/features/membership/repositories/MembershipRepository");
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
 vi.mock("@calcom/emails/email-manager");
 vi.mock("../workflows/lib/reminders/reminderScheduler", () => ({
   cancelScheduledMessagesAndScheduleEmails: vi.fn().mockResolvedValue(undefined),
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 31f5957c2d6450..3694d7c3ac2994 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -5,7 +5,7 @@ import {
   sendCreditBalanceLimitReachedEmails,
   sendCreditBalanceLowWarningEmails,
 } from "@calcom/emails/email-manager";
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { InternalTeamBilling } from "@calcom/features/ee/billing/teams/internal-team-billing";
 import { cancelScheduledMessagesAndScheduleEmails } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
 import { IS_SMS_CREDITS_ENABLED } from "@calcom/lib/constants";
@@ -13,8 +13,8 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma, { type PrismaTransaction } from "@calcom/prisma";
 import { CreditUsageType, CreditType } from "@calcom/prisma/enums";
 
@@ -738,4 +738,65 @@ export class CreditService {
       totalCreditsUsedThisMonth,
     };
   }
+
+  async moveCreditsFromTeamToOrg({ teamId, orgId }: { teamId: number; orgId: number }) {
+    return await prisma.$transaction(async (tx) => {
+      // Get team's credit balance
+      const teamCreditBalance = await CreditsRepository.findCreditBalance({ teamId }, tx);
+
+      if (!teamCreditBalance || teamCreditBalance.additionalCredits <= 0) {
+        log.info("No credits to transfer from team to org", { teamId, orgId });
+        return;
+      }
+
+      // Get or create org's credit balance
+      let orgCreditBalance = await CreditsRepository.findCreditBalance({ teamId: orgId }, tx);
+
+      if (!orgCreditBalance) {
+        orgCreditBalance = await CreditsRepository.createCreditBalance(
+          {
+            teamId: orgId,
+          },
+          tx
+        );
+      }
+
+      const creditsToTransfer = teamCreditBalance.additionalCredits;
+
+      // Transfer credits from team to org
+      await CreditsRepository.updateCreditBalance(
+        {
+          teamId,
+          data: {
+            additionalCredits: 0,
+          },
+        },
+        tx
+      );
+
+      await CreditsRepository.updateCreditBalance(
+        {
+          teamId: orgId,
+          data: {
+            additionalCredits: {
+              increment: creditsToTransfer,
+            },
+          },
+        },
+        tx
+      );
+
+      log.info("Successfully transferred credits from team to org", {
+        teamId,
+        orgId,
+        creditsTransferred: creditsToTransfer,
+      });
+
+      return {
+        creditsTransferred: creditsToTransfer,
+        teamId,
+        orgId,
+      };
+    });
+  }
 }
diff --git a/packages/features/ee/billing/repository/IBillingRepository.ts b/packages/features/ee/billing/repository/IBillingRepository.ts
index 0d5e619178db18..9a8e44592c18c3 100644
--- a/packages/features/ee/billing/repository/IBillingRepository.ts
+++ b/packages/features/ee/billing/repository/IBillingRepository.ts
@@ -9,6 +9,10 @@ export enum SubscriptionStatus {
   CANCELLED = "CANCELLED",
   PAST_DUE = "PAST_DUE",
   TRIALING = "TRIALING",
+  INCOMPLETE = "INCOMPLETE",
+  INCOMPLETE_EXPIRED = "INCOMPLETE_EXPIRED",
+  UNPAID = "UNPAID",
+  PAUSED = "PAUSED",
 }
 
 export interface BillingRecord {
@@ -37,4 +41,7 @@ export interface IBillingRepositoryCreateArgs {
   customerId: string;
   planName: Plan;
   status: SubscriptionStatus;
+  subscriptionStart?: Date;
+  subscriptionTrialEnd?: Date;
+  subscriptionEnd?: Date;
 }
diff --git a/packages/features/ee/billing/stripe-billling-service.test.ts b/packages/features/ee/billing/stripe-billing-service.test.ts
similarity index 97%
rename from packages/features/ee/billing/stripe-billling-service.test.ts
rename to packages/features/ee/billing/stripe-billing-service.test.ts
index dd0384af248796..b39db4e4bbc59e 100644
--- a/packages/features/ee/billing/stripe-billling-service.test.ts
+++ b/packages/features/ee/billing/stripe-billing-service.test.ts
@@ -1,7 +1,7 @@
 import Stripe from "stripe";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
-import { StripeBillingService } from "./stripe-billling-service";
+import { StripeBillingService } from "./stripe-billing-service";
 
 vi.mock("stripe");
 
diff --git a/packages/features/ee/billing/stripe-billling-service.ts b/packages/features/ee/billing/stripe-billing-service.ts
similarity index 76%
rename from packages/features/ee/billing/stripe-billling-service.ts
rename to packages/features/ee/billing/stripe-billing-service.ts
index a0be6aa29acd5c..54c2a114ed8609 100644
--- a/packages/features/ee/billing/stripe-billling-service.ts
+++ b/packages/features/ee/billing/stripe-billing-service.ts
@@ -1,6 +1,9 @@
 import Stripe from "stripe";
 
+import logger from "@calcom/lib/logger";
+
 import type { BillingService } from "./billing-service";
+import { SubscriptionStatus } from "./repository/IBillingRepository";
 
 export class StripeBillingService implements BillingService {
   private stripe: Stripe;
@@ -58,6 +61,7 @@ export class StripeBillingService implements BillingService {
       invoice_creation: {
         enabled: true,
       },
+      // eslint-disable-next-line
     } as any);
 
     return {
@@ -127,7 +131,7 @@ export class StripeBillingService implements BillingService {
   }
 
   async handleSubscriptionCreation(subscriptionId: string) {
-    throw new Error("Method not implemented.");
+    throw new Error(`Method not implemented for subscription id ${subscriptionId}`);
   }
 
   async handleSubscriptionCancel(subscriptionId: string) {
@@ -196,4 +200,45 @@ export class StripeBillingService implements BillingService {
     const price = await this.stripe.prices.retrieve(priceId);
     return price;
   }
+
+  static extractSubscriptionDates(subscription: {
+    start_date: number;
+    trial_end?: number | null;
+    cancel_at?: number | null;
+  }) {
+    // Stripe returns dates as unix time in seconds but Date() expects milliseconds
+    const subscriptionStart = new Date(subscription.start_date * 1000);
+    const subscriptionTrialEnd = subscription?.trial_end ? new Date(subscription.trial_end * 1000) : null;
+    const subscriptionEnd = subscription?.cancel_at ? new Date(subscription.cancel_at * 1000) : null;
+
+    return { subscriptionStart, subscriptionTrialEnd, subscriptionEnd };
+  }
+
+  static mapStripeStatusToCalStatus = ({
+    stripeStatus,
+    subscriptionId,
+  }: {
+    stripeStatus: string;
+    subscriptionId: string;
+  }) => {
+    const log = logger.getSubLogger({ prefix: ["mapStripeStatusToCalStatus"] });
+    const statusMap: Record<string, SubscriptionStatus> = {
+      active: SubscriptionStatus.ACTIVE,
+      past_due: SubscriptionStatus.PAST_DUE,
+      canceled: SubscriptionStatus.CANCELLED,
+      cancelled: SubscriptionStatus.CANCELLED,
+      trialing: SubscriptionStatus.TRIALING,
+      incomplete: SubscriptionStatus.INCOMPLETE,
+      incomplete_expired: SubscriptionStatus.INCOMPLETE_EXPIRED,
+      unpaid: SubscriptionStatus.UNPAID,
+      paused: SubscriptionStatus.PAUSED,
+    };
+
+    const status = statusMap[stripeStatus];
+    if (!status) {
+      log.warn(`Unhandled status for ${stripeStatus} and sub id ${subscriptionId}`);
+    }
+
+    return status || SubscriptionStatus.ACTIVE;
+  };
 }
diff --git a/packages/lib/service/attribute/server/assignValueToUser.test.ts b/packages/features/ee/dsync/lib/assignValueToUser.test.ts
similarity index 99%
rename from packages/lib/service/attribute/server/assignValueToUser.test.ts
rename to packages/features/ee/dsync/lib/assignValueToUser.test.ts
index 0ebaf2e5fed7fd..955daf9833ba56 100644
--- a/packages/lib/service/attribute/server/assignValueToUser.test.ts
+++ b/packages/features/ee/dsync/lib/assignValueToUser.test.ts
@@ -801,7 +801,6 @@ describe("addValueForMember", () => {
           membershipId: membership.id,
           // Engineering
           attributeOptionId: "101",
-          //@ts-expect-error - prismock can't handle string ids it seems
           dsyncId: dsync.id,
         });
 
diff --git a/packages/lib/service/attribute/server/assignValueToUser.ts b/packages/features/ee/dsync/lib/assignValueToUser.ts
similarity index 96%
rename from packages/lib/service/attribute/server/assignValueToUser.ts
rename to packages/features/ee/dsync/lib/assignValueToUser.ts
index b26933bee1a6d8..53b6563f6e8aa9 100644
--- a/packages/lib/service/attribute/server/assignValueToUser.ts
+++ b/packages/features/ee/dsync/lib/assignValueToUser.ts
@@ -1,11 +1,15 @@
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import prisma from "@calcom/prisma";
-
-import { PrismaAttributeOptionRepository } from "../../../server/repository/PrismaAttributeOptionRepository";
-import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository";
-import { MembershipRepository } from "../../../server/repository/membership";
-import type { AttributeId, AttributeName, BulkAttributeAssigner, AttributeOptionAssignment } from "../types";
+import { PrismaAttributeOptionRepository } from "@calcom/lib/server/repository/PrismaAttributeOptionRepository";
+import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import { findAssignmentsForMember } from "@calcom/lib/service/attribute/server/utils";
+import type {
+  AttributeId,
+  AttributeName,
+  BulkAttributeAssigner,
+  AttributeOptionAssignment,
+} from "@calcom/lib/service/attribute/types";
 import {
   doesSupportMultipleValues,
   isAssignmentForLockedAttribute,
@@ -13,8 +17,8 @@ import {
   isAssignmentSame,
   buildSlugFromValue,
   canSetValueBeyondOptions,
-} from "../utils";
-import { findAssignmentsForMember } from "./utils";
+} from "@calcom/lib/service/attribute/utils";
+import prisma from "@calcom/prisma";
 
 const log = logger.getSubLogger({ prefix: ["entity/attribute"] });
 
diff --git a/packages/features/ee/dsync/lib/handleGroupEvents.ts b/packages/features/ee/dsync/lib/handleGroupEvents.ts
index f067d7e206bada..27cca705a18640 100644
--- a/packages/features/ee/dsync/lib/handleGroupEvents.ts
+++ b/packages/features/ee/dsync/lib/handleGroupEvents.ts
@@ -4,7 +4,7 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { addNewMembersToEventTypes } from "@calcom/features/ee/teams/lib/queries";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import prisma from "@calcom/prisma";
 import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums";
 import {
diff --git a/packages/features/ee/dsync/lib/handleUserEvents.ts b/packages/features/ee/dsync/lib/handleUserEvents.ts
index 6aad0be17bca87..bee2c1fe67343a 100644
--- a/packages/features/ee/dsync/lib/handleUserEvents.ts
+++ b/packages/features/ee/dsync/lib/handleUserEvents.ts
@@ -1,11 +1,10 @@
 import type { DirectorySyncEvent, User } from "@boxyhq/saml-jackson";
 
 import removeUserFromOrg from "@calcom/features/ee/dsync/lib/removeUserFromOrg";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { UserRepository } from "@calcom/lib/server/repository/user";
-import { assignValueToUserInOrgBulk } from "@calcom/lib/service/attribute/server/assignValueToUser";
 import prisma from "@calcom/prisma";
 import { IdentityProvider } from "@calcom/prisma/enums";
 import { getTeamOrThrow } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
@@ -13,6 +12,7 @@ import type { UserWithMembership } from "@calcom/trpc/server/routers/viewer/team
 import { sendExistingUserTeamInviteEmails } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
 import { sendSignupToOrganizationEmail } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
 
+import { assignValueToUserInOrgBulk } from "./assignValueToUser";
 import getAttributesFromScimPayload from "./getAttributesFromScimPayload";
 import createUsersAndConnectToOrg from "./users/createUsersAndConnectToOrg";
 import dSyncUserSelect from "./users/dSyncUserSelect";
diff --git a/packages/features/ee/dsync/lib/inviteExistingUserToOrg.ts b/packages/features/ee/dsync/lib/inviteExistingUserToOrg.ts
index c2b8733e558932..2ca346f8f371ad 100644
--- a/packages/features/ee/dsync/lib/inviteExistingUserToOrg.ts
+++ b/packages/features/ee/dsync/lib/inviteExistingUserToOrg.ts
@@ -1,6 +1,6 @@
 import type { TFunction } from "i18next";
 
-import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import prisma from "@calcom/prisma";
 import { sendExistingUserTeamInviteEmails } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
 import type { UserWithMembership } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
diff --git a/packages/features/ee/dsync/lib/removeUserFromOrg.ts b/packages/features/ee/dsync/lib/removeUserFromOrg.ts
index cc26ee886928f9..e7fe108b5f3c8e 100644
--- a/packages/features/ee/dsync/lib/removeUserFromOrg.ts
+++ b/packages/features/ee/dsync/lib/removeUserFromOrg.ts
@@ -1,4 +1,4 @@
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 
 const removeUserFromOrg = async ({ userId, orgId }: { userId: number; orgId: number }) => {
   return TeamService.removeMembers({ teamIds: [orgId], userIds: [userId], isOrg: true });
diff --git a/packages/features/ee/dsync/lib/users/createUsersAndConnectToOrg.ts b/packages/features/ee/dsync/lib/users/createUsersAndConnectToOrg.ts
index 6676a8fdb89077..51e2cfbb99a9c0 100644
--- a/packages/features/ee/dsync/lib/users/createUsersAndConnectToOrg.ts
+++ b/packages/features/ee/dsync/lib/users/createUsersAndConnectToOrg.ts
@@ -1,5 +1,5 @@
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import prisma from "@calcom/prisma";
 import type { IdentityProvider } from "@calcom/prisma/enums";
 import { CreationSource, MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/features/ee/dsync/lib/users/inviteExistingUserToOrg.ts b/packages/features/ee/dsync/lib/users/inviteExistingUserToOrg.ts
index a382b7f1c91709..fdcd8facc1fce6 100644
--- a/packages/features/ee/dsync/lib/users/inviteExistingUserToOrg.ts
+++ b/packages/features/ee/dsync/lib/users/inviteExistingUserToOrg.ts
@@ -1,6 +1,6 @@
 import type { TFunction } from "i18next";
 
-import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import prisma from "@calcom/prisma";
 import type { UserWithMembership } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
 
diff --git a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts b/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
index 05009cc9f9d95b..7ba23bcaa776f2 100644
--- a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
+++ b/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
@@ -6,7 +6,7 @@ import { ensureOrganizationIsReviewed } from "@calcom/ee/organizations/lib/ensur
 import { getOrgFullOrigin, subdomainSuffix } from "@calcom/ee/organizations/lib/orgDomains";
 import { getSession } from "@calcom/features/auth/lib/getSession";
 import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import prisma from "@calcom/prisma";
 import type { User } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
diff --git a/packages/lib/server/repository/__mocks__/organization.ts b/packages/features/ee/organizations/__mocks__/organizationMock.ts
similarity index 86%
rename from packages/lib/server/repository/__mocks__/organization.ts
rename to packages/features/ee/organizations/__mocks__/organizationMock.ts
index 3ac1c60cbdf22d..0c7e23d9aeb4f3 100644
--- a/packages/lib/server/repository/__mocks__/organization.ts
+++ b/packages/features/ee/organizations/__mocks__/organizationMock.ts
@@ -1,9 +1,9 @@
 import { vi, beforeEach } from "vitest";
 import { mockReset, mockDeep } from "vitest-mock-extended";
 
-import type * as organization from "@calcom/lib/server/repository/organization";
+import type * as organization from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
-vi.mock("@calcom/lib/server/repository/organization", () => organizationMock);
+vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository", () => organizationMock);
 type OrganizationModule = typeof organization;
 beforeEach(() => {
   mockReset(organizationMock);
diff --git a/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx b/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
index 964eeffbed0e07..cc5152d1689e68 100644
--- a/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
+++ b/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
@@ -1,50 +1,79 @@
 "use client";
 
 import { useSession } from "next-auth/react";
+import { useRouter } from "next/navigation";
 
+import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { showToast } from "@calcom/ui/components/toast";
+import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
 
 export const AdminOnboardingHandover = () => {
   const { t } = useLocale();
+  const router = useRouter();
   const session = useSession();
   const isAdmin = session.data?.user.role === "ADMIN";
+  const { useOnboardingStore } = useOnboarding();
+  const { onboardingId, orgOwnerEmail } = useOnboardingStore();
 
   if (!isAdmin) {
     return null;
   }
 
-  const onboardingUrl = `${WEBAPP_URL}/settings/organizations/new`;
+  // Admin handover page should ONLY use store data, not DB query
+  // The DB query returns the admin's own onboarding, not the one being handed over
+  if (!onboardingId) {
+    return <Alert severity="error" title={t("error")} message="No onboarding ID found. Please try again." />;
+  }
+
+  const onboardingUrl = `${WEBAPP_URL}/settings/organizations/new/resume?onboardingId=${onboardingId}`;
 
   return (
-    <div className="bg-subtle rounded-md p-4">
-      <div className="flex-col items-center gap-2">
-        <span className="text-emphasis font-medium">
-          User can now continue onboarding with the following link
-        </span>
-        <div className="mt-2 flex items-center gap-2">
-          <code
-            data-testid="onboarding-url"
-            className="bg-default text-default flex w-full items-center truncate rounded-md px-3 py-2 font-mono text-sm">
-            {onboardingUrl}
-          </code>
-          <Button
-            data-testid="copy-onboarding-url"
-            type="button"
-            variant="icon"
-            color="secondary"
-            className="h-9 w-9"
-            onClick={() => {
-              navigator.clipboard.writeText(onboardingUrl);
-              showToast(t("link_copied"), "success");
-            }}
-            StartIcon="clipboard"
-            tooltip={t("copy_to_clipboard")}
-          />
+    <div className="space-y-6">
+      {/* Instructions Card */}
+      <div className="bg-subtle rounded-lg p-6">
+        <h3 className="text-emphasis mb-2 text-lg font-medium">{t("next_steps")}</h3>
+        <p className="text-default mb-4 text-sm">
+          Send the following link to <strong>{orgOwnerEmail}</strong> so they can complete the organization
+          setup:
+        </p>
+
+        <div className="space-y-3">
+          <div className="bg-default flex items-center gap-2 rounded-md border p-3">
+            <code className="text-default flex-1 truncate font-mono text-sm" data-testid="onboarding-url">
+              {onboardingUrl}
+            </code>
+            <Button
+              data-testid="copy-onboarding-url"
+              type="button"
+              size="sm"
+              color="secondary"
+              onClick={() => {
+                navigator.clipboard.writeText(onboardingUrl);
+                showToast(t("link_copied"), "success");
+              }}
+              StartIcon="clipboard">
+              {t("copy")}
+            </Button>
+          </div>
         </div>
       </div>
+
+      {/* Actions */}
+      <div className="flex items-center justify-between">
+        <Button color="minimal" StartIcon="arrow-left" onClick={() => router.push("/settings/organizations")}>
+          {t("back")}
+        </Button>
+        <Button
+          color="primary"
+          onClick={() => {
+            router.push("/event-types");
+          }}>
+          {t("done")}
+        </Button>
+      </div>
     </div>
   );
 };
diff --git a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
index c4d8926d9fd763..eb2afa6ced2b07 100644
--- a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
+++ b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
@@ -10,8 +10,7 @@ import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomain
 import { MINIMUM_NUMBER_OF_ORG_SEATS, IS_SELF_HOSTED } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import slugify from "@calcom/lib/slugify";
-import { CreationSource } from "@calcom/prisma/enums";
-import { UserPermissionRole } from "@calcom/prisma/enums";
+import { BillingPeriod, CreationSource, UserPermissionRole } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import type { Ensure } from "@calcom/types/utils";
 import classNames from "@calcom/ui/classNames";
@@ -37,7 +36,7 @@ function extractDomainFromEmail(email: string) {
 export const CreateANewOrganizationForm = () => {
   const session = useSession();
 
-  const { isLoadingOrgOnboarding } = useOnboarding({ step: "start" });
+  const { isLoadingOrgOnboarding } = useOnboarding();
   if (!session.data || isLoadingOrgOnboarding) {
     return null;
   }
@@ -45,11 +44,6 @@ export const CreateANewOrganizationForm = () => {
   return <CreateANewOrganizationFormChild session={session} />;
 };
 
-enum BillingPeriod {
-  MONTHLY = "MONTHLY",
-  ANNUALLY = "ANNUALLY",
-}
-
 const CreateANewOrganizationFormChild = ({ session }: { session: Ensure<SessionContextValue, "data"> }) => {
   const { t } = useLocale();
   const router = useRouter();
@@ -57,7 +51,7 @@ const CreateANewOrganizationFormChild = ({ session }: { session: Ensure<SessionC
   const isAdmin = session.data.user.role === UserPermissionRole.ADMIN;
   // Let self-hosters create an organization with their own email. Hosted's Admin already has an organization for their email
   const defaultOrgOwnerEmail = (!isAdmin || IS_SELF_HOSTED ? session.data.user.email : null) ?? "";
-  const { useOnboardingStore, isBillingEnabled } = useOnboarding({ step: "start" });
+  const { useOnboardingStore, isBillingEnabled } = useOnboarding();
   const { slug, name, orgOwnerEmail, billingPeriod, pricePerSeat, seats, onboardingId, reset } =
     useOnboardingStore();
 
@@ -81,8 +75,6 @@ const CreateANewOrganizationFormChild = ({ session }: { session: Ensure<SessionC
 
   const intentToCreateOrgMutation = trpc.viewer.organizations.intentToCreateOrg.useMutation({
     onSuccess: async (data) => {
-      // TODO: To be moved to _invoice.paid.org.ts
-      // telemetry.event(telemetryEventTypes.org_created);
       reset({
         onboardingId: data.organizationOnboardingId,
         billingPeriod: data.billingPeriod,
@@ -93,9 +85,17 @@ const CreateANewOrganizationFormChild = ({ session }: { session: Ensure<SessionC
         slug: data.slug,
       });
 
-      if (isAdmin && data.userId !== session.data.user.id) {
+      // Small delay to ensure Zustand persist middleware has time to write to localStorage
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      if (data.handoverUrl) {
+        // Admin handover flow - redirect to handover page
         router.push("/settings/organizations/new/handover");
+      } else if (data.organizationId) {
+        // Self-hosted flow - org already created, redirect to organizations list
+        router.push("/settings/organizations");
       } else {
+        // Regular flow - continue to next step
         router.push("/settings/organizations/new/about");
       }
     },
@@ -122,10 +122,30 @@ const CreateANewOrganizationFormChild = ({ session }: { session: Ensure<SessionC
         id="createOrg"
         handleSubmit={async (v) => {
           if (!needToCreateOnboarding) {
+            // Resuming existing onboarding - just navigate to next step
             router.push("/settings/organizations/new/about");
-          } else if (!intentToCreateOrgMutation.isPending) {
-            setServerErrorMessage(null);
-            intentToCreateOrgMutation.mutate({ ...v, creationSource: CreationSource.WEBAPP });
+          } else {
+            // Check if this is admin handover flow based on the submitted form value
+            const isAdminHandoverFlow = isAdmin && v.orgOwnerEmail !== session.data.user.email;
+
+            if (isAdminHandoverFlow) {
+              // Admin creating for someone else - submit immediately with just Step 1 data
+              if (!intentToCreateOrgMutation.isPending) {
+                setServerErrorMessage(null);
+                intentToCreateOrgMutation.mutate({ ...v, creationSource: CreationSource.WEBAPP });
+              }
+            } else {
+              // Regular user or admin creating for self - store locally and continue
+              reset({
+                billingPeriod: v.billingPeriod,
+                pricePerSeat: v.pricePerSeat,
+                seats: v.seats,
+                orgOwnerEmail: v.orgOwnerEmail,
+                name: v.name,
+                slug: v.slug,
+              });
+              router.push("/settings/organizations/new/about");
+            }
           }
         }}>
         <div>
diff --git a/packages/features/ee/organizations/lib/OrganizationPaymentService.test.ts b/packages/features/ee/organizations/lib/OrganizationPaymentService.test.ts
index b516ca3866bf71..9a48ba4b203705 100644
--- a/packages/features/ee/organizations/lib/OrganizationPaymentService.test.ts
+++ b/packages/features/ee/organizations/lib/OrganizationPaymentService.test.ts
@@ -42,7 +42,7 @@ vi.mock("@calcom/prisma", () => {
   };
 });
 
-vi.mock("@calcom/features/ee/billing/stripe-billling-service", () => ({
+vi.mock("@calcom/features/ee/billing/stripe-billing-service", () => ({
   StripeBillingService: vi.fn().mockImplementation(() => ({
     createCustomer: vi.fn().mockResolvedValue({ id: "mock_customer_id" }),
     createPrice: vi.fn().mockResolvedValue({ id: "mock_price_id", isCustom: false }),
@@ -135,6 +135,8 @@ describe("OrganizationPaymentService", () => {
       expect(data).toEqual({
         bio: "BIO",
         logo: "LOGO",
+        brandColor: null,
+        bannerUrl: null,
         teams: [
           {
             id: 1,
@@ -183,6 +185,8 @@ describe("OrganizationPaymentService", () => {
       expect(data).toEqual({
         bio: "BIO",
         logo: "LOGO",
+        brandColor: null,
+        bannerUrl: null,
         teams: [
           {
             id: 1,
@@ -232,6 +236,9 @@ describe("OrganizationPaymentService", () => {
         expect(data).toEqual({
           bio: "BIO",
           logo: "LOGO",
+          brandColor: null,
+          bannerUrl: null,
+          invitedMembers: undefined,
           teams: [
             {
               id: 1,
@@ -261,6 +268,9 @@ describe("OrganizationPaymentService", () => {
         expect(data).toEqual({
           bio: "BIO",
           logo: "LOGO",
+          brandColor: null,
+          bannerUrl: null,
+          invitedMembers: undefined,
           teams: [
             {
               id: 1,
diff --git a/packages/features/ee/organizations/lib/OrganizationPaymentService.ts b/packages/features/ee/organizations/lib/OrganizationPaymentService.ts
index 62f6b184535275..18da38affa8ead 100644
--- a/packages/features/ee/organizations/lib/OrganizationPaymentService.ts
+++ b/packages/features/ee/organizations/lib/OrganizationPaymentService.ts
@@ -1,4 +1,5 @@
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import {
   ORGANIZATION_SELF_SERVE_MIN_SEATS,
   ORGANIZATION_SELF_SERVE_PRICE,
@@ -7,24 +8,25 @@ import {
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
-import { UserRepository } from "@calcom/lib/server/repository/user";
 import { prisma } from "@calcom/prisma";
 import type { OrganizationOnboarding } from "@calcom/prisma/client";
 import { UserPermissionRole, type BillingPeriod } from "@calcom/prisma/enums";
 import { userMetadata } from "@calcom/prisma/zod-utils";
-import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";
 
 import { OrganizationPermissionService } from "./OrganizationPermissionService";
+import type { OnboardingUser } from "./service/onboarding/types";
 
 type OrganizationOnboardingId = string;
 const log = logger.getSubLogger({ prefix: ["OrganizationPaymentService"] });
 type CreatePaymentIntentInput = {
   logo: string | null;
   bio: string | null;
+  brandColor?: string | null;
+  bannerUrl?: string | null;
   teams?: { id: number; isBeingMigrated: boolean; slug: string | null; name: string }[];
-  invitedMembers?: { email: string }[];
+  invitedMembers?: { email: string; name?: string; teamId?: number; teamName?: string }[];
 };
 
 type CreateOnboardingInput = {
@@ -35,6 +37,12 @@ type CreateOnboardingInput = {
   seats?: number | null;
   pricePerSeat?: number | null;
   createdByUserId: number;
+  logo?: string | null;
+  bio?: string | null;
+  brandColor?: string | null;
+  bannerUrl?: string | null;
+  teams?: { id: number; isBeingMigrated: boolean; slug: string | null; name: string }[];
+  invitedMembers?: { email: string; name?: string; teamId?: number; teamName?: string; role?: string }[];
 };
 
 type PermissionCheckInput = {
@@ -72,9 +80,9 @@ type StripePrice = {
 export class OrganizationPaymentService {
   protected billingService: StripeBillingService;
   protected permissionService: OrganizationPermissionService;
-  protected user: NonNullable<TrpcSessionUser>;
+  protected user: OnboardingUser;
 
-  constructor(user: NonNullable<TrpcSessionUser>, permissionService?: OrganizationPermissionService) {
+  constructor(user: OnboardingUser, permissionService?: OrganizationPermissionService) {
     this.billingService = new StripeBillingService();
     this.permissionService = permissionService || new OrganizationPermissionService(user);
     this.user = user;
@@ -191,6 +199,12 @@ export class OrganizationPaymentService {
       seats: config.seats,
       pricePerSeat: config.pricePerSeat,
       createdById: input.createdByUserId,
+      logo: input.logo ?? null,
+      bio: input.bio ?? null,
+      brandColor: input.brandColor ?? null,
+      bannerUrl: input.bannerUrl ?? null,
+      teams: input.teams ?? [],
+      invitedMembers: input.invitedMembers ?? [],
     });
   }
 
@@ -287,7 +301,7 @@ export class OrganizationPaymentService {
   ) {
     log.debug("createPaymentIntent", safeStringify(input));
 
-    const { teams: _teams, invitedMembers, logo, bio } = input;
+    const { teams: _teams, invitedMembers, logo, bio, brandColor, bannerUrl } = input;
 
     const teams = _teams?.filter((team) => team.id === -1 || team.isBeingMigrated) || [];
     const teamIds = teams.filter((team) => team.id > 0).map((team) => team.id);
@@ -362,15 +376,20 @@ export class OrganizationPaymentService {
       })
     );
 
-    log.debug("Updating onboarding");
+    log.debug("Updating onboarding with stripe details and form data");
 
+    // Update the onboarding record with all the form data
     await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
-      bio: bio ?? null,
-      logo: logo ?? null,
-      invitedMembers: invitedMembers,
-      teams,
       stripeCustomerId,
-      ...updatedConfig,
+      seats: updatedConfig.seats,
+      pricePerSeat: updatedConfig.pricePerSeat,
+      billingPeriod: updatedConfig.billingPeriod,
+      logo,
+      bio,
+      brandColor: brandColor ?? null,
+      bannerUrl: bannerUrl ?? null,
+      teams,
+      invitedMembers,
     });
 
     return {
diff --git a/packages/features/ee/organizations/lib/OrganizationPermissionService.ts b/packages/features/ee/organizations/lib/OrganizationPermissionService.ts
index 8fd469db50ac28..6d6f8c3868dab4 100644
--- a/packages/features/ee/organizations/lib/OrganizationPermissionService.ts
+++ b/packages/features/ee/organizations/lib/OrganizationPermissionService.ts
@@ -2,13 +2,14 @@ import { UserPermissionRole } from "@calcom/kysely/types";
 import { ORGANIZATION_SELF_SERVE_MIN_SEATS, ORGANIZATION_SELF_SERVE_PRICE } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
-import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";
 
+import type { OnboardingUser } from "./service/onboarding/types";
+
 const log = logger.getSubLogger({ prefix: ["ee", "organizations", "OrganizationPermissionService"] });
 type SeatsPrice = {
   seats?: number | null;
@@ -28,7 +29,7 @@ export interface validatePermissionsIOrganizationPermissionService {
 }
 
 export class OrganizationPermissionService {
-  constructor(private readonly user: NonNullable<TrpcSessionUser>) {}
+  constructor(private readonly user: OnboardingUser) {}
 
   async hasPermissionToCreateForEmail(targetEmail: string): Promise<boolean> {
     return this.user.email === targetEmail || this.user.role === "ADMIN";
diff --git a/packages/features/ee/organizations/lib/ensureOrganizationIsReviewed.ts b/packages/features/ee/organizations/lib/ensureOrganizationIsReviewed.ts
index dc1eca04c70f22..14f34cc5566315 100644
--- a/packages/features/ee/organizations/lib/ensureOrganizationIsReviewed.ts
+++ b/packages/features/ee/organizations/lib/ensureOrganizationIsReviewed.ts
@@ -1,4 +1,4 @@
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
 /**
  * It assumes that a user can only impersonate the members of the organization he is logged in to.
diff --git a/packages/lib/getBookerUrl/getBookerBaseUrlSync.ts b/packages/features/ee/organizations/lib/getBookerBaseUrlSync.ts
similarity index 100%
rename from packages/lib/getBookerUrl/getBookerBaseUrlSync.ts
rename to packages/features/ee/organizations/lib/getBookerBaseUrlSync.ts
diff --git a/packages/lib/getBookerUrl/server.ts b/packages/features/ee/organizations/lib/getBookerUrlServer.ts
similarity index 74%
rename from packages/lib/getBookerUrl/server.ts
rename to packages/features/ee/organizations/lib/getBookerUrlServer.ts
index a5c27bc4ec5035..d31fe7ba5817ee 100644
--- a/packages/lib/getBookerUrl/server.ts
+++ b/packages/features/ee/organizations/lib/getBookerUrlServer.ts
@@ -1,5 +1,5 @@
-import { WEBSITE_URL } from "../constants";
-import { getBrand } from "../server/getBrand";
+import { getBrand } from "@calcom/features/ee/organizations/lib/getBrand";
+import { WEBSITE_URL } from "@calcom/lib/constants";
 
 export const getBookerBaseUrl = async (organizationId: number | null) => {
   const orgBrand = await getBrand(organizationId);
diff --git a/packages/lib/server/getBrand.ts b/packages/features/ee/organizations/lib/getBrand.ts
similarity index 100%
rename from packages/lib/server/getBrand.ts
rename to packages/features/ee/organizations/lib/getBrand.ts
diff --git a/packages/lib/getBookerUrl/client.test.ts b/packages/features/ee/organizations/lib/getTeamUrlSync.test.ts
similarity index 80%
rename from packages/lib/getBookerUrl/client.test.ts
rename to packages/features/ee/organizations/lib/getTeamUrlSync.test.ts
index 4a57c545ce3fa7..aaf8ceafd0b3b3 100644
--- a/packages/lib/getBookerUrl/client.test.ts
+++ b/packages/features/ee/organizations/lib/getTeamUrlSync.test.ts
@@ -1,9 +1,10 @@
 import { describe, it, vi, expect } from "vitest";
 
-import { getTeamUrlSync } from "./client";
-import * as getBookerBaseUrlSyncExport from "./getBookerBaseUrlSync";
+import * as getBookerBaseUrlSyncExport from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 
-vi.mock("./getBookerBaseUrlSync", async () => {
+import { getTeamUrlSync } from "./getTeamUrlSync";
+
+vi.mock("@calcom/features/ee/organizations/lib/getBookerBaseUrlSync", async () => {
   return {
     getBookerBaseUrlSync: vi.fn(),
   };
diff --git a/packages/lib/getBookerUrl/client.ts b/packages/features/ee/organizations/lib/getTeamUrlSync.ts
similarity index 74%
rename from packages/lib/getBookerUrl/client.ts
rename to packages/features/ee/organizations/lib/getTeamUrlSync.ts
index c018d51f13bf78..14824ec9f80653 100644
--- a/packages/lib/getBookerUrl/client.ts
+++ b/packages/features/ee/organizations/lib/getTeamUrlSync.ts
@@ -1,6 +1,5 @@
-import { getBookerBaseUrlSync } from "./getBookerBaseUrlSync";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 
-export { getBookerBaseUrlSync } from "./getBookerBaseUrlSync";
 export const getTeamUrlSync = (
   {
     orgSlug,
diff --git a/packages/features/ee/organizations/lib/onboardingStore.test.ts b/packages/features/ee/organizations/lib/onboardingStore.test.ts
new file mode 100644
index 00000000000000..d16b0312a92c63
--- /dev/null
+++ b/packages/features/ee/organizations/lib/onboardingStore.test.ts
@@ -0,0 +1,389 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+// @ts-nocheck - Test file with mock type compatibility issues that don't affect test functionality
+
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { renderHook, act, waitFor } from "@testing-library/react";
+import { useSession } from "next-auth/react";
+import { useSearchParams, useRouter, usePathname } from "next/navigation";
+
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { UserPermissionRole } from "@calcom/prisma/enums";
+import { trpc } from "@calcom/trpc/react";
+
+import { useOnboardingStore, useOnboarding } from "./onboardingStore";
+
+// Mock all dependencies
+vi.mock("next-auth/react");
+vi.mock("next/navigation");
+vi.mock("@calcom/trpc/react", () => ({
+    trpc: {
+        viewer: {
+            organizations: {
+                getOrganizationOnboarding: {
+                    useQuery: vi.fn(),
+                },
+            },
+        },
+    },
+}));
+
+// Mock constants
+vi.mock("@calcom/lib/constants", async () => {
+    const actual = await vi.importActual("@calcom/lib/constants");
+    return {
+        ...actual,
+        IS_SELF_HOSTED: false, // Default to false, will be overridden in specific tests
+    };
+});
+
+
+function renderUseOnboardingStore() {
+    renderHook(() => useOnboarding(), { wrapper: createWrapper() });
+    return renderHook(() => useOnboardingStore(), { wrapper: createWrapper() });
+}
+
+// Test Data Builders
+const createTestSession = (overrides?: {
+    email?: string;
+    role?: UserPermissionRole;
+    status?: "loading" | "authenticated" | "unauthenticated";
+}) => {
+    const status = overrides?.status || "authenticated";
+
+    if (status === "loading") {
+        return {
+            data: null,
+            status: "loading" as const,
+            update: vi.fn(),
+        };
+    }
+
+    if (status === "unauthenticated") {
+        return {
+            data: null,
+            status: "unauthenticated" as const,
+            update: vi.fn(),
+        };
+    }
+
+    return {
+        data: {
+            user: {
+                email: overrides?.email || "test@example.com",
+                role: overrides?.role || UserPermissionRole.USER,
+            },
+        },
+        status: "authenticated" as const,
+        update: vi.fn(),
+    };
+};
+
+const createTestOrganizationOnboarding = (overrides?: {
+    isComplete?: boolean;
+    id?: string;
+    billingPeriod?: string;
+    pricePerSeat?: number;
+    seats?: number;
+    orgOwnerEmail?: string;
+    name?: string;
+    slug?: string;
+    bio?: string;
+    logo?: string;
+}) => ({
+    id: overrides?.id || "test-onboarding-id",
+    isComplete: overrides?.isComplete ?? false,
+    billingPeriod: overrides?.billingPeriod || "MONTHLY",
+    pricePerSeat: overrides?.pricePerSeat ?? 20,
+    seats: overrides?.seats ?? 5,
+    orgOwnerEmail: overrides?.orgOwnerEmail || "test@example.com",
+    name: overrides?.name || "Test Organization",
+    slug: overrides?.slug || "test-org",
+    bio: overrides?.bio || "Test bio",
+    logo: overrides?.logo || "test-logo.png",
+});
+
+
+
+function mockOrganizationOnboardingFromDB(data: ReturnType<typeof createTestOrganizationOnboarding> | null) {
+    const organizationOnboarding = data ? createTestOrganizationOnboarding(data) : null;
+    (trpc.viewer.organizations.getOrganizationOnboarding.useQuery as ReturnType<typeof vi.fn>).mockReturnValue({
+        data: organizationOnboarding,
+        isPending: false,
+        isLoading: false,
+        error: null,
+        refetch: vi.fn(),
+    });
+}
+
+const createTestSearchParams = (params?: Record<string, string>) => {
+    return new URLSearchParams(params);
+};
+
+// Mock localStorage
+const localStorageMock = {
+    getItem: vi.fn(),
+    setItem: vi.fn(),
+    removeItem: vi.fn(),
+    clear: vi.fn(),
+};
+
+Object.defineProperty(window, 'localStorage', {
+    value: localStorageMock,
+    writable: true,
+});
+
+// Mock implementations
+const mockRouterPush = vi.fn().mockImplementation((...args: string[]) => {
+    console.trace();
+    console.log("mockRouterPush called", args[0]);
+});
+const mockUseSession = vi.mocked(useSession);
+vi.mocked(useRouter).mockReturnValue({
+    push: mockRouterPush,
+    replace: vi.fn(),
+    back: vi.fn(),
+    forward: vi.fn(),
+    refresh: vi.fn(),
+    prefetch: vi.fn(),
+});
+const mockUsePathname = vi.mocked(usePathname);
+const mockUseSearchParams = vi.mocked(useSearchParams);
+
+// Test wrapper for React hooks - no wrapper needed for this test
+const createWrapper = () => undefined;
+
+describe("OnboardingStore", () => {
+    beforeEach(() => {
+        // Reset the store and let React do any side effects
+        act(() => {
+            useOnboardingStore.getState().reset();
+        });
+        // Reset localStorage mock
+        localStorageMock.clear.mockClear();
+        localStorageMock.getItem.mockClear();
+        localStorageMock.setItem.mockClear();
+        localStorageMock.removeItem.mockClear();
+
+        mockRouterPush.mockClear();
+
+        // Setup default mocks
+        mockUsePathname.mockReturnValue("/settings/organizations/new");
+        mockUseSearchParams.mockReturnValue(createTestSearchParams());
+
+        (trpc.viewer.organizations.getOrganizationOnboarding.useQuery as ReturnType<typeof vi.fn>).mockReturnValue({
+            data: undefined,
+            isPending: false,
+            isLoading: false,
+            error: null,
+            refetch: vi.fn(),
+        });
+    });
+
+    afterEach(() => {
+        act(() => {
+            useOnboardingStore.getState().reset();
+        });
+        vi.clearAllMocks();
+        mockRouterPush.mockClear();
+        localStorageMock.clear.mockClear();
+        localStorageMock.getItem.mockClear();
+        localStorageMock.setItem.mockClear();
+        localStorageMock.removeItem.mockClear();
+    });
+
+    describe("Zustand Store Actions - Complex Logic", () => {
+        describe("Reset Functionality", () => {
+            it("should reset to initial state when called without parameters", () => {
+                const { result } = renderHook(() => useOnboardingStore(), { wrapper: createWrapper() });
+
+                // Set some values
+                act(() => {
+                    result.current.setName("Test Org");
+                    result.current.setSlug("test-org");
+                    result.current.setBillingPeriod("ANNUALLY" as const);
+                    result.current.setSeats(15);
+                    result.current.addInvitedMember({ email: "test@example.com", name: "Test User" });
+                });
+
+                // Reset
+                act(() => {
+                    result.current.reset();
+                });
+
+                expect(result.current.name).toBe("");
+                expect(result.current.slug).toBe("");
+                expect(result.current.billingPeriod).toBeUndefined();
+                expect(result.current.seats).toBeNull();
+                expect(result.current.invitedMembers).toEqual([]);
+            });
+
+            it("should set specific state when called with parameters", () => {
+                const { result } = renderHook(() => useOnboardingStore(), { wrapper: createWrapper() });
+                const newState = {
+                    name: "Partial Reset Org",
+                    slug: "partial-reset",
+                    seats: 25,
+                };
+
+                act(() => {
+                    result.current.reset(newState);
+                });
+
+                expect(result.current.name).toBe("Partial Reset Org");
+                expect(result.current.slug).toBe("partial-reset");
+                expect(result.current.seats).toBe(25);
+            });
+
+            it("should clear localStorage when resetting without parameters", () => {
+                const { result } = renderHook(() => useOnboardingStore(), { wrapper: createWrapper() });
+
+                // Set some values to trigger localStorage save
+                act(() => {
+                    result.current.setName("Test Org");
+                });
+
+                // Reset
+                act(() => {
+                    result.current.reset();
+                });
+
+                // Verify localStorage removeItem was called
+                expect(localStorageMock.removeItem).toHaveBeenCalledWith("org-creation-onboarding");
+            });
+        });
+    });
+
+    describe("useOnboarding Hook", () => {
+        beforeEach(() => {
+            mockUseSession.mockReturnValue(createTestSession());
+        });
+
+        describe("Authentication Handling", () => {
+            it("should redirect to login when session is unauthenticated", async () => {
+                mockUseSession.mockReturnValue(createTestSession({ status: "unauthenticated" }));
+                mockUsePathname.mockReturnValue("/settings/organizations/new");
+                mockUseSearchParams.mockReturnValue(createTestSearchParams());
+
+                renderHook(() => useOnboarding(), { wrapper: createWrapper() });
+
+                await waitFor(() => {
+                    expect(mockRouterPush).toHaveBeenCalledWith(
+                        `/auth/login?callbackUrl=${WEBAPP_URL}/settings/organizations/new`
+                    );
+                });
+                mockRouterPush.mockClear();
+                expect(mockRouterPush).not.toHaveBeenCalled();
+            });
+
+            it("should not redirect when session is authenticated", () => {
+                expect(mockRouterPush).not.toHaveBeenCalled();
+                mockUseSession.mockReturnValue(createTestSession({ status: "authenticated" }));
+
+                renderHook(() => useOnboarding(), { wrapper: createWrapper() });
+
+                expect(mockRouterPush).not.toHaveBeenCalled();
+            });
+        });
+
+        describe("Organization Onboarding State Sync", () => {
+            it("should return organization onboarding data when available", () => {
+                const organizationOnboarding = createTestOrganizationOnboarding({
+                    name: "Test Org",
+                    slug: "test-org",
+                });
+
+                (trpc.viewer.organizations.getOrganizationOnboarding.useQuery as ReturnType<typeof vi.fn>).mockReturnValue({
+                    data: organizationOnboarding,
+                    isPending: false,
+                    isLoading: false,
+                    error: null,
+                    refetch: vi.fn(),
+                });
+
+                const { result } = renderHook(() => useOnboarding(), { wrapper: createWrapper() });
+
+                expect(result.current.dbOnboarding).toEqual(organizationOnboarding);
+                expect(result.current.isLoadingOrgOnboarding).toBe(false);
+            });
+
+            it("should set onboardingData from DB to zustand if not set already", async () => {
+                const organizationOnboarding = createTestOrganizationOnboarding({
+                    id: "sync-test-id",
+                    name: "Synced Organization",
+                    slug: "synced-org",
+                    bio: "Synced bio content",
+                    logo: "synced-logo.png",
+                    billingPeriod: "ANNUALLY",
+                    pricePerSeat: 25,
+                    seats: 10,
+                    orgOwnerEmail: "owner@synced.com",
+                });
+
+                (trpc.viewer.organizations.getOrganizationOnboarding.useQuery as ReturnType<typeof vi.fn>).mockReturnValue({
+                    data: organizationOnboarding,
+                    isPending: false,
+                    isLoading: false,
+                    error: null,
+                    refetch: vi.fn(),
+                });
+
+                renderHook(() => useOnboarding(), { wrapper: createWrapper() });
+                const { result: storeResult } = renderHook(() => useOnboardingStore(), { wrapper: createWrapper() });
+
+                await waitFor(() => {
+                    expect(storeResult.current.onboardingId).toBe("sync-test-id");
+                });
+
+                expect(storeResult.current.name).toBe("Synced Organization");
+                expect(storeResult.current.slug).toBe("synced-org");
+                expect(storeResult.current.bio).toBe("Synced bio content");
+                expect(storeResult.current.logo).toBe("synced-logo.png");
+                expect(storeResult.current.billingPeriod).toBe("ANNUALLY");
+                expect(storeResult.current.pricePerSeat).toBe(25);
+                expect(storeResult.current.seats).toBe(10);
+                expect(storeResult.current.orgOwnerEmail).toBe("owner@synced.com");
+            });
+
+            it("should sync onboardingData from DB to zustand if set already", async () => {
+                mockOrganizationOnboardingFromDB(createTestOrganizationOnboarding({
+                    id: "onboarding1",
+                    name: "Onboarding 1 Organization",
+                    slug: "onboarding1-org",
+                    bio: "Onboarding 1 bio content",
+                    logo: "onboarding1-logo.png",
+                    billingPeriod: "MONTHLY",
+                    pricePerSeat: 15,
+                    seats: 5,
+                    orgOwnerEmail: "owner@onboarding1.com",
+                }))
+
+                // Load the store to set the initial state
+                const { result: storeResultBefore } = renderUseOnboardingStore();
+
+                expect(storeResultBefore.current.name).toBe("Onboarding 1 Organization");
+                expect(storeResultBefore.current.slug).toBe("onboarding1-org");
+
+                mockOrganizationOnboardingFromDB(createTestOrganizationOnboarding({
+                    id: "sync-test-id",
+                    name: "Synced Organization",
+                    slug: "synced-org",
+                    bio: "Synced bio content",
+                    logo: "synced-logo.png",
+                    billingPeriod: "ANNUALLY",
+                    pricePerSeat: 25,
+                    seats: 10,
+                    orgOwnerEmail: "owner@synced.com",
+                }));
+
+                // Load the store to sync the new data
+                const { result: storeResultAfter } = renderUseOnboardingStore();
+                // Verify the data is synced
+                expect(storeResultAfter.current.name).toBe("Synced Organization");
+                expect(storeResultAfter.current.slug).toBe("synced-org");
+            });
+        });
+    });
+});
diff --git a/packages/features/ee/organizations/lib/onboardingStore.ts b/packages/features/ee/organizations/lib/onboardingStore.ts
index 3dd9210acabe42..acf84ff8b3f1a2 100644
--- a/packages/features/ee/organizations/lib/onboardingStore.ts
+++ b/packages/features/ee/organizations/lib/onboardingStore.ts
@@ -2,17 +2,13 @@ import { useSession } from "next-auth/react";
 import { useSearchParams, useRouter, usePathname } from "next/navigation";
 import { useEffect } from "react";
 import { create } from "zustand";
-import { persist } from "zustand/middleware";
+import { persist, StorageValue } from "zustand/middleware";
 
-import { WEBAPP_URL, IS_SELF_HOSTED } from "@calcom/lib/constants";
-import { UserPermissionRole } from "@calcom/prisma/enums";
+import { WEBAPP_URL, IS_TEAM_BILLING_ENABLED_CLIENT } from "@calcom/lib/constants";
+import { localStorage } from "@calcom/lib/webstorage";
+import { BillingPeriod, UserPermissionRole } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 
-enum BillingPeriod {
-  MONTHLY = "MONTHLY",
-  ANNUALLY = "ANNUALLY",
-}
-
 interface OnboardingAdminStoreState {
   billingPeriod?: BillingPeriod;
   pricePerSeat?: number | null;
@@ -25,6 +21,8 @@ interface OnboardingUserStoreState {
   slug: string;
   logo?: string | null;
   bio?: string | null;
+  brandColor?: string | null;
+  bannerUrl?: string | null;
   onboardingId: string | null;
   invitedMembers: { email: string; name?: string }[];
   teams: { id: number; name: string; slug: string | null; isBeingMigrated: boolean }[];
@@ -42,6 +40,8 @@ interface OnboardingStoreState extends OnboardingAdminStoreState, OnboardingUser
   setSlug: (slug: string) => void;
   setLogo: (logo: string) => void;
   setBio: (bio: string) => void;
+  setBrandColor: (brandColor: string) => void;
+  setBannerUrl: (bannerUrl: string) => void;
   addInvitedMember: (member: { email: string; name?: string }) => void;
   removeInvitedMember: (email: string) => void;
 
@@ -59,6 +59,8 @@ const initialState: OnboardingAdminStoreState & OnboardingUserStoreState = {
   slug: "",
   logo: "",
   bio: "",
+  brandColor: "",
+  bannerUrl: "",
   orgOwnerEmail: "",
   seats: null,
   pricePerSeat: null,
@@ -70,7 +72,7 @@ const initialState: OnboardingAdminStoreState & OnboardingUserStoreState = {
 
 export const useOnboardingStore = create<OnboardingStoreState>()(
   persist(
-    (set) => ({
+    (set, get) => ({
       ...initialState,
 
       // Admin actions
@@ -84,6 +86,8 @@ export const useOnboardingStore = create<OnboardingStoreState>()(
       setSlug: (slug) => set({ slug }),
       setLogo: (logo) => set({ logo }),
       setBio: (bio) => set({ bio }),
+      setBrandColor: (brandColor) => set({ brandColor }),
+      setBannerUrl: (bannerUrl) => set({ bannerUrl }),
       setOnboardingId: (onboardingId) => set({ onboardingId }),
       addInvitedMember: (member) =>
         set((state) => ({
@@ -97,7 +101,6 @@ export const useOnboardingStore = create<OnboardingStoreState>()(
       // Team actions
       setTeams: (teams) => set({ teams }),
 
-      // Reset action
       reset: (state) => {
         if (state) {
           set(state);
@@ -116,57 +119,59 @@ export const useOnboardingStore = create<OnboardingStoreState>()(
   )
 );
 
-export const useOnboarding = (params?: { step?: "start" | "status" | null }) => {
+export const useOnboarding = () => {
   const session = useSession();
   const router = useRouter();
   const path = usePathname();
   const isAdmin = session.data?.user?.role === UserPermissionRole.ADMIN;
-  const isBillingEnabled = !(IS_SELF_HOSTED && isAdmin) || process.env.NEXT_PUBLIC_IS_E2E;
+
+  const isBillingEnabled = process.env.NEXT_PUBLIC_IS_E2E ? false : IS_TEAM_BILLING_ENABLED_CLIENT;
+
   const searchParams = useSearchParams();
   const { data: organizationOnboarding, isPending: isLoadingOrgOnboarding } =
     trpc.viewer.organizations.getOrganizationOnboarding.useQuery();
-  const { reset, onboardingId } = useOnboardingStore();
-  const step = params?.step ?? null;
+  const { reset } = useOnboardingStore();
   useEffect(() => {
     if (isLoadingOrgOnboarding) {
       return;
     }
 
+    // Admin on handover page should never touch the store
+    // The DB query returns admin's own onboarding, not the one being handed over
+    if (isAdmin && path?.includes("/handover")) {
+      return;
+    }
+
     if (organizationOnboarding?.isComplete) {
       reset();
     }
 
     if (organizationOnboarding) {
-      // Must not keep resetting state on each step change as every step doesn't save at the moment and this would reset user's changes
-      if (!window.isOrgOnboardingSynced) {
-        window.isOrgOnboardingSynced = true;
-        // Must reset with current state of onboarding in DB for the user
-        reset({
-          onboardingId: organizationOnboarding.id,
-          billingPeriod: organizationOnboarding.billingPeriod as BillingPeriod,
-          pricePerSeat: organizationOnboarding.pricePerSeat,
-          seats: organizationOnboarding.seats,
-          orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
-          name: organizationOnboarding.name,
-          slug: organizationOnboarding.slug,
-          bio: organizationOnboarding.bio,
-          logo: organizationOnboarding.logo,
-        });
-        if (isAdmin && organizationOnboarding?.orgOwnerEmail !== session.data?.user.email) {
-          reset();
-        }
-      }
-    } else {
-      // First step doesn't require onboardingId
-      const requireOnboardingId = step !== "start";
-
-      // Reset to first step if onboardingId isn't available
-      if (!onboardingId && requireOnboardingId) {
-        console.warn("No onboardingId found in store, redirecting to /settings/organizations/new");
-        router.push("/settings/organizations/new");
+      // Admin creating for someone else - don't sync from DB, let them proceed to handover
+      if (isAdmin && organizationOnboarding?.orgOwnerEmail !== session.data?.user.email) {
+        return;
       }
+
+      // Always sync from DB to ensure UI reflects latest changes
+      reset({
+        onboardingId: organizationOnboarding.id,
+        billingPeriod: organizationOnboarding.billingPeriod as BillingPeriod,
+        pricePerSeat: organizationOnboarding.pricePerSeat,
+        seats: organizationOnboarding.seats,
+        orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+        name: organizationOnboarding.name,
+        slug: organizationOnboarding.slug,
+        bio: organizationOnboarding.bio,
+        logo: organizationOnboarding.logo,
+        brandColor: organizationOnboarding.brandColor,
+        bannerUrl: organizationOnboarding.bannerUrl,
+        invitedMembers: [],
+        teams: [],
+      });
     }
-  }, [organizationOnboarding, isLoadingOrgOnboarding, isAdmin, onboardingId, reset, step, router]);
+    // Note: We no longer redirect if onboardingId is missing, as regular users
+    // don't create the onboarding record until the final step
+  }, [organizationOnboarding, isLoadingOrgOnboarding, isAdmin, reset, path]);
 
   useEffect(() => {
     if (session.status === "loading") {
diff --git a/packages/features/ee/organizations/lib/orgDomains.ts b/packages/features/ee/organizations/lib/orgDomains.ts
index 8bbb925be9b0cc..483c120db64722 100644
--- a/packages/features/ee/organizations/lib/orgDomains.ts
+++ b/packages/features/ee/organizations/lib/orgDomains.ts
@@ -15,8 +15,8 @@ const log = logger.getSubLogger({
  */
 export function getOrgSlug(hostname: string, forcedSlug?: string) {
   if (forcedSlug) {
-    if (process.env.NEXT_PUBLIC_IS_E2E) {
-      log.debug("Using provided forcedSlug in E2E", {
+    if (process.env.NEXT_PUBLIC_IS_E2E || process.env.INTEGRATION_TEST_MODE) {
+      log.debug("Using provided forcedSlug in E2E/Integration Test mode", {
         forcedSlug,
       });
       return forcedSlug;
diff --git a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts b/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts
deleted file mode 100644
index 4b8d3fb6af380b..00000000000000
--- a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.test.ts
+++ /dev/null
@@ -1,540 +0,0 @@
-/**
- * Goal is to e2e test createOrganizationFromOnboarding except inviteMembersWithNoInviterPermissionCheck, createTeamsHandler and createDomain
- * Those are either already tested or should be tested out separately
- */
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
-
-import { describe, expect, it, vi, beforeEach } from "vitest";
-
-import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
-import * as constants from "@calcom/lib/constants";
-import { createDomain } from "@calcom/lib/domainManager/organization";
-import type { OrganizationOnboarding } from "@calcom/prisma/client";
-import { MembershipRole } from "@calcom/prisma/enums";
-import { createTeamsHandler } from "@calcom/trpc/server/routers/viewer/organizations/createTeams.handler";
-import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
-
-import { createOrganizationFromOnboarding } from "./createOrganizationFromOnboarding";
-
-vi.mock("@calcom/ee/common/server/LicenseKeyService", () => ({
-  LicenseKeySingleton: {
-    getInstance: vi.fn(),
-  },
-}));
-
-// Mock the external functions
-vi.mock("@calcom/features/auth/lib/verifyEmail", () => ({
-  sendEmailVerification: vi.fn(),
-}));
-
-vi.mock("@calcom/emails/email-manager", () => ({
-  sendOrganizationCreationEmail: vi.fn(),
-}));
-
-vi.mock("@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler", () => ({
-  inviteMembersWithNoInviterPermissionCheck: vi.fn(),
-}));
-
-vi.mock("@calcom/trpc/server/routers/viewer/organizations/createTeams.handler", () => ({
-  createTeamsHandler: vi.fn(),
-}));
-
-vi.mock("@calcom/lib/domainManager/organization", () => ({
-  createDomain: vi.fn(),
-}));
-
-vi.mock("@calcom/lib/server/i18n", () => {
-  return {
-    getTranslation: async (locale: string, namespace: string) => {
-      const t = (key: string) => key;
-      t.locale = locale;
-      t.namespace = namespace;
-      return t;
-    },
-  };
-});
-
-const mockOrganizationOnboarding = {
-  name: "Test Org",
-  slug: "test-org",
-  orgOwnerEmail: "test@example.com",
-  billingPeriod: "MONTHLY",
-  seats: 5,
-  pricePerSeat: 20,
-  isComplete: false,
-  stripeCustomerId: "mock_stripe_customer_id",
-  createdById: 1,
-  invitedMembers: [{ email: "member1@example.com" }, { email: "member2@example.com" }],
-  teams: [
-    { id: 1, name: "Team To Move", isBeingMigrated: true, slug: "new-team-slug" },
-    { id: 2, name: "New Team", isBeingMigrated: false, slug: null },
-  ],
-  logo: null,
-  bio: null,
-  organizationId: null,
-  isDomainConfigured: false,
-  isPlatform: false,
-};
-
-// Helper functions for creating test scenarios
-async function createTestUser(data: {
-  email: string;
-  name?: string;
-  username?: string;
-  metadata?: any;
-  onboardingCompleted?: boolean;
-  emailVerified?: Date | null;
-}) {
-  return prismock.user.create({
-    data: {
-      email: data.email,
-      name: data.name || "Test User",
-      username: data.username || "testuser",
-      metadata: data.metadata || {},
-      completedOnboarding: data.onboardingCompleted,
-      emailVerified: data.emailVerified,
-    },
-  });
-}
-
-async function createTestOrganization(data: {
-  name: string;
-  slug: string;
-  isOrganization?: boolean;
-  metadata?: any;
-}) {
-  return prismock.team.create({
-    data: {
-      name: data.name,
-      slug: data.slug,
-      isOrganization: data.isOrganization ?? true,
-      metadata: data.metadata || {},
-    },
-  });
-}
-
-async function createTestTeam(data: { name: string; slug: string }) {
-  return prismock.team.create({
-    data: {
-      name: data.name,
-      slug: data.slug,
-      isOrganization: false,
-    },
-  });
-}
-
-async function createTestOrganizationOnboarding(
-  data?: Partial<typeof mockOrganizationOnboarding> & { organizationId?: number | null }
-) {
-  console.log("TEST: Creating organization onboarding", data);
-  return prismock.organizationOnboarding.create({
-    data: {
-      ...mockOrganizationOnboarding,
-      ...data,
-    },
-  });
-}
-
-async function createOnboardingEligibleUserAndOnboarding(data: {
-  user?: {
-    email: string;
-    name?: string;
-    username?: string;
-  };
-  organizationOnboarding?: Partial<typeof mockOrganizationOnboarding> & { organizationId?: number | null };
-}) {
-  const user = await createTestUser({
-    ...data.user,
-    onboardingCompleted: true,
-    emailVerified: new Date(),
-  });
-  const organizationOnboarding = await createTestOrganizationOnboarding({
-    ...data.organizationOnboarding,
-    createdById: user.id,
-  });
-  return { user, organizationOnboarding };
-}
-
-async function createTestMembership(data: { userId: number; teamId: number; role?: MembershipRole }) {
-  return prismock.membership.create({
-    data: {
-      createdAt: new Date(),
-      userId: data.userId,
-      teamId: data.teamId,
-      role: data.role || MembershipRole.MEMBER,
-      accepted: true,
-    },
-  });
-}
-
-async function expectOrganizationOnboardingToHaveDataContaining({
-  onboardingId,
-  expectedData,
-}: {
-  onboardingId: string;
-  expectedData: Partial<OrganizationOnboarding>;
-}) {
-  const updatedOrganizationOnboarding = await prismock.organizationOnboarding.findUnique({
-    where: { id: onboardingId },
-  });
-  expect(updatedOrganizationOnboarding).toEqual(expect.objectContaining(expectedData));
-}
-
-describe("createOrganizationFromOnboarding", () => {
-  beforeEach(async () => {
-    vi.resetAllMocks();
-    // @ts-expect-error reset is a method on Prismock
-    await prismock.reset();
-  });
-
-  describe("hosted", () => {
-    beforeEach(() => {
-      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
-    });
-
-    // Skipped because non-existend user creation support isn't there through onboarding now.
-    it.skip("should create an organization with a non-existent user as owner", async () => {
-      const organizationOnboarding = await createTestOrganizationOnboarding();
-
-      const { organization, owner } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      // Verify organization creation
-      expect(organization).toBeDefined();
-      expect(organization.name).toBe(organizationOnboarding.name);
-      expect(organization.slug).toBe(organizationOnboarding.slug);
-      expect(organization.metadata).toEqual({
-        orgSeats: 5,
-        orgPricePerSeat: 20,
-        billingPeriod: "MONTHLY",
-        subscriptionId: "mock_subscription_id",
-        subscriptionItemId: "mock_subscription_item_id",
-      });
-
-      // Verify owner creation
-      expect(owner).toBeDefined();
-      expect(owner.email).toBe(organizationOnboarding.orgOwnerEmail);
-    });
-
-    it("should create an organization with an existing user as owner", async () => {
-      const orgOwnerEmail = "test@example.com";
-      const existingUser = await createTestUser({
-        email: orgOwnerEmail,
-        name: "Existing User",
-        username: "existinguser",
-        onboardingCompleted: true,
-        emailVerified: new Date(),
-      });
-
-      const organizationOnboarding = await createTestOrganizationOnboarding({
-        orgOwnerEmail,
-      });
-
-      const { organization, owner } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      // Verify organization creation
-      expect(organization).toBeDefined();
-      expect(organization.name).toBe(organizationOnboarding.name);
-      expect(organization.slug).toBe(organizationOnboarding.slug);
-
-      // Verify owner is the existing user
-      expect(owner.id).toBe(existingUser.id);
-      expect(owner.email).toBe(existingUser.email);
-
-      expect(createDomain).toHaveBeenCalledWith(organization.slug);
-      // Verify team creation and member invites still work
-      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith(
-        expect.objectContaining({
-          orgSlug: organization.slug,
-          teamId: organization.id,
-          invitations: organizationOnboarding.invitedMembers?.map((member) => ({
-            usernameOrEmail: member.email,
-            role: MembershipRole.MEMBER,
-          })),
-        })
-      );
-      expect(createTeamsHandler).toHaveBeenCalledWith(
-        expect.objectContaining({
-          input: expect.objectContaining({
-            orgId: organization.id,
-            teamNames: ["New Team"],
-            moveTeams: expect.arrayContaining([expect.objectContaining({ id: 1, newSlug: "new-team-slug" })]),
-          }),
-        })
-      );
-    });
-
-    it("should reuse existing organization if organizationId is already set in onboarding. Covers the retry scenario where org got created but then error occurred", async () => {
-      const orgName = "Existing Org";
-      const orgSlug = "existing-org";
-      const existingOrg = await createTestOrganization({
-        name: orgName,
-        slug: orgSlug,
-      });
-
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          name: "Existing User",
-          username: "existinguser",
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          organizationId: existingOrg.id,
-          name: orgName,
-          slug: orgSlug,
-        },
-      });
-
-      const { organization } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      // Verify the existing organization was reused
-      expect(organization.id).toBe(existingOrg.id);
-    });
-
-    it("should throw error if organization with same slug exists", async () => {
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          slug: "conflicting-org-with-same-slug",
-        },
-      });
-
-      await createTestOrganization({
-        name: "Conflicting Org with same slug",
-        slug: organizationOnboarding.slug,
-      });
-
-      await expect(
-        createOrganizationFromOnboarding({
-          organizationOnboarding,
-          paymentSubscriptionId: "mock_subscription_id",
-          paymentSubscriptionItemId: "mock_subscription_item_id",
-        })
-      ).rejects.toThrow("organization_url_taken");
-    });
-
-    it("should create team with slugified slug", async () => {
-      const teamToMove = await createTestTeam({
-        name: "Sales",
-        slug: "Company Sales",
-      });
-
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          slug: "UPPERCASE-SLUG",
-          teams: [{ id: teamToMove.id, name: "Sales", isBeingMigrated: true, slug: "sales-team" }],
-        },
-      });
-
-      const { organization } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      expect(createTeamsHandler).toHaveBeenCalledWith(
-        expect.objectContaining({
-          input: expect.objectContaining({
-            orgId: organization.id,
-            teamNames: [],
-            moveTeams: expect.arrayContaining([expect.objectContaining({ id: 1, newSlug: "sales-team" })]),
-          }),
-        })
-      );
-    });
-
-    it("should invite members with isDirectUserAction set to false", async () => {
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          username: "org-owner",
-          email: "owner@example.com",
-        },
-      });
-
-      // Call createOrganizationFromOnboarding
-      const result = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "sub_123",
-        paymentSubscriptionItemId: "si_123",
-      });
-
-      // Verify inviteMembersWithNoInviterPermissionCheck was called with isDirectUserAction: false
-      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith(
-        expect.objectContaining({
-          teamId: result.organization.id,
-          invitations: [
-            { usernameOrEmail: "member1@example.com", role: MembershipRole.MEMBER },
-            { usernameOrEmail: "member2@example.com", role: MembershipRole.MEMBER },
-          ],
-          isDirectUserAction: false,
-        })
-      );
-    });
-
-    it("should update stripe customer ID for existing user", async () => {
-      const { user: existingUser, organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          slug: "conflicting-org-with-same-slug",
-        },
-      });
-
-      await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      // Verify user's stripe customer ID was updated
-      const updatedUser = await prismock.user.findUnique({
-        where: { id: existingUser.id },
-      });
-
-      expect(updatedUser?.metadata).toEqual(
-        expect.objectContaining({
-          stripeCustomerId: organizationOnboarding.stripeCustomerId,
-        })
-      );
-    });
-
-    it("should create organization in with slug set even if there is a team with same slug of which orgOwner(to-be) is a member", async () => {
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          slug: "conflicting-org-with-same-slug",
-        },
-      });
-
-      const teamWithConflictingSlug = await createTestTeam({
-        name: "TestTeamWithConflictingSlug",
-        slug: organizationOnboarding.slug,
-      });
-
-      // Make the orgOwner a member of the team
-      await createTestMembership({
-        userId: organizationOnboarding.createdById,
-        teamId: teamWithConflictingSlug.id,
-        role: MembershipRole.ADMIN,
-      });
-
-      const { organization } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      expect(organization.slug).toBe(organizationOnboarding.slug);
-    });
-
-    it("should not create organization if there is a team with same slug of which orgOwner(to-be) is not a member", async () => {
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-        organizationOnboarding: {
-          slug: "conflicting-org-with-same-slug",
-        },
-      });
-
-      await createTestTeam({
-        name: "TestTeamWithConflictingSlugNotOwnedByOrgOwner",
-        slug: organizationOnboarding.slug,
-      });
-
-      // Don't make the orgOwner a member of the team
-      // await createTestMembership({
-      //   userId: organizationOnboarding.createdById,
-      //   teamId: teamWithConflictingSlug.id,
-      //   role: MembershipRole.ADMIN,
-      // });
-
-      await expect(
-        createOrganizationFromOnboarding({
-          organizationOnboarding,
-          paymentSubscriptionId: "mock_subscription_id",
-          paymentSubscriptionItemId: "mock_subscription_item_id",
-        })
-      ).rejects.toThrow("organization_url_taken");
-    });
-
-    it("should not mark the Onboarding as completed(isComplete=true)", async () => {
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-      });
-
-      await expectOrganizationOnboardingToHaveDataContaining({
-        onboardingId: organizationOnboarding.id,
-        expectedData: {
-          isComplete: false,
-        },
-      });
-    });
-  });
-
-  describe("self-hosted", () => {
-    beforeEach(() => {
-      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(true);
-    });
-
-    it("should fail if the license is invalid", async () => {
-      vi.mocked(LicenseKeySingleton.getInstance as ReturnType<typeof vi.fn>).mockResolvedValue({
-        checkLicense: vi.fn().mockResolvedValue(false),
-      });
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-      });
-
-      await expect(
-        createOrganizationFromOnboarding({
-          organizationOnboarding,
-          paymentSubscriptionId: "mock_subscription_id",
-          paymentSubscriptionItemId: "mock_subscription_item_id",
-        })
-      ).rejects.toThrow("Self hosted license not valid");
-    });
-
-    it("should create an organization with a valid license", async () => {
-      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
-        checkLicense: vi.fn().mockResolvedValue(true),
-      });
-      const { organizationOnboarding } = await createOnboardingEligibleUserAndOnboarding({
-        user: {
-          email: "test@example.com",
-        },
-      });
-
-      const { organization, owner } = await createOrganizationFromOnboarding({
-        organizationOnboarding,
-        paymentSubscriptionId: "mock_subscription_id",
-        paymentSubscriptionItemId: "mock_subscription_item_id",
-      });
-
-      expect(organization).toBeDefined();
-      expect(owner).toBeDefined();
-    });
-  });
-});
diff --git a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.ts b/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.ts
deleted file mode 100644
index d6dec3481b3c0a..00000000000000
--- a/packages/features/ee/organizations/lib/server/createOrganizationFromOnboarding.ts
+++ /dev/null
@@ -1,567 +0,0 @@
-import type { TFunction } from "i18next";
-
-import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
-import { sendOrganizationCreationEmail } from "@calcom/emails/email-manager";
-import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
-import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
-import {
-  assertCanCreateOrg,
-  findUserToBeOrgOwner,
-  setupDomain,
-} from "@calcom/features/ee/organizations/lib/server/orgCreationUtils";
-import { DEFAULT_SCHEDULE } from "@calcom/lib/availability";
-import { getAvailabilityFromSchedule } from "@calcom/lib/availability";
-import { IS_SELF_HOSTED } from "@calcom/lib/constants";
-import logger from "@calcom/lib/logger";
-import { safeStringify } from "@calcom/lib/safeStringify";
-import { getTranslation } from "@calcom/lib/server/i18n";
-import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
-import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
-import { UserRepository } from "@calcom/lib/server/repository/user";
-import slugify from "@calcom/lib/slugify";
-import { prisma } from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
-import type { Team, User } from "@calcom/prisma/client";
-import type { OrganizationOnboarding } from "@calcom/prisma/client";
-import { MembershipRole, CreationSource } from "@calcom/prisma/enums";
-import {
-  userMetadata,
-  orgOnboardingInvitedMembersSchema,
-  orgOnboardingTeamsSchema,
-} from "@calcom/prisma/zod-utils";
-import { teamMetadataStrictSchema } from "@calcom/prisma/zod-utils";
-import { createTeamsHandler } from "@calcom/trpc/server/routers/viewer/organizations/createTeams.handler";
-import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
-
-// Onboarding can only be done from webapp currently and so we consider the source for User as WEBAPP
-const creationSource = CreationSource.WEBAPP;
-const log = logger.getSubLogger({ prefix: ["createOrganizationFromOnboarding"] });
-// Types for organization data
-type OrganizationData = {
-  id: number | null;
-  name: string;
-  slug: string;
-  isOrganizationConfigured: boolean;
-  isOrganizationAdminReviewed: boolean;
-  autoAcceptEmail: string;
-  seats: number | null;
-  pricePerSeat: number | null;
-  isPlatform: boolean;
-  logoUrl: string | null;
-  bio: string | null;
-  billingPeriod?: "MONTHLY" | "ANNUALLY";
-};
-
-type TeamData = {
-  id: number;
-  name: string;
-  isBeingMigrated: boolean;
-  slug: string | null;
-};
-
-type InvitedMember = {
-  email: string;
-  name?: string;
-};
-
-type OrgOwner = Awaited<ReturnType<typeof findUserToBeOrgOwner>>;
-
-type OrganizationOnboardingArg = Pick<
-  OrganizationOnboarding,
-  | "id"
-  | "organizationId"
-  | "name"
-  | "slug"
-  | "orgOwnerEmail"
-  | "seats"
-  | "pricePerSeat"
-  | "billingPeriod"
-  | "invitedMembers"
-  | "teams"
-  | "isPlatform"
-  | "logo"
-  | "bio"
-  | "stripeCustomerId"
-  | "isDomainConfigured"
->;
-
-const invitedMembersSchema = orgOnboardingInvitedMembersSchema;
-const teamsSchema = orgOnboardingTeamsSchema;
-
-async function createOrganizationWithExistingUserAsOwner({
-  owner,
-  orgData,
-}: {
-  owner: NonNullable<Awaited<ReturnType<typeof findUserToBeOrgOwner>>>;
-  orgData: OrganizationData;
-}) {
-  const orgOwnerTranslation = await getTranslation(owner.locale || "en", "common");
-  // We prefer ID which would be available if it is a retry of createOrganizationFromOnboarding and earlier organization was created and connected with Onboarding
-  let organization = orgData.id ? await OrganizationRepository.findById({ id: orgData.id }) : null;
-
-  if (organization) {
-    log.info(
-      `Reusing existing organization:`,
-      safeStringify({
-        slug: orgData.slug,
-        id: organization.id,
-      })
-    );
-    return { organization };
-  }
-
-  const { slugConflictType } = await assertCanCreateOrg({
-    slug: orgData.slug,
-    isPlatform: orgData.isPlatform,
-    orgOwner: owner,
-    errorOnUserAlreadyPartOfOrg: false,
-    // If it would have been restricted, then it would have been done already in intentToCreateOrgHandler
-    // This restriction doesn't apply for admin as we would have validated it already in intentToCreateOrgHandler, we just relax it here as we don't know who created the organization.
-    // TODO: If needed, we could start tracking if the onboarding is being done by instance Admin and relax it then only.
-    restrictBasedOnMinimumPublishedTeams: false,
-  });
-
-  // In this case we create the organization with slug=null. Let the teams migrate and then the conflict would go away.
-  const canSetSlug = slugConflictType === "teamUserIsMemberOfExists" ? false : true;
-
-  log.info(
-    `Creating organization for owner ${owner.email} with slug ${orgData.slug} and canSetSlug=${canSetSlug}`
-  );
-
-  try {
-    const nonOrgUsername = owner.username || "";
-    const orgCreationResult = await OrganizationRepository.createWithExistingUserAsOwner({
-      orgData: {
-        ...orgData,
-        ...(canSetSlug ? { slug: orgData.slug } : { slug: null, requestedSlug: orgData.slug }),
-      },
-      owner: {
-        id: owner.id,
-        email: owner.email,
-        nonOrgUsername,
-      },
-    });
-    organization = orgCreationResult.organization;
-    const ownerProfile = orgCreationResult.ownerProfile;
-
-    // Send organization creation email
-    if (!orgData.isPlatform) {
-      await sendOrganizationCreationEmail({
-        language: orgOwnerTranslation,
-        from: `${organization.name}'s admin`,
-        to: owner.email,
-        ownerNewUsername: ownerProfile.username,
-        ownerOldUsername: nonOrgUsername,
-        orgDomain: getOrgFullOrigin(orgData.slug, { protocol: false }),
-        orgName: organization.name,
-        prevLink: `${getOrgFullOrigin("", { protocol: true })}/${owner.username || ""}`,
-        newLink: `${getOrgFullOrigin(orgData.slug, { protocol: true })}/${ownerProfile.username}`,
-      });
-    }
-
-    // Set up default availability
-    const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);
-    await prisma.availability.createMany({
-      data: availability.map((schedule) => ({
-        days: schedule.days,
-        startTime: schedule.startTime,
-        endTime: schedule.endTime,
-        userId: owner.id,
-      })),
-    });
-  } catch (error) {
-    // Catch and log so that redactError doesn't redact the log message
-    log.error(
-      `RecoverableError: Error creating organization for owner ${owner.email}.`,
-      safeStringify(error)
-    );
-    throw error;
-  }
-
-  return { organization };
-}
-
-async function createOrganizationWithNonExistentUserAsOwner({
-  email,
-  orgData,
-}: {
-  email: string;
-  orgData: OrganizationData;
-}) {
-  let organization = orgData.id
-    ? await OrganizationRepository.findById({ id: orgData.id })
-    : await OrganizationRepository.findBySlug({ slug: orgData.slug });
-
-  if (organization) {
-    log.info(
-      `createOrganizationWithNonExistentUserAsOwner: Reusing existing organization:`,
-      safeStringify({ slug: orgData.slug, id: organization.id })
-    );
-    const owner = await findUserToBeOrgOwner(email);
-    if (!owner) {
-      // Can happen when the organization was created earlier and the webhook had failed and when the webhook got fired again in next subscription update, then the email was deleted already
-      // The fix would be to change the email in Onboarding record to new owner of the organization
-      // TODO: Identify the owner of the organization from Membership table and use that email instead here.
-      throw new Error(`Org exists but owner could not be found for email: ${email}`);
-    }
-    return { organization, owner };
-  }
-
-  const orgCreationResult = await OrganizationRepository.createWithNonExistentOwner({
-    orgData,
-    owner: {
-      email: email,
-    },
-    creationSource,
-  });
-  organization = orgCreationResult.organization;
-  const { ownerProfile, orgOwner: orgOwnerFromCreation } = orgCreationResult;
-  const orgOwner = await findUserToBeOrgOwner(orgOwnerFromCreation.email);
-  if (!orgOwner) {
-    throw new Error(
-      `Just created the owner ${orgOwnerFromCreation.email}, but couldn't find it in the database`
-    );
-  }
-
-  const translation = await getTranslation(orgOwner.locale ?? "en", "common");
-
-  await sendEmailVerification({
-    email: orgOwner.email,
-    language: orgOwner.locale ?? "en",
-    username: ownerProfile.username || "",
-    isPlatform: orgData.isPlatform,
-  });
-
-  if (!orgData.isPlatform) {
-    await sendOrganizationCreationEmail({
-      language: translation,
-      from: orgOwner.name ?? `${organization.name}'s admin`,
-      to: orgOwner.email,
-      ownerNewUsername: ownerProfile.username,
-      ownerOldUsername: null,
-      orgDomain: getOrgFullOrigin(orgData.slug, { protocol: false }),
-      orgName: organization.name,
-      prevLink: null,
-      newLink: `${getOrgFullOrigin(orgData.slug, { protocol: true })}/${ownerProfile.username}`,
-    });
-  }
-
-  return {
-    organization,
-    owner: orgOwner,
-  };
-}
-
-async function createOrMoveTeamsToOrganization(teams: TeamData[], owner: User, organizationId: number) {
-  if (teams.length === 0) return;
-
-  const teamsToCreate = teams.filter((team) => !team.isBeingMigrated).map((team) => team.name);
-  const teamsToMove = teams
-    .filter((team) => team.isBeingMigrated)
-    .map((team) => ({
-      id: team.id,
-      newSlug: team.slug ? slugify(team.slug) : team.slug,
-      shouldMove: true,
-    }));
-
-  log.info(
-    `Creating ${teamsToCreate} teams and moving ${teamsToMove.map(
-      (team) => team.newSlug
-    )} teams for organization ${organizationId}`
-  );
-
-  await createTeamsHandler({
-    ctx: {
-      user: {
-        ...owner,
-        organizationId,
-      },
-    },
-    input: {
-      teamNames: teamsToCreate,
-      orgId: organizationId,
-      moveTeams: teamsToMove,
-      creationSource,
-    },
-  });
-
-  log.info(
-    `Created ${teamsToCreate.length} teams and moved ${teamsToMove.length} teams for organization ${organizationId}`
-  );
-}
-
-async function inviteMembers(invitedMembers: InvitedMember[], organization: Team) {
-  if (invitedMembers.length === 0) return;
-
-  log.info(`Inviting ${invitedMembers.length} members to organization ${organization.id}`);
-  await inviteMembersWithNoInviterPermissionCheck({
-    inviterName: null,
-    teamId: organization.id,
-    language: "en",
-    creationSource: CreationSource.WEBAPP,
-    orgSlug: organization.slug || null,
-    invitations: invitedMembers.map((member) => ({
-      usernameOrEmail: member.email,
-      role: MembershipRole.MEMBER,
-    })),
-    isDirectUserAction: false,
-  });
-}
-
-async function ensureStripeCustomerIdIsUpdated({
-  owner,
-  stripeCustomerId,
-}: {
-  owner: User;
-  stripeCustomerId: string;
-}) {
-  const parsedMetadata = userMetadata.parse(owner.metadata);
-
-  await new UserRepository(prisma).updateStripeCustomerId({
-    id: owner.id,
-    stripeCustomerId: stripeCustomerId,
-    existingMetadata: parsedMetadata,
-  });
-}
-
-/**
- * Temporary till we adapt all other code reading from metadata about stripeSubscriptionId and stripeSubscriptionItemId
- */
-async function backwardCompatibilityForSubscriptionDetails({
-  organization,
-  paymentSubscriptionId,
-  paymentSubscriptionItemId,
-}: {
-  organization: {
-    id: number;
-    metadata: Prisma.JsonValue;
-  };
-  paymentSubscriptionId?: string;
-  paymentSubscriptionItemId?: string;
-}) {
-  if (!paymentSubscriptionId || !paymentSubscriptionItemId) {
-    return organization;
-  }
-
-  const existingMetadata = teamMetadataStrictSchema.parse(organization.metadata);
-  const updatedOrganization = await OrganizationRepository.updateStripeSubscriptionDetails({
-    id: organization.id,
-    stripeSubscriptionId: paymentSubscriptionId,
-    stripeSubscriptionItemId: paymentSubscriptionItemId,
-    existingMetadata,
-  });
-  return updatedOrganization;
-}
-
-async function hasConflictingOrganization({ slug, onboardingId }: { slug: string; onboardingId: string }) {
-  const organization = await OrganizationRepository.findBySlugIncludeOnboarding({ slug });
-  if (!organization?.organizationOnboarding) {
-    // Old organizations created without onboarding,
-    return false;
-  }
-
-  // Different onboardingId means existing organization is owned by someone else
-  return organization.organizationOnboarding.id !== onboardingId;
-}
-
-async function handleDomainSetup({
-  organizationOnboarding,
-  orgOwnerTranslation,
-}: {
-  organizationOnboarding: OrganizationOnboardingArg;
-  orgOwnerTranslation: TFunction;
-}) {
-  if (!organizationOnboarding.isDomainConfigured) {
-    // Important: Setup Domain first before creating the organization as Vercel/Cloudflare might not allow the domain to be created and that could cause organization booking pages to not actually work
-    await setupDomain({
-      slug: organizationOnboarding.slug,
-      isPlatform: organizationOnboarding.isPlatform,
-      orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
-      orgOwnerTranslation,
-    });
-  }
-
-  await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
-    isDomainConfigured: true,
-  });
-}
-
-async function handleOrganizationCreation({
-  organizationOnboarding,
-  owner,
-  paymentSubscriptionId,
-  paymentSubscriptionItemId,
-}: {
-  organizationOnboarding: OrganizationOnboardingArg;
-  owner: OrgOwner;
-  paymentSubscriptionId?: string;
-  paymentSubscriptionItemId?: string;
-}) {
-  if (IS_SELF_HOSTED) {
-    const deploymentRepo = new DeploymentRepository(prisma);
-    const licenseKeyService = await LicenseKeySingleton.getInstance(deploymentRepo);
-    const hasValidLicense = await licenseKeyService.checkLicense();
-
-    if (!hasValidLicense) {
-      throw new Error("Self hosted license not valid");
-    }
-  }
-
-  let organization;
-  const orgData = {
-    id: organizationOnboarding.organizationId,
-    name: organizationOnboarding.name,
-    // Create organization with slug=null, so that org slug doesn't conflict with existing team that is probably being migrated and thus would not be a conflict any more
-    // Remember one can have a subteam with same slug as some organization, but regular team and organization can't have same slug
-    slug: organizationOnboarding.slug,
-    isOrganizationConfigured: true,
-    // We believe that as the payment has been accepted first and we also restrict the emails to company emails, it is safe to set this to true.
-    // We could easily set it to false if needed. In effect, it disables impersonations by non-admin reviewed organization's owner and also disables editing the member details
-    isOrganizationAdminReviewed: true,
-    autoAcceptEmail: organizationOnboarding.orgOwnerEmail.split("@")[1],
-    seats: organizationOnboarding.seats,
-    pricePerSeat: organizationOnboarding.pricePerSeat,
-    isPlatform: false,
-    billingPeriod: organizationOnboarding.billingPeriod,
-    logoUrl: organizationOnboarding.logo,
-    bio: organizationOnboarding.bio,
-  };
-
-  log.info(
-    "handleOrganizationCreation",
-    safeStringify({ orgId: organizationOnboarding.organizationId, orgSlug: organizationOnboarding.slug })
-  );
-  if (!owner) {
-    const result = await createOrganizationWithNonExistentUserAsOwner({
-      email: organizationOnboarding.orgOwnerEmail,
-      orgData,
-    });
-    organization = result.organization;
-    owner = result.owner;
-  } else {
-    const result = await createOrganizationWithExistingUserAsOwner({
-      orgData,
-      owner,
-    });
-    organization = result.organization;
-  }
-
-  if (organizationOnboarding.stripeCustomerId) {
-    // Mostly needed for newly created user through the flow, existing user would have it already when checkout was created
-    // We need to set it there to ensure that for the same user new customerId is not created again
-    await ensureStripeCustomerIdIsUpdated({
-      owner,
-      stripeCustomerId: organizationOnboarding.stripeCustomerId,
-    });
-  }
-
-  // Connect the organization to the onboarding
-  await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
-    organizationId: organization.id,
-  });
-
-  const updatedOrganization = await backwardCompatibilityForSubscriptionDetails({
-    organization,
-    paymentSubscriptionId,
-    paymentSubscriptionItemId,
-  });
-
-  return {
-    organization: {
-      ...organization,
-      metadata: updatedOrganization.metadata,
-    },
-    owner,
-  };
-}
-
-/**
- * This function is used by stripe webhook, so it should expect to be called multiple times till the entire flow completes without any error.
- * So, it should be idempotent.
- */
-export const createOrganizationFromOnboarding = async ({
-  organizationOnboarding,
-  paymentSubscriptionId,
-  paymentSubscriptionItemId,
-}: {
-  organizationOnboarding: OrganizationOnboardingArg;
-  paymentSubscriptionId?: string;
-  paymentSubscriptionItemId?: string;
-}) => {
-  log.info(
-    "createOrganizationFromOnboarding",
-    safeStringify({
-      orgId: organizationOnboarding.organizationId,
-      orgSlug: organizationOnboarding.slug,
-    })
-  );
-
-  if (!IS_SELF_HOSTED && (!paymentSubscriptionId || !paymentSubscriptionItemId)) {
-    throw new Error("payment_subscription_id_and_payment_subscription_item_id_are_required");
-  }
-
-  if (
-    await hasConflictingOrganization({
-      slug: organizationOnboarding.slug,
-      onboardingId: organizationOnboarding.id,
-    })
-  ) {
-    throw new Error("organization_already_exists_with_this_slug");
-  }
-
-  // We know admin permissions have been validated in the above step so we can safely normalize the input
-  const userFromEmail = await findUserToBeOrgOwner(organizationOnboarding.orgOwnerEmail);
-  const orgOwnerTranslation = await getTranslation(userFromEmail?.locale || "en", "common");
-
-  // TODO: We need to send emails to admin in the case of SELF_HOSTING where NEXT_PUBLIC_SINGLE_ORG_SLUG isn't set
-  if (!process.env.NEXT_PUBLIC_SINGLE_ORG_SLUG) {
-    await handleDomainSetup({
-      organizationOnboarding,
-      orgOwnerTranslation,
-    });
-  }
-
-  const { organization, owner } = await handleOrganizationCreation({
-    organizationOnboarding,
-    owner: userFromEmail,
-    paymentSubscriptionId,
-    paymentSubscriptionItemId,
-  });
-
-  await inviteMembers(invitedMembersSchema.parse(organizationOnboarding.invitedMembers), organization);
-
-  await createOrMoveTeamsToOrganization(
-    teamsSchema.parse(organizationOnboarding.teams),
-    owner,
-    organization.id
-  );
-
-  // If the organization was created with slug=null, then set the slug now, assuming that the team having the same slug is migrated now
-  // If the team wasn't owned by the orgOwner, then org creation would have failed and we wouldn't be here
-  if (!organization.slug) {
-    try {
-      const { slug } = await OrganizationRepository.setSlug({
-        id: organization.id,
-        slug: organizationOnboarding.slug,
-      });
-      organization.slug = slug;
-    } catch (error) {
-      // Almost always the reason would be that the organization's slug conflicts with a team's slug
-      // The owner might not have chosen the conflicting team for migration - Can be confirmed by checking `teams` column in the database.
-      log.error(
-        "RecoverableError: Error while setting slug for organization",
-        safeStringify(error),
-        safeStringify({
-          attemptedSlug: organizationOnboarding.slug,
-          organizationId: organization.id,
-        })
-      );
-      throw new Error(
-        `Unable to set slug '${organizationOnboarding.slug}' for organization ${organization.id}`
-      );
-    }
-  }
-
-  return { organization, owner };
-};
diff --git a/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts b/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts
new file mode 100644
index 00000000000000..40c315d4b29b08
--- /dev/null
+++ b/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts
@@ -0,0 +1,116 @@
+import { describe, expect, it } from "vitest";
+
+import { isNotACompanyEmail } from "./orgCreationUtils";
+
+describe("orgCreationUtils", () => {
+  describe("isNotACompanyEmail", () => {
+    it("should return true for gmail.com email", () => {
+      expect(isNotACompanyEmail("user@gmail.com")).toBe(true);
+    });
+
+    it("should return true for yahoo.com email", () => {
+      expect(isNotACompanyEmail("user@yahoo.com")).toBe(true);
+    });
+
+    it("should return true for outlook.com email", () => {
+      expect(isNotACompanyEmail("user@outlook.com")).toBe(true);
+    });
+
+    it("should return true for hotmail.com email", () => {
+      expect(isNotACompanyEmail("user@hotmail.com")).toBe(true);
+    });
+
+    it("should return true for protonmail.com email", () => {
+      expect(isNotACompanyEmail("user@protonmail.com")).toBe(true);
+    });
+
+    it("should return true for proton.me email", () => {
+      expect(isNotACompanyEmail("user@proton.me")).toBe(true);
+    });
+
+    it("should return true for icloud.com email", () => {
+      expect(isNotACompanyEmail("user@icloud.com")).toBe(true);
+    });
+
+    it("should return true for live.com email", () => {
+      expect(isNotACompanyEmail("user@live.com")).toBe(true);
+    });
+
+    it("should return false for company email", () => {
+      expect(isNotACompanyEmail("user@company.com")).toBe(false);
+    });
+
+    it("should return false for company email with subdomain", () => {
+      expect(isNotACompanyEmail("user@mail.company.com")).toBe(false);
+    });
+
+    it("should return false for company email with country code", () => {
+      expect(isNotACompanyEmail("user@company.co.uk")).toBe(false);
+    });
+
+    it("should return true for invalid email without @", () => {
+      expect(isNotACompanyEmail("invalidemail")).toBe(true);
+    });
+
+    it("should return true for empty email", () => {
+      expect(isNotACompanyEmail("")).toBe(true);
+    });
+
+    it("should return true for email with multiple @ symbols", () => {
+      expect(isNotACompanyEmail("user@@company.com")).toBe(false);
+    });
+
+    it("should return true for all popular personal email providers", () => {
+      const personalProviders = [
+        "gmail.com",
+        "yahoo.com",
+        "outlook.com",
+        "hotmail.com",
+        "aol.com",
+        "icloud.com",
+        "mail.com",
+        "protonmail.com",
+        "proton.me",
+        "zoho.com",
+        "yandex.com",
+        "gmx.com",
+        "fastmail.com",
+        "inbox.com",
+        "me.com",
+        "hushmail.com",
+        "live.com",
+        "rediffmail.com",
+        "tutanota.com",
+        "mail.ru",
+        "usa.com",
+        "qq.com",
+        "163.com",
+        "web.de",
+        "rocketmail.com",
+        "excite.com",
+        "lycos.com",
+        "outlook.co",
+        "hotmail.co.uk",
+      ];
+
+      personalProviders.forEach((provider) => {
+        expect(isNotACompanyEmail(`user@${provider}`)).toBe(true);
+      });
+    });
+
+    it("should return false for various company domains", () => {
+      const companyDomains = [
+        "acme.com",
+        "techcorp.io",
+        "business.co",
+        "startup.ai",
+        "enterprise.net",
+        "cal.com",
+      ];
+
+      companyDomains.forEach((domain) => {
+        expect(isNotACompanyEmail(`user@${domain}`)).toBe(false);
+      });
+    });
+  });
+});
diff --git a/packages/features/ee/organizations/lib/server/orgCreationUtils.ts b/packages/features/ee/organizations/lib/server/orgCreationUtils.ts
index 525a2e8255cb72..6bc078f4406607 100644
--- a/packages/features/ee/organizations/lib/server/orgCreationUtils.ts
+++ b/packages/features/ee/organizations/lib/server/orgCreationUtils.ts
@@ -2,6 +2,7 @@ import { lookup } from "dns";
 import { type TFunction } from "i18next";
 
 import { sendAdminOrganizationNotification } from "@calcom/emails";
+import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import {
   RESERVED_SUBDOMAINS,
   ORG_MINIMUM_PUBLISHED_TEAMS_SELF_SERVE,
@@ -11,7 +12,7 @@ import {
 import { createDomain } from "@calcom/lib/domainManager/organization";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import { UserPermissionRole } from "@calcom/prisma/enums";
 
@@ -20,7 +21,7 @@ const log = logger.getSubLogger({ prefix: ["orgCreationUtils"] });
 /**
  * We can only say for sure that the email is not a company email. We can't say for sure if it is a company email.
  */
-function isNotACompanyEmail(email: string) {
+export function isNotACompanyEmail(email: string) {
   // A list of popular @domains that can't be used to allow automatic acceptance of memberships to organization
   const emailProviders = [
     "gmail.com",
@@ -185,7 +186,13 @@ export async function assertCanCreateOrg({
   restrictBasedOnMinimumPublishedTeams: boolean;
   errorOnUserAlreadyPartOfOrg?: boolean;
 }) {
-  const verifiedUser = orgOwner.completedOnboarding && !!orgOwner.emailVerified;
+  const featuresRepository = new FeaturesRepository(prisma);
+  const emailVerificationEnabled = await featuresRepository.checkIfFeatureIsEnabledGlobally(
+    "email-verification"
+  );
+
+  const verifiedUser =
+    orgOwner.completedOnboarding && (emailVerificationEnabled ? !!orgOwner.emailVerified : true);
   if (!verifiedUser) {
     log.warn(
       "you_need_to_complete_user_onboarding_before_creating_an_organization",
diff --git a/packages/features/ee/organizations/lib/service/onboarding/BaseOnboardingService.ts b/packages/features/ee/organizations/lib/service/onboarding/BaseOnboardingService.ts
new file mode 100644
index 00000000000000..4390024ab7a008
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/BaseOnboardingService.ts
@@ -0,0 +1,605 @@
+import type { TFunction } from "i18next";
+
+import { sendOrganizationCreationEmail } from "@calcom/emails/email-manager";
+import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
+import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
+import {
+  assertCanCreateOrg,
+  findUserToBeOrgOwner,
+  setupDomain,
+} from "@calcom/features/ee/organizations/lib/server/orgCreationUtils";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { getTranslation } from "@calcom/lib/server/i18n";
+import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
+import slugify from "@calcom/lib/slugify";
+import { prisma } from "@calcom/prisma";
+import type { Prisma, Team, User } from "@calcom/prisma/client";
+import { CreationSource, MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
+import {
+  userMetadata,
+  orgOnboardingInvitedMembersSchema,
+  orgOnboardingTeamsSchema,
+  teamMetadataStrictSchema,
+} from "@calcom/prisma/zod-utils";
+import { createTeamsHandler } from "@calcom/trpc/server/routers/viewer/organizations/createTeams.handler";
+import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
+
+import { OrganizationPaymentService } from "../../OrganizationPaymentService";
+import { OrganizationPermissionService } from "../../OrganizationPermissionService";
+import type { IOrganizationOnboardingService } from "./IOrganizationOnboardingService";
+import type {
+  TeamInput,
+  InvitedMemberInput,
+  CreateOnboardingIntentInput,
+  OnboardingUser,
+  OrganizationData,
+  TeamData,
+  InvitedMember,
+  OrganizationOnboardingData,
+  OnboardingIntentResult,
+} from "./types";
+
+const log = logger.getSubLogger({ prefix: ["BaseOnboardingService"] });
+const invitedMembersSchema = orgOnboardingInvitedMembersSchema;
+const teamsSchema = orgOnboardingTeamsSchema;
+
+type OrgOwner = Awaited<ReturnType<typeof findUserToBeOrgOwner>>;
+
+export abstract class BaseOnboardingService implements IOrganizationOnboardingService {
+  protected user: OnboardingUser;
+  protected paymentService: OrganizationPaymentService;
+  protected permissionService: OrganizationPermissionService;
+
+  constructor(
+    user: OnboardingUser,
+    paymentService?: OrganizationPaymentService,
+    permissionService?: OrganizationPermissionService
+  ) {
+    this.user = user;
+    this.paymentService = paymentService || new OrganizationPaymentService(user);
+    this.permissionService = permissionService || new OrganizationPermissionService(user);
+  }
+
+  abstract createOnboardingIntent(input: CreateOnboardingIntentInput): Promise<any>;
+  abstract createOrganization(
+    organizationOnboarding: OrganizationOnboardingData,
+    paymentDetails?: { subscriptionId: string; subscriptionItemId: string }
+  ): Promise<{ organization: Team; owner: User }>;
+
+  protected async createOnboardingRecord(input: CreateOnboardingIntentInput & { onboardingId?: string }) {
+    // If onboardingId exists, update the existing record (resume flow)
+    if (input.onboardingId) {
+      log.debug(
+        "Updating existing organization onboarding record (resume flow)",
+        safeStringify({
+          onboardingId: input.onboardingId,
+          slug: input.slug,
+          name: input.name,
+        })
+      );
+
+      await OrganizationOnboardingRepository.update(input.onboardingId, {
+        logo: input.logo ?? null,
+        bio: input.bio ?? null,
+        brandColor: input.brandColor ?? null,
+        bannerUrl: input.bannerUrl ?? null,
+        teams: input.teams ?? [],
+        invitedMembers: input.invitedMembers ?? [],
+      });
+
+      const updatedOnboarding = await OrganizationOnboardingRepository.findById(input.onboardingId);
+      if (!updatedOnboarding) {
+        throw new Error(`Onboarding record ${input.onboardingId} not found after update`);
+      }
+
+      log.debug("Organization onboarding updated", safeStringify({ onboardingId: updatedOnboarding.id }));
+      return updatedOnboarding;
+    }
+
+    // Create new onboarding record
+    log.debug(
+      "Creating organization onboarding record",
+      safeStringify({
+        slug: input.slug,
+        name: input.name,
+        orgOwnerEmail: input.orgOwnerEmail,
+        isPlatform: input.isPlatform,
+      })
+    );
+
+    const organizationOnboarding = await this.paymentService.createOrganizationOnboarding({
+      name: input.name,
+      slug: input.slug,
+      orgOwnerEmail: input.orgOwnerEmail,
+      seats: input.seats,
+      pricePerSeat: input.pricePerSeat,
+      billingPeriod: input.billingPeriod,
+      createdByUserId: this.user.id,
+      logo: input.logo ?? null,
+      bio: input.bio ?? null,
+      brandColor: input.brandColor ?? null,
+      bannerUrl: input.bannerUrl ?? null,
+      teams: input.teams ?? [],
+      invitedMembers: input.invitedMembers ?? [],
+    });
+
+    log.debug("Organization onboarding created", safeStringify({ onboardingId: organizationOnboarding.id }));
+
+    return organizationOnboarding;
+  }
+
+  protected filterTeamsAndInvites(teams: TeamInput[] = [], invitedMembers: InvitedMemberInput[] = []) {
+    const teamsData = teams
+      .filter((team) => team.name.trim().length > 0)
+      .map((team) => ({
+        id: team.id === -1 ? -1 : team.id,
+        name: team.name,
+        isBeingMigrated: team.isBeingMigrated,
+        slug: team.slug,
+      }));
+
+    const invitedMembersData = invitedMembers
+      .filter((invite) => invite.email.trim().length > 0)
+      .map((invite) => ({
+        email: invite.email,
+        name: invite.name,
+        teamId: invite.teamId,
+        teamName: invite.teamName,
+        role: invite.role,
+      }));
+
+    return { teamsData, invitedMembersData };
+  }
+
+  protected handleAdminHandoverIfNeeded(
+    input: CreateOnboardingIntentInput,
+    onboardingId: string
+  ): OnboardingIntentResult | null {
+    const isAdminHandoverFlow =
+      this.user.role === UserPermissionRole.ADMIN &&
+      this.user.email !== input.orgOwnerEmail &&
+      (!input.teams || input.teams.length === 0) &&
+      (!input.invitedMembers || input.invitedMembers.length === 0);
+
+    log.debug(
+      "Checking admin handover flow",
+      safeStringify({
+        userRole: this.user.role,
+        isAdmin: this.user.role === UserPermissionRole.ADMIN,
+        userEmail: this.user.email,
+        orgOwnerEmail: input.orgOwnerEmail,
+        emailsDifferent: this.user.email !== input.orgOwnerEmail,
+        teamsEmpty: !input.teams || input.teams.length === 0,
+        membersEmpty: !input.invitedMembers || input.invitedMembers.length === 0,
+        isAdminHandoverFlow,
+      })
+    );
+
+    if (!isAdminHandoverFlow) {
+      return null;
+    }
+
+    log.debug(
+      "Admin handover flow detected",
+      safeStringify({ adminEmail: this.user.email, orgOwnerEmail: input.orgOwnerEmail })
+    );
+
+    return {
+      userId: this.user.id,
+      orgOwnerEmail: input.orgOwnerEmail,
+      name: input.name,
+      slug: input.slug,
+      seats: input.seats ?? null,
+      pricePerSeat: input.pricePerSeat ?? null,
+      billingPeriod: input.billingPeriod,
+      isPlatform: input.isPlatform,
+      organizationOnboardingId: onboardingId,
+      checkoutUrl: null,
+      organizationId: null,
+      handoverUrl: `${WEBAPP_URL}/settings/organizations/new/resume?onboardingId=${onboardingId}`,
+    };
+  }
+
+  protected isAdminCreatingForSelf(input: { orgOwnerEmail: string }): boolean {
+    return this.user.role === UserPermissionRole.ADMIN && this.user.email === input.orgOwnerEmail;
+  }
+
+  protected async createOrganizationWithExistingUserAsOwner({
+    owner,
+    orgData,
+  }: {
+    owner: NonNullable<Awaited<ReturnType<typeof findUserToBeOrgOwner>>>;
+    orgData: OrganizationData;
+  }) {
+    const orgOwnerTranslation = await getTranslation(owner.locale || "en", "common");
+    let organization = orgData.id ? await OrganizationRepository.findById({ id: orgData.id }) : null;
+
+    if (organization) {
+      log.info(
+        `Reusing existing organization:`,
+        safeStringify({
+          slug: orgData.slug,
+          id: organization.id,
+        })
+      );
+      return { organization };
+    }
+
+    const { slugConflictType } = await assertCanCreateOrg({
+      slug: orgData.slug,
+      isPlatform: orgData.isPlatform,
+      orgOwner: owner,
+      errorOnUserAlreadyPartOfOrg: false,
+      restrictBasedOnMinimumPublishedTeams: false,
+    });
+
+    const canSetSlug = slugConflictType === "teamUserIsMemberOfExists" ? false : true;
+
+    log.info(
+      `Creating organization for owner ${owner.email} with slug ${orgData.slug} and canSetSlug=${canSetSlug}`
+    );
+
+    try {
+      const nonOrgUsername = owner.username || "";
+      const orgCreationResult = await OrganizationRepository.createWithExistingUserAsOwner({
+        orgData: {
+          ...orgData,
+          ...(canSetSlug ? { slug: orgData.slug } : { slug: null, requestedSlug: orgData.slug }),
+        },
+        owner: {
+          id: owner.id,
+          email: owner.email,
+          nonOrgUsername,
+        },
+      });
+      organization = orgCreationResult.organization;
+      const ownerProfile = orgCreationResult.ownerProfile;
+
+      if (!orgData.isPlatform) {
+        await sendOrganizationCreationEmail({
+          language: orgOwnerTranslation,
+          from: `${organization.name}'s admin`,
+          to: owner.email,
+          ownerNewUsername: ownerProfile.username,
+          ownerOldUsername: nonOrgUsername,
+          orgDomain: getOrgFullOrigin(orgData.slug, { protocol: false }),
+          orgName: organization.name,
+          prevLink: `${getOrgFullOrigin("", { protocol: true })}/${owner.username || ""}`,
+          newLink: `${getOrgFullOrigin(orgData.slug, { protocol: true })}/${ownerProfile.username}`,
+        });
+      }
+
+      const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);
+      await prisma.availability.createMany({
+        data: availability.map((schedule) => ({
+          days: schedule.days,
+          startTime: schedule.startTime,
+          endTime: schedule.endTime,
+          userId: owner.id,
+        })),
+      });
+    } catch (error) {
+      log.error(
+        `RecoverableError: Error creating organization for owner ${owner.email}.`,
+        safeStringify(error)
+      );
+      throw error;
+    }
+
+    return { organization };
+  }
+
+  protected async createOrganizationWithNonExistentUserAsOwner({
+    email,
+    orgData,
+  }: {
+    email: string;
+    orgData: OrganizationData;
+  }) {
+    let organization = orgData.id
+      ? await OrganizationRepository.findById({ id: orgData.id })
+      : await OrganizationRepository.findBySlug({ slug: orgData.slug });
+
+    if (organization) {
+      log.info(
+        `createOrganizationWithNonExistentUserAsOwner: Reusing existing organization:`,
+        safeStringify({ slug: orgData.slug, id: organization.id })
+      );
+      const owner = await findUserToBeOrgOwner(email);
+      if (!owner) {
+        throw new Error(`Org exists but owner could not be found for email: ${email}`);
+      }
+      return { organization, owner };
+    }
+
+    const orgCreationResult = await OrganizationRepository.createWithNonExistentOwner({
+      orgData,
+      owner: {
+        email: email,
+      },
+      creationSource: CreationSource.WEBAPP,
+    });
+    organization = orgCreationResult.organization;
+    const { ownerProfile, orgOwner: orgOwnerFromCreation } = orgCreationResult;
+    const orgOwner = await findUserToBeOrgOwner(orgOwnerFromCreation.email);
+    if (!orgOwner) {
+      throw new Error(
+        `Just created the owner ${orgOwnerFromCreation.email}, but couldn't find it in the database`
+      );
+    }
+
+    const translation = await getTranslation(orgOwner.locale ?? "en", "common");
+
+    await sendEmailVerification({
+      email: orgOwner.email,
+      language: orgOwner.locale ?? "en",
+      username: ownerProfile.username || "",
+      isPlatform: orgData.isPlatform,
+    });
+
+    if (!orgData.isPlatform) {
+      await sendOrganizationCreationEmail({
+        language: translation,
+        from: orgOwner.name ?? `${organization.name}'s admin`,
+        to: orgOwner.email,
+        ownerNewUsername: ownerProfile.username,
+        ownerOldUsername: null,
+        orgDomain: getOrgFullOrigin(orgData.slug, { protocol: false }),
+        orgName: organization.name,
+        prevLink: null,
+        newLink: `${getOrgFullOrigin(orgData.slug, { protocol: true })}/${ownerProfile.username}`,
+      });
+    }
+
+    return {
+      organization,
+      owner: orgOwner,
+    };
+  }
+
+  protected async createOrMoveTeamsToOrganization(teams: TeamData[], owner: User, organizationId: number) {
+    if (teams.length === 0) return;
+
+    const teamsToCreate = teams.filter((team) => !team.isBeingMigrated).map((team) => team.name);
+    const teamsToMove = teams
+      .filter((team) => team.isBeingMigrated)
+      .map((team) => ({
+        id: team.id,
+        newSlug: team.slug ? slugify(team.slug) : team.slug,
+        shouldMove: true,
+      }));
+
+    log.info(
+      `Creating ${teamsToCreate} teams and moving ${teamsToMove.map(
+        (team) => team.newSlug
+      )} teams for organization ${organizationId}`
+    );
+
+    await createTeamsHandler({
+      ctx: {
+        user: {
+          ...owner,
+          organizationId,
+        },
+      },
+      input: {
+        teamNames: teamsToCreate,
+        orgId: organizationId,
+        moveTeams: teamsToMove,
+        creationSource: CreationSource.WEBAPP,
+      },
+    });
+
+    log.info(
+      `Created ${teamsToCreate.length} teams and moved ${teamsToMove.length} teams for organization ${organizationId}`
+    );
+  }
+
+  protected async inviteMembers(invitedMembers: InvitedMember[], organization: Team, teamsData: TeamData[]) {
+    if (invitedMembers.length === 0) return;
+
+    log.info(
+      `Processing ${invitedMembers.length} member invites for organization ${organization.id}`,
+      safeStringify({
+        invitedMembers: invitedMembers.map((m) => ({
+          email: m.email,
+          teamId: m.teamId,
+          teamName: m.teamName,
+          role: m.role,
+        })),
+      })
+    );
+
+    const createdTeams = await prisma.team.findMany({
+      where: {
+        parentId: organization.id,
+      },
+      select: {
+        id: true,
+        name: true,
+        slug: true,
+      },
+    });
+
+    log.info(
+      `Found ${createdTeams.length} teams in organization`,
+      safeStringify({
+        teams: createdTeams.map((t) => ({ id: t.id, name: t.name })),
+      })
+    );
+
+    const teamNameToId = new Map<string, number>();
+    createdTeams.forEach((team) => {
+      teamNameToId.set(team.name.toLowerCase(), team.id);
+    });
+
+    const teamIdMap = new Map<number, number>();
+    teamsData.forEach((teamData) => {
+      if (teamData.isBeingMigrated) {
+        teamIdMap.set(teamData.id, teamData.id);
+      } else {
+        const createdTeam = createdTeams.find((t) => t.name === teamData.name);
+        if (createdTeam) {
+          teamIdMap.set(teamData.id, createdTeam.id);
+        }
+      }
+    });
+
+    const invitesToOrg: InvitedMember[] = [];
+    const invitesToTeams = new Map<number, InvitedMember[]>();
+
+    for (const member of invitedMembers) {
+      let targetTeamId: number | undefined;
+
+      if (member.teamId !== undefined) {
+        targetTeamId = teamIdMap.get(member.teamId) || member.teamId;
+        log.debug(`Member ${member.email}: teamId ${member.teamId} -> resolved to ${targetTeamId}`);
+      } else if (member.teamName) {
+        targetTeamId = teamNameToId.get(member.teamName.toLowerCase());
+        log.debug(
+          `Member ${member.email}: teamName "${member.teamName}" -> resolved to ${
+            targetTeamId || "not found"
+          }`
+        );
+      }
+
+      if (targetTeamId && createdTeams.some((t) => t.id === targetTeamId)) {
+        if (!invitesToTeams.has(targetTeamId)) {
+          invitesToTeams.set(targetTeamId, []);
+        }
+        invitesToTeams.get(targetTeamId)!.push(member);
+        log.debug(`Member ${member.email} will be invited to team ${targetTeamId}`);
+      } else {
+        invitesToOrg.push(member);
+        log.debug(
+          `Member ${member.email} will be invited to organization (no team specified or team not found)`
+        );
+      }
+    }
+
+    log.info(
+      "Invite categorization complete",
+      safeStringify({
+        orgInvites: invitesToOrg.length,
+        teamInvites: invitesToTeams.size,
+        teamBreakdown: Array.from(invitesToTeams.entries()).map(([teamId, members]) => ({
+          teamId,
+          count: members.length,
+          emails: members.map((m) => m.email),
+        })),
+      })
+    );
+
+    if (invitesToOrg.length > 0) {
+      log.info(`Inviting ${invitesToOrg.length} members to organization ${organization.id}`);
+      await inviteMembersWithNoInviterPermissionCheck({
+        inviterName: null,
+        teamId: organization.id,
+        language: "en",
+        creationSource: CreationSource.WEBAPP,
+        orgSlug: organization.slug || null,
+        invitations: invitesToOrg.map((member) => ({
+          usernameOrEmail: member.email,
+          role: (member.role as MembershipRole) || MembershipRole.MEMBER,
+        })),
+        isDirectUserAction: false,
+      });
+    }
+
+    for (const [teamId, members] of Array.from(invitesToTeams.entries())) {
+      const teamName = createdTeams.find((t) => t.id === teamId)?.name || `team ${teamId}`;
+      log.info(`Inviting ${members.length} members to team "${teamName}" (${teamId})`);
+      await inviteMembersWithNoInviterPermissionCheck({
+        inviterName: null,
+        teamId: teamId,
+        language: "en",
+        creationSource: CreationSource.WEBAPP,
+        orgSlug: organization.slug || null,
+        invitations: members.map((member: InvitedMember) => ({
+          usernameOrEmail: member.email,
+          role: (member.role as MembershipRole) || MembershipRole.MEMBER,
+        })),
+        isDirectUserAction: false,
+      });
+    }
+
+    log.info("All member invites processed successfully");
+  }
+
+  protected async ensureStripeCustomerIdIsUpdated({
+    owner,
+    stripeCustomerId,
+  }: {
+    owner: User;
+    stripeCustomerId: string;
+  }) {
+    const parsedMetadata = userMetadata.parse(owner.metadata);
+
+    await new UserRepository(prisma).updateStripeCustomerId({
+      id: owner.id,
+      stripeCustomerId: stripeCustomerId,
+      existingMetadata: parsedMetadata,
+    });
+  }
+
+  protected async backwardCompatibilityForSubscriptionDetails({
+    organization,
+    paymentSubscriptionId,
+    paymentSubscriptionItemId,
+  }: {
+    organization: {
+      id: number;
+      metadata: Prisma.JsonValue;
+    };
+    paymentSubscriptionId?: string;
+    paymentSubscriptionItemId?: string;
+  }) {
+    if (!paymentSubscriptionId || !paymentSubscriptionItemId) {
+      return organization;
+    }
+
+    const existingMetadata = teamMetadataStrictSchema.parse(organization.metadata);
+    const updatedOrganization = await OrganizationRepository.updateStripeSubscriptionDetails({
+      id: organization.id,
+      stripeSubscriptionId: paymentSubscriptionId,
+      stripeSubscriptionItemId: paymentSubscriptionItemId,
+      existingMetadata,
+    });
+    return updatedOrganization;
+  }
+
+  protected async hasConflictingOrganization({ slug, onboardingId }: { slug: string; onboardingId: string }) {
+    const organization = await OrganizationRepository.findBySlugIncludeOnboarding({ slug });
+    if (!organization?.organizationOnboarding) {
+      return false;
+    }
+
+    return organization.organizationOnboarding.id !== onboardingId;
+  }
+
+  protected async handleDomainSetup({
+    organizationOnboarding,
+    orgOwnerTranslation,
+  }: {
+    organizationOnboarding: OrganizationOnboardingData;
+    orgOwnerTranslation: TFunction;
+  }) {
+    if (!organizationOnboarding.isDomainConfigured) {
+      await setupDomain({
+        slug: organizationOnboarding.slug,
+        isPlatform: organizationOnboarding.isPlatform,
+        orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+        orgOwnerTranslation,
+      });
+    }
+
+    await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
+      isDomainConfigured: true,
+    });
+  }
+}
diff --git a/packages/features/ee/organizations/lib/service/onboarding/BillingEnabledOrgOnboardingService.ts b/packages/features/ee/organizations/lib/service/onboarding/BillingEnabledOrgOnboardingService.ts
new file mode 100644
index 00000000000000..a8fc3bf6a1d8b8
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/BillingEnabledOrgOnboardingService.ts
@@ -0,0 +1,270 @@
+import { findUserToBeOrgOwner } from "@calcom/features/ee/organizations/lib/server/orgCreationUtils";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import { IS_SELF_HOSTED } from "@calcom/lib/constants";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { getTranslation } from "@calcom/lib/server/i18n";
+import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
+import type { Team, User } from "@calcom/prisma/client";
+import { orgOnboardingInvitedMembersSchema, orgOnboardingTeamsSchema } from "@calcom/prisma/zod-utils";
+
+import { BaseOnboardingService } from "../onboarding/BaseOnboardingService";
+import type {
+  CreateOnboardingIntentInput,
+  OnboardingIntentResult,
+  OrganizationOnboardingData,
+  OrganizationData,
+} from "../onboarding/types";
+
+const log = logger.getSubLogger({ prefix: ["BillingEnabledOrgOnboardingService"] });
+
+const invitedMembersSchema = orgOnboardingInvitedMembersSchema;
+const teamsSchema = orgOnboardingTeamsSchema;
+
+/**
+ * Handles organization onboarding when billing is enabled (Stripe flow).
+ *
+ * Flow:
+ * 1. Create onboarding record
+ * 2. Store teams/invites in database
+ * 3. Create Stripe checkout session
+ * 4. Return checkout URL
+ * 5. Organization created later via Stripe webhook
+ *
+ * Exception: Admin creating org for self - immediately creates organization (no payment required)
+ */
+export class BillingEnabledOrgOnboardingService extends BaseOnboardingService {
+  async createOnboardingIntent(input: CreateOnboardingIntentInput): Promise<OnboardingIntentResult> {
+    log.debug(
+      "BillingEnabledOrgOnboardingService.createOnboardingIntent - INPUT",
+      safeStringify({
+        invitedMembers: input.invitedMembers,
+        teams: input.teams,
+      })
+    );
+
+    const { teamsData, invitedMembersData } = this.filterTeamsAndInvites(input.teams, input.invitedMembers);
+
+    log.debug(
+      "BillingEnabledOrgOnboardingService - After filterTeamsAndInvites",
+      safeStringify({
+        teamsData,
+        invitedMembersData,
+      })
+    );
+
+    // Create onboarding record with ALL data at once
+    const organizationOnboarding = await this.createOnboardingRecord({
+      ...input,
+      teams: teamsData,
+      invitedMembers: invitedMembersData,
+    });
+    const onboardingId = organizationOnboarding.id;
+
+    // Check if this is an admin handover flow
+    const handoverResult = this.handleAdminHandoverIfNeeded(input, onboardingId);
+    if (handoverResult) {
+      return handoverResult;
+    }
+
+    // Check if admin is creating org for themselves - skip payment, create immediately
+    if (
+      this.isAdminCreatingForSelf({
+        orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+      })
+    ) {
+      log.debug(
+        "Admin creating org for self - skipping payment and creating organization immediately",
+        safeStringify({ adminEmail: this.user.email, onboardingId })
+      );
+
+      const { organization } = await this.createOrganization(organizationOnboarding);
+
+      await OrganizationOnboardingRepository.markAsComplete(onboardingId);
+
+      log.debug(
+        "Organization created successfully for admin",
+        safeStringify({ onboardingId, organizationId: organization.id })
+      );
+
+      return {
+        userId: this.user.id,
+        orgOwnerEmail: input.orgOwnerEmail,
+        name: input.name,
+        slug: input.slug,
+        seats: input.seats ?? null,
+        pricePerSeat: input.pricePerSeat ?? null,
+        billingPeriod: input.billingPeriod,
+        isPlatform: input.isPlatform,
+        organizationOnboardingId: onboardingId,
+        checkoutUrl: null,
+        organizationId: organization.id,
+      };
+    }
+
+    // Regular flow - create payment intent
+    const paymentIntent = await this.paymentService.createPaymentIntent(
+      {
+        logo: input.logo ?? null,
+        bio: input.bio ?? null,
+        brandColor: input.brandColor ?? null,
+        bannerUrl: input.bannerUrl ?? null,
+        teams: teamsData,
+        invitedMembers: invitedMembersData,
+      },
+      {
+        id: organizationOnboarding.id,
+        pricePerSeat: organizationOnboarding.pricePerSeat,
+        billingPeriod: organizationOnboarding.billingPeriod,
+        seats: organizationOnboarding.seats,
+        isComplete: organizationOnboarding.isComplete,
+        orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+        slug: organizationOnboarding.slug,
+        stripeCustomerId: organizationOnboarding.stripeCustomerId,
+      }
+    );
+
+    return {
+      userId: this.user.id,
+      orgOwnerEmail: input.orgOwnerEmail,
+      name: input.name,
+      slug: input.slug,
+      seats: input.seats ?? null,
+      pricePerSeat: input.pricePerSeat ?? null,
+      billingPeriod: input.billingPeriod,
+      isPlatform: input.isPlatform,
+      organizationOnboardingId: onboardingId,
+      checkoutUrl: paymentIntent.checkoutUrl,
+      organizationId: null, // Organization not created yet (pending payment)
+    };
+  }
+
+  async createOrganization(
+    organizationOnboarding: OrganizationOnboardingData,
+    paymentDetails?: { subscriptionId: string; subscriptionItemId: string }
+  ): Promise<{ organization: Team; owner: User }> {
+    log.info(
+      "createOrganization (billing-enabled)",
+      safeStringify({
+        orgId: organizationOnboarding.organizationId,
+        orgSlug: organizationOnboarding.slug,
+      })
+    );
+
+    const isAdminForSelf = this.isAdminCreatingForSelf({
+      orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+    });
+
+    if (
+      !IS_SELF_HOSTED &&
+      !isAdminForSelf &&
+      (!paymentDetails?.subscriptionId || !paymentDetails?.subscriptionItemId)
+    ) {
+      throw new Error("payment_subscription_id_and_payment_subscription_item_id_are_required");
+    }
+
+    if (
+      await this.hasConflictingOrganization({
+        slug: organizationOnboarding.slug,
+        onboardingId: organizationOnboarding.id,
+      })
+    ) {
+      throw new Error("organization_already_exists_with_this_slug");
+    }
+
+    let owner = await findUserToBeOrgOwner(organizationOnboarding.orgOwnerEmail);
+    const orgOwnerTranslation = await getTranslation(owner?.locale || "en", "common");
+
+    if (!process.env.NEXT_PUBLIC_SINGLE_ORG_SLUG) {
+      await this.handleDomainSetup({
+        organizationOnboarding,
+        orgOwnerTranslation,
+      });
+    }
+
+    const orgData: OrganizationData = {
+      id: organizationOnboarding.organizationId,
+      name: organizationOnboarding.name,
+      slug: organizationOnboarding.slug,
+      isOrganizationConfigured: true,
+      isOrganizationAdminReviewed: true,
+      autoAcceptEmail: organizationOnboarding.orgOwnerEmail.split("@")[1],
+      seats: organizationOnboarding.seats,
+      pricePerSeat: organizationOnboarding.pricePerSeat,
+      isPlatform: false,
+      billingPeriod: organizationOnboarding.billingPeriod,
+      logoUrl: organizationOnboarding.logo,
+      bio: organizationOnboarding.bio,
+      brandColor: organizationOnboarding.brandColor,
+      bannerUrl: organizationOnboarding.bannerUrl,
+    };
+
+    let organization: Team;
+    if (!owner) {
+      const result = await this.createOrganizationWithNonExistentUserAsOwner({
+        email: organizationOnboarding.orgOwnerEmail,
+        orgData,
+      });
+      organization = result.organization;
+      owner = result.owner;
+    } else {
+      const result = await this.createOrganizationWithExistingUserAsOwner({
+        orgData,
+        owner,
+      });
+      organization = result.organization;
+    }
+
+    if (organizationOnboarding.stripeCustomerId) {
+      await this.ensureStripeCustomerIdIsUpdated({
+        owner,
+        stripeCustomerId: organizationOnboarding.stripeCustomerId,
+      });
+    }
+
+    await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
+      organizationId: organization.id,
+    });
+
+    const updatedOrganization = await this.backwardCompatibilityForSubscriptionDetails({
+      organization,
+      paymentSubscriptionId: paymentDetails?.subscriptionId,
+      paymentSubscriptionItemId: paymentDetails?.subscriptionItemId,
+    });
+
+    organization.metadata = updatedOrganization.metadata;
+
+    const teamsData = teamsSchema.parse(organizationOnboarding.teams);
+    await this.createOrMoveTeamsToOrganization(teamsData, owner, organization.id);
+
+    await this.inviteMembers(
+      invitedMembersSchema.parse(organizationOnboarding.invitedMembers),
+      organization,
+      teamsData
+    );
+
+    if (!organization.slug) {
+      try {
+        const { slug } = await OrganizationRepository.setSlug({
+          id: organization.id,
+          slug: organizationOnboarding.slug,
+        });
+        organization.slug = slug;
+      } catch (error) {
+        log.error(
+          "RecoverableError: Error while setting slug for organization",
+          safeStringify(error),
+          safeStringify({
+            attemptedSlug: organizationOnboarding.slug,
+            organizationId: organization.id,
+          })
+        );
+        throw new Error(
+          `Unable to set slug '${organizationOnboarding.slug}' for organization ${organization.id}`
+        );
+      }
+    }
+
+    return { organization, owner };
+  }
+}
diff --git a/packages/features/ee/organizations/lib/service/onboarding/IOrganizationOnboardingService.ts b/packages/features/ee/organizations/lib/service/onboarding/IOrganizationOnboardingService.ts
new file mode 100644
index 00000000000000..e66ed3c70ad248
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/IOrganizationOnboardingService.ts
@@ -0,0 +1,32 @@
+import type { Team, User } from "@calcom/prisma/client";
+
+import type {
+  CreateOnboardingIntentInput,
+  OnboardingIntentResult,
+  OrganizationOnboardingData,
+} from "./types";
+
+/**
+ * Interface for organization onboarding services.
+ * Implementations handle different onboarding flows (billing-enabled vs self-hosted).
+ */
+export interface IOrganizationOnboardingService {
+  /**
+   * Creates an organization onboarding intent.
+   * Depending on the implementation:
+   * - BillingEnabled: Creates Stripe checkout session, returns checkoutUrl
+   * - SelfHosted: Creates organization immediately, returns organizationId
+   */
+  createOnboardingIntent(input: CreateOnboardingIntentInput): Promise<OnboardingIntentResult>;
+
+  /**
+   * Creates the actual organization from onboarding data.
+   * Depending on the implementation:
+   * - SelfHosted: Validates license, creates organization without payment
+   * - BillingEnabled: Requires payment details, handles subscription
+   */
+  createOrganization(
+    organizationOnboarding: OrganizationOnboardingData,
+    paymentDetails?: { subscriptionId: string; subscriptionItemId: string }
+  ): Promise<{ organization: Team; owner: User }>;
+}
diff --git a/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingFactory.ts b/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingFactory.ts
new file mode 100644
index 00000000000000..1f2a95237ad26e
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingFactory.ts
@@ -0,0 +1,53 @@
+import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+
+import { BillingEnabledOrgOnboardingService } from "./BillingEnabledOrgOnboardingService";
+import type { IOrganizationOnboardingService } from "./IOrganizationOnboardingService";
+import { SelfHostedOrganizationOnboardingService } from "./SelfHostedOnboardingService";
+import type { OnboardingUser } from "./types";
+
+const log = logger.getSubLogger({ prefix: ["OrganizationOnboardingFactory"] });
+
+/**
+ * Factory that selects the appropriate onboarding service based on configuration:
+ * - Self-hosted flow (billing disabled) when: IS_TEAM_BILLING_ENABLED=false
+ * - Exception: E2E tests always use self-hosted flow
+ * Otherwise, billing is enabled (Stripe flow).
+ */
+export class OrganizationOnboardingFactory {
+  static create(user: OnboardingUser): IOrganizationOnboardingService {
+    const isBillingEnabled = this.isBillingEnabled();
+
+    log.debug(
+      "Creating onboarding service",
+      safeStringify({
+        userId: user.id,
+        role: user.role,
+        IS_TEAM_BILLING_ENABLED: IS_TEAM_BILLING_ENABLED,
+        isBillingEnabled,
+        serviceType: isBillingEnabled ? "BillingEnabled" : "SelfHosted",
+      })
+    );
+
+    if (isBillingEnabled) {
+      return new BillingEnabledOrgOnboardingService(user);
+    } else {
+      return new SelfHostedOrganizationOnboardingService(user);
+    }
+  }
+
+  private static isBillingEnabled(): boolean {
+    // E2E tests always skip billing (use self-hosted flow)
+    if (process.env.NEXT_PUBLIC_IS_E2E) {
+      return false;
+    }
+
+    // If billing is enabled globally, use it
+    if (IS_TEAM_BILLING_ENABLED) {
+      return true;
+    }
+
+    return false;
+  }
+}
diff --git a/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingSetup.md b/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingSetup.md
new file mode 100644
index 00000000000000..9352144899f28b
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/OrganizationOnboardingSetup.md
@@ -0,0 +1,170 @@
+# Organization Onboarding Setup
+
+This document explains how the organization onboarding system works and how to configure it for different deployment scenarios.
+
+## Overview
+
+The organization onboarding system supports two different flows:
+
+1. **Billing-Enabled Flow** (BillingEnabledOrgOnboardingService): Used on hosted Cal.com with Stripe integration
+2. **Self-Hosted Flow** (SelfHostedOrganizationOnboardingService): Used on self-hosted instances where admins can create organizations without payment
+
+The system automatically selects the appropriate flow based on environment variables and user permissions.
+
+## Architecture
+
+### Factory Pattern
+
+The `OrganizationOnboardingFactory` class determines which onboarding service to use:
+
+```typescript
+OrganizationOnboardingFactory.create(user)
+  → BillingEnabledOrgOnboardingService | SelfHostedOrganizationOnboardingService
+```
+
+### Decision Logic
+
+The factory uses the following logic to determine which service to instantiate:
+
+```
+IF process.env.NEXT_PUBLIC_IS_E2E is set:
+  → Use SelfHostedOrganizationOnboardingService (E2E tests always skip billing)
+
+ELSE IF IS_TEAM_BILLING_ENABLED is true:
+  → Use BillingEnabledOrgOnboardingService (hosted environment with Stripe)
+
+ELSE IF user.role is ADMIN:
+  → Use SelfHostedOrganizationOnboardingService (self-hosted admins skip billing)
+
+ELSE:
+  → Use BillingEnabledOrgOnboardingService (non-admins need billing even on self-hosted)
+```
+
+## Environment Variables
+
+### Required for Billing-Enabled Flow
+
+```bash
+# Stripe Configuration
+STRIPE_CLIENT_ID=your_stripe_client_id
+NEXT_PUBLIC_STRIPE_PUBLIC_KEY=your_stripe_public_key
+STRIPE_PRIVATE_KEY=your_stripe_private_key
+
+# These enable IS_STRIPE_ENABLED and IS_TEAM_BILLING_ENABLED
+```
+
+### Optional Configuration
+
+```bash
+# Force hosted features on self-hosted instances
+NEXT_PUBLIC_HOSTED_CAL_FEATURES=true
+
+# E2E testing (disables billing flow)
+NEXT_PUBLIC_IS_E2E=1
+
+# Organization pricing
+NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=5
+NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE_NEW=37
+```
+
+## Constants
+
+The system relies on several computed constants from `@calcom/lib/constants`:
+
+### Server-Side Constants
+
+- **`IS_TEAM_BILLING_ENABLED`**: `IS_STRIPE_ENABLED && HOSTED_CAL_FEATURES`
+  - Determines if billing is globally enabled
+  - Used in: `OrganizationOnboardingFactory`
+
+- **`IS_STRIPE_ENABLED`**: `!!(STRIPE_CLIENT_ID && NEXT_PUBLIC_STRIPE_PUBLIC_KEY && STRIPE_PRIVATE_KEY)`
+  - Checks if Stripe is properly configured
+
+- **`HOSTED_CAL_FEATURES`**: `process.env.NEXT_PUBLIC_HOSTED_CAL_FEATURES || !IS_SELF_HOSTED`
+  - Enables hosted features (including billing)
+
+- **`IS_SELF_HOSTED`**: `!CAL_DOMAINS.some(domain => WEBAPP_HOSTNAME.endsWith(domain))`
+  - Detects if running on official Cal.com domains
+
+### Client-Side Constants
+
+- **`IS_TEAM_BILLING_ENABLED_CLIENT`**: `!!process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY && HOSTED_CAL_FEATURES`
+  - Client-safe version of billing check
+  - Used in: `onboardingStore.ts`
+
+## Configuration Scenarios
+
+### Scenario 1: Hosted Cal.com (Official)
+
+**Environment:**
+```bash
+# Domain: *.cal.com, *.cal.dev, etc.
+STRIPE_CLIENT_ID=ca_xxx
+NEXT_PUBLIC_STRIPE_PUBLIC_KEY=pk_live_xxx
+STRIPE_PRIVATE_KEY=sk_live_xxx
+```
+
+**Result:**
+- `IS_SELF_HOSTED` = `false`
+- `HOSTED_CAL_FEATURES` = `true`
+- `IS_TEAM_BILLING_ENABLED` = `true`
+- All users → **BillingEnabledOrgOnboardingService**
+
+### Scenario 2: Self-Hosted with Billing (Optional)
+
+**Environment:**
+```bash
+# Domain: custom.example.com
+NEXT_PUBLIC_HOSTED_CAL_FEATURES=true
+STRIPE_CLIENT_ID=ca_xxx
+NEXT_PUBLIC_STRIPE_PUBLIC_KEY=pk_live_xxx
+STRIPE_PRIVATE_KEY=sk_live_xxx
+```
+
+**Result:**
+- `IS_SELF_HOSTED` = `true`
+- `HOSTED_CAL_FEATURES` = `true` (forced)
+- `IS_TEAM_BILLING_ENABLED` = `true`
+- All users → **BillingEnabledOrgOnboardingService**
+
+### Scenario 3: Self-Hosted without Billing (Default)
+
+**Environment:**
+```bash
+# Domain: custom.example.com
+# No Stripe configuration
+```
+
+**Result:**
+- `IS_SELF_HOSTED` = `true`
+- `HOSTED_CAL_FEATURES` = `false`
+- `IS_TEAM_BILLING_ENABLED` = `false`
+- Admin users → **SelfHostedOrganizationOnboardingService**
+- Regular users → **BillingEnabledOrgOnboardingService** (will fail without Stripe)
+
+**Recommendation:** In this scenario, only admins should be allowed to create organizations.
+
+### Scenario 4: E2E Testing
+
+**Environment:**
+```bash
+NEXT_PUBLIC_IS_E2E=1
+# Any other configuration
+```
+
+**Result:**
+- All users → **SelfHostedOrganizationOnboardingService**
+- Billing flow is completely bypassed
+
+## User Roles
+
+The system differentiates between two user roles:
+
+### Admin Users (`UserPermissionRole.ADMIN`)
+- Can create organizations without billing on self-hosted instances
+- Can access self-hosted flow when `IS_TEAM_BILLING_ENABLED` is false
+
+### Regular Users (`UserPermissionRole.USER`)
+- Always require billing flow
+- Cannot create organizations on self-hosted without Stripe configured
+```
diff --git a/packages/features/ee/organizations/lib/service/onboarding/SelfHostedOnboardingService.ts b/packages/features/ee/organizations/lib/service/onboarding/SelfHostedOnboardingService.ts
new file mode 100644
index 00000000000000..468f9471f39175
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/SelfHostedOnboardingService.ts
@@ -0,0 +1,230 @@
+import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
+import { findUserToBeOrgOwner } from "@calcom/features/ee/organizations/lib/server/orgCreationUtils";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import { IS_SELF_HOSTED } from "@calcom/lib/constants";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { getTranslation } from "@calcom/lib/server/i18n";
+import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";
+import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
+import { prisma } from "@calcom/prisma";
+import type { Team, User } from "@calcom/prisma/client";
+import { BillingPeriod } from "@calcom/prisma/enums";
+import { orgOnboardingInvitedMembersSchema, orgOnboardingTeamsSchema } from "@calcom/prisma/zod-utils";
+
+import { BaseOnboardingService } from "./BaseOnboardingService";
+import type {
+  CreateOnboardingIntentInput,
+  OnboardingIntentResult,
+  OrganizationOnboardingData,
+  OrganizationData,
+} from "./types";
+
+const log = logger.getSubLogger({ prefix: ["SelfHostedOrganizationOnboardingService"] });
+
+const invitedMembersSchema = orgOnboardingInvitedMembersSchema;
+const teamsSchema = orgOnboardingTeamsSchema;
+
+/**
+ * Handles organization onboarding when billing is disabled (self-hosted admin flow).
+ *
+ * Flow:
+ * 1. Create onboarding record
+ * 2. Store teams/invites in database
+ * 3. Immediately create organization, teams, and invite members
+ * 4. Mark onboarding as complete
+ * 5. Return organization ID
+ */
+export class SelfHostedOrganizationOnboardingService extends BaseOnboardingService {
+  async createOnboardingIntent(input: CreateOnboardingIntentInput): Promise<OnboardingIntentResult> {
+    log.debug(
+      "Starting self-hosted onboarding flow (immediate organization creation)",
+      safeStringify({
+        slug: input.slug,
+        teamsCount: input.teams?.length ?? 0,
+        invitesCount: input.invitedMembers?.length ?? 0,
+      })
+    );
+
+    // Step 1: Filter and normalize teams/invites
+    const { teamsData, invitedMembersData } = this.filterTeamsAndInvites(input.teams, input.invitedMembers);
+
+    // Step 2: Create onboarding record with ALL data at once
+    const organizationOnboarding = await this.createOnboardingRecord({
+      ...input,
+      teams: teamsData,
+      invitedMembers: invitedMembersData,
+    });
+    const onboardingId = organizationOnboarding.id;
+
+    // Check if this is an admin handover flow
+    const handoverResult = this.handleAdminHandoverIfNeeded(input, onboardingId);
+    if (handoverResult) {
+      return handoverResult;
+    }
+
+    // Step 3: Create organization immediately (regular self-hosted flow)
+    log.debug("Creating organization immediately (no payment required)", safeStringify({ onboardingId }));
+
+    const { organization } = await this.createOrganization({
+      id: onboardingId,
+      organizationId: null,
+      name: input.name,
+      slug: input.slug,
+      orgOwnerEmail: input.orgOwnerEmail,
+      seats: input.seats ?? null,
+      pricePerSeat: input.pricePerSeat ?? null,
+      billingPeriod: input.billingPeriod ?? BillingPeriod.MONTHLY,
+      invitedMembers: invitedMembersData,
+      teams: teamsData,
+      isPlatform: input.isPlatform,
+      logo: input.logo ?? null,
+      bio: input.bio ?? null,
+      brandColor: input.brandColor ?? null,
+      bannerUrl: input.bannerUrl ?? null,
+      stripeCustomerId: null,
+      isDomainConfigured: false,
+    });
+
+    // Step 4: Mark onboarding as complete
+    await OrganizationOnboardingRepository.markAsComplete(onboardingId);
+
+    log.debug(
+      "Organization created successfully",
+      safeStringify({ onboardingId, organizationId: organization.id })
+    );
+
+    // Step 5: Return result with organization ID
+    return {
+      userId: this.user.id,
+      orgOwnerEmail: input.orgOwnerEmail,
+      name: input.name,
+      slug: input.slug,
+      seats: input.seats ?? null,
+      pricePerSeat: input.pricePerSeat ?? null,
+      billingPeriod: input.billingPeriod,
+      isPlatform: input.isPlatform,
+      organizationOnboardingId: onboardingId,
+      checkoutUrl: null, // No checkout required
+      organizationId: organization.id, // Organization created immediately
+    };
+  }
+
+  async createOrganization(
+    organizationOnboarding: OrganizationOnboardingData
+  ): Promise<{ organization: Team; owner: User }> {
+    log.info(
+      "createOrganization (self-hosted)",
+      safeStringify({
+        orgId: organizationOnboarding.organizationId,
+        orgSlug: organizationOnboarding.slug,
+      })
+    );
+
+    if (IS_SELF_HOSTED) {
+      const deploymentRepo = new DeploymentRepository(prisma);
+      const licenseKeyService = await LicenseKeySingleton.getInstance(deploymentRepo);
+      const hasValidLicense = await licenseKeyService.checkLicense();
+
+      if (!hasValidLicense) {
+        throw new Error("Self hosted license not valid");
+      }
+    }
+
+    if (
+      await this.hasConflictingOrganization({
+        slug: organizationOnboarding.slug,
+        onboardingId: organizationOnboarding.id,
+      })
+    ) {
+      throw new Error("organization_already_exists_with_this_slug");
+    }
+
+    let owner = await findUserToBeOrgOwner(organizationOnboarding.orgOwnerEmail);
+    const orgOwnerTranslation = await getTranslation(owner?.locale || "en", "common");
+
+    if (!process.env.NEXT_PUBLIC_SINGLE_ORG_SLUG) {
+      await this.handleDomainSetup({
+        organizationOnboarding,
+        orgOwnerTranslation,
+      });
+    }
+
+    const orgData: OrganizationData = {
+      id: organizationOnboarding.organizationId,
+      name: organizationOnboarding.name,
+      slug: organizationOnboarding.slug,
+      isOrganizationConfigured: true,
+      isOrganizationAdminReviewed: true,
+      autoAcceptEmail: organizationOnboarding.orgOwnerEmail.split("@")[1],
+      seats: organizationOnboarding.seats,
+      pricePerSeat: organizationOnboarding.pricePerSeat,
+      isPlatform: false,
+      billingPeriod: organizationOnboarding.billingPeriod,
+      logoUrl: organizationOnboarding.logo,
+      bio: organizationOnboarding.bio,
+      brandColor: organizationOnboarding.brandColor,
+      bannerUrl: organizationOnboarding.bannerUrl,
+    };
+
+    let organization: Team;
+    if (!owner) {
+      const result = await this.createOrganizationWithNonExistentUserAsOwner({
+        email: organizationOnboarding.orgOwnerEmail,
+        orgData,
+      });
+      organization = result.organization;
+      owner = result.owner;
+    } else {
+      const result = await this.createOrganizationWithExistingUserAsOwner({
+        orgData,
+        owner,
+      });
+      organization = result.organization;
+    }
+
+    if (organizationOnboarding.stripeCustomerId) {
+      await this.ensureStripeCustomerIdIsUpdated({
+        owner,
+        stripeCustomerId: organizationOnboarding.stripeCustomerId,
+      });
+    }
+
+    await OrganizationOnboardingRepository.update(organizationOnboarding.id, {
+      organizationId: organization.id,
+    });
+
+    const teamsData = teamsSchema.parse(organizationOnboarding.teams);
+    await this.createOrMoveTeamsToOrganization(teamsData, owner, organization.id);
+
+    await this.inviteMembers(
+      invitedMembersSchema.parse(organizationOnboarding.invitedMembers),
+      organization,
+      teamsData
+    );
+
+    if (!organization.slug) {
+      try {
+        const { slug } = await OrganizationRepository.setSlug({
+          id: organization.id,
+          slug: organizationOnboarding.slug,
+        });
+        organization.slug = slug;
+      } catch (error) {
+        log.error(
+          "RecoverableError: Error while setting slug for organization",
+          safeStringify(error),
+          safeStringify({
+            attemptedSlug: organizationOnboarding.slug,
+            organizationId: organization.id,
+          })
+        );
+        throw new Error(
+          `Unable to set slug '${organizationOnboarding.slug}' for organization ${organization.id}`
+        );
+      }
+    }
+
+    return { organization, owner };
+  }
+}
diff --git a/packages/features/ee/organizations/lib/service/onboarding/__tests__/BaseOnboardingService.test.ts b/packages/features/ee/organizations/lib/service/onboarding/__tests__/BaseOnboardingService.test.ts
new file mode 100644
index 00000000000000..96d02fe588d4e0
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/__tests__/BaseOnboardingService.test.ts
@@ -0,0 +1,249 @@
+import { describe, expect, it } from "vitest";
+
+import { UserPermissionRole } from "@calcom/prisma/enums";
+
+import { BaseOnboardingService } from "../BaseOnboardingService";
+import type { CreateOnboardingIntentInput } from "../types";
+
+class TestableBaseOnboardingService extends BaseOnboardingService {
+  async createOnboardingIntent(input: CreateOnboardingIntentInput): Promise<any> {
+    throw new Error("Not implemented");
+  }
+
+  public testFilterTeamsAndInvites(
+    teams: CreateOnboardingIntentInput["teams"],
+    invitedMembers: CreateOnboardingIntentInput["invitedMembers"]
+  ) {
+    return this.filterTeamsAndInvites(teams, invitedMembers);
+  }
+}
+
+const mockUser = {
+  id: 1,
+  email: "user@example.com",
+  role: UserPermissionRole.USER,
+  name: "Test User",
+};
+
+describe("BaseOnboardingService", () => {
+  describe("filterTeamsAndInvites", () => {
+    it("should filter out invites with empty emails", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const invites = [
+        { email: "valid@example.com", teamName: "Marketing", role: "MEMBER" },
+        { email: "", teamName: "Sales", role: "ADMIN" },
+        { email: "   ", teamName: "Engineering", role: "MEMBER" },
+        { email: "another@example.com", teamName: "Design", role: "MEMBER" },
+      ];
+
+      const { invitedMembersData } = service.testFilterTeamsAndInvites([], invites);
+
+      expect(invitedMembersData).toHaveLength(2);
+      expect(invitedMembersData).toEqual([
+        {
+          email: "valid@example.com",
+          name: undefined,
+          teamId: undefined,
+          teamName: "Marketing",
+          role: "MEMBER",
+        },
+        {
+          email: "another@example.com",
+          name: undefined,
+          teamId: undefined,
+          teamName: "Design",
+          role: "MEMBER",
+        },
+      ]);
+    });
+
+    it("should preserve all fields from invites including role", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const invites = [
+        {
+          email: "member@example.com",
+          name: "John Doe",
+          teamId: 5,
+          teamName: "Marketing",
+          role: "MEMBER",
+        },
+        {
+          email: "admin@example.com",
+          name: "Jane Smith",
+          teamId: 10,
+          teamName: "Engineering",
+          role: "ADMIN",
+        },
+      ];
+
+      const { invitedMembersData } = service.testFilterTeamsAndInvites([], invites);
+
+      expect(invitedMembersData).toEqual([
+        {
+          email: "member@example.com",
+          name: "John Doe",
+          teamId: 5,
+          teamName: "Marketing",
+          role: "MEMBER",
+        },
+        {
+          email: "admin@example.com",
+          name: "Jane Smith",
+          teamId: 10,
+          teamName: "Engineering",
+          role: "ADMIN",
+        },
+      ]);
+    });
+
+    it("should handle invites without optional fields", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const invites = [
+        { email: "minimal@example.com" },
+        { email: "withteam@example.com", teamName: "Sales" },
+      ];
+
+      const { invitedMembersData } = service.testFilterTeamsAndInvites([], invites);
+
+      expect(invitedMembersData).toEqual([
+        {
+          email: "minimal@example.com",
+          name: undefined,
+          teamId: undefined,
+          teamName: undefined,
+          role: undefined,
+        },
+        {
+          email: "withteam@example.com",
+          name: undefined,
+          teamId: undefined,
+          teamName: "Sales",
+          role: undefined,
+        },
+      ]);
+    });
+
+    it("should filter out teams with empty names", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const teams = [
+        { id: 1, name: "Marketing", isBeingMigrated: false, slug: null },
+        { id: 2, name: "", isBeingMigrated: false, slug: null },
+        { id: 3, name: "   ", isBeingMigrated: false, slug: null },
+        { id: 4, name: "Engineering", isBeingMigrated: true, slug: "eng" },
+      ];
+
+      const { teamsData } = service.testFilterTeamsAndInvites(teams, []);
+
+      expect(teamsData).toHaveLength(2);
+      expect(teamsData).toEqual([
+        { id: 1, name: "Marketing", isBeingMigrated: false, slug: null },
+        { id: 4, name: "Engineering", isBeingMigrated: true, slug: "eng" },
+      ]);
+    });
+
+    it("should preserve team properties including migration status", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const teams = [
+        { id: -1, name: "New Team", isBeingMigrated: false, slug: null },
+        { id: 42, name: "Existing Team", isBeingMigrated: true, slug: "existing-team" },
+      ];
+
+      const { teamsData } = service.testFilterTeamsAndInvites(teams, []);
+
+      expect(teamsData).toEqual([
+        { id: -1, name: "New Team", isBeingMigrated: false, slug: null },
+        { id: 42, name: "Existing Team", isBeingMigrated: true, slug: "existing-team" },
+      ]);
+    });
+
+    it("should handle empty teams and invites arrays", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const { teamsData, invitedMembersData } = service.testFilterTeamsAndInvites([], []);
+
+      expect(teamsData).toEqual([]);
+      expect(invitedMembersData).toEqual([]);
+    });
+
+    it("should handle undefined teams and invites", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const { teamsData, invitedMembersData } = service.testFilterTeamsAndInvites(undefined, undefined);
+
+      expect(teamsData).toEqual([]);
+      expect(invitedMembersData).toEqual([]);
+    });
+
+    it("should preserve invites with teamId=-1 for new teams", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const teams = [
+        { id: -1, name: "Marketing", isBeingMigrated: false, slug: null },
+        { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+      ];
+
+      const invites = [
+        { email: "user1@example.com", teamId: -1, teamName: "Marketing", role: "MEMBER" },
+        { email: "user2@example.com", teamId: -1, teamName: "Sales", role: "ADMIN" },
+      ];
+
+      const { teamsData, invitedMembersData } = service.testFilterTeamsAndInvites(teams, invites);
+
+      expect(teamsData).toHaveLength(2);
+      expect(invitedMembersData).toHaveLength(2);
+      expect(invitedMembersData[0].teamId).toBe(-1);
+      expect(invitedMembersData[1].teamId).toBe(-1);
+      expect(invitedMembersData[0].role).toBe("MEMBER");
+      expect(invitedMembersData[1].role).toBe("ADMIN");
+    });
+
+    it("should handle mixed scenarios with both org-level and team-specific invites", () => {
+      const service = new TestableBaseOnboardingService(mockUser as any);
+
+      const teams = [
+        { id: -1, name: "Marketing", isBeingMigrated: false, slug: null },
+        { id: 42, name: "Engineering", isBeingMigrated: true, slug: "eng" },
+      ];
+
+      const invites = [
+        { email: "orguser@example.com", role: "MEMBER" },
+        { email: "marketing@example.com", teamName: "Marketing", teamId: -1, role: "MEMBER" },
+        { email: "eng@example.com", teamName: "Engineering", teamId: 42, role: "ADMIN" },
+      ];
+
+      const { teamsData, invitedMembersData } = service.testFilterTeamsAndInvites(teams, invites);
+
+      expect(teamsData).toHaveLength(2);
+      expect(invitedMembersData).toHaveLength(3);
+
+      expect(invitedMembersData[0]).toEqual({
+        email: "orguser@example.com",
+        name: undefined,
+        teamId: undefined,
+        teamName: undefined,
+        role: "MEMBER",
+      });
+
+      expect(invitedMembersData[1]).toEqual({
+        email: "marketing@example.com",
+        name: undefined,
+        teamId: -1,
+        teamName: "Marketing",
+        role: "MEMBER",
+      });
+
+      expect(invitedMembersData[2]).toEqual({
+        email: "eng@example.com",
+        name: undefined,
+        teamId: 42,
+        teamName: "Engineering",
+        role: "ADMIN",
+      });
+    });
+  });
+});
diff --git a/packages/features/ee/organizations/lib/service/onboarding/__tests__/BillingEnabledOrgOnboardingService.test.ts b/packages/features/ee/organizations/lib/service/onboarding/__tests__/BillingEnabledOrgOnboardingService.test.ts
new file mode 100644
index 00000000000000..493cdc9c0bc3b5
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/__tests__/BillingEnabledOrgOnboardingService.test.ts
@@ -0,0 +1,814 @@
+import prismock from "../../../../../../../../tests/libs/__mocks__/prisma";
+
+import { describe, expect, it, vi, beforeEach } from "vitest";
+
+import * as constants from "@calcom/lib/constants";
+import { createDomain } from "@calcom/lib/domainManager/organization";
+import { UserPermissionRole, CreationSource, MembershipRole, BillingPeriod } from "@calcom/prisma/enums";
+import { createTeamsHandler } from "@calcom/trpc/server/routers/viewer/organizations/createTeams.handler";
+import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
+
+import type { CreateOnboardingIntentInput } from "../../onboarding/types";
+import { BillingEnabledOrgOnboardingService } from "../BillingEnabledOrgOnboardingService";
+
+vi.mock("../../OrganizationPaymentService");
+
+vi.mock("@calcom/features/auth/lib/verifyEmail", () => ({
+  sendEmailVerification: vi.fn(),
+}));
+
+vi.mock("@calcom/emails/email-manager", () => ({
+  sendOrganizationCreationEmail: vi.fn(),
+}));
+
+vi.mock("@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler", () => ({
+  inviteMembersWithNoInviterPermissionCheck: vi.fn(),
+}));
+
+vi.mock("@calcom/trpc/server/routers/viewer/organizations/createTeams.handler", () => ({
+  createTeamsHandler: vi.fn(),
+}));
+
+vi.mock("@calcom/lib/domainManager/organization", () => ({
+  createDomain: vi.fn(),
+}));
+
+vi.mock("@calcom/lib/server/i18n", () => {
+  return {
+    getTranslation: async (locale: string, namespace: string) => {
+      const t = (key: string) => key;
+      t.locale = locale;
+      t.namespace = namespace;
+      return t;
+    },
+  };
+});
+
+const mockUser = {
+  id: 1,
+  email: "user@example.com",
+  role: UserPermissionRole.USER,
+  name: "Test User",
+};
+
+const mockInput: CreateOnboardingIntentInput = {
+  name: "Test Organization",
+  slug: "test-org",
+  orgOwnerEmail: "owner@example.com",
+  seats: 10,
+  pricePerSeat: 20,
+  isPlatform: false,
+  creationSource: CreationSource.WEBAPP,
+  logo: "https://example.com/logo.png",
+  bio: "Test bio",
+  brandColor: "#000000",
+  bannerUrl: "https://example.com/banner.png",
+  teams: [
+    { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+    { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+  ],
+  invitedMembers: [
+    { email: "member1@example.com", name: "Member 1" },
+    { email: "member2@example.com", name: "Member 2" },
+  ],
+};
+
+describe("BillingEnabledOrgOnboardingService", () => {
+  let service: BillingEnabledOrgOnboardingService;
+  let mockPaymentService: any;
+
+  beforeEach(async () => {
+    vi.resetAllMocks();
+    // @ts-expect-error reset is a method on Prismock
+    await prismock.reset();
+
+    mockPaymentService = {
+      createOrganizationOnboarding: vi.fn().mockImplementation(async (data: any) => {
+        // Actually create the record in prismock so it can be updated later
+        return await prismock.organizationOnboarding.create({
+          data: {
+            id: "onboarding-123",
+            name: data.name,
+            slug: data.slug,
+            orgOwnerEmail: data.orgOwnerEmail,
+            seats: data.seats ?? null,
+            pricePerSeat: data.pricePerSeat ?? null,
+            billingPeriod: data.billingPeriod ?? BillingPeriod.MONTHLY,
+            isComplete: false,
+            stripeCustomerId: null,
+            createdById: data.createdByUserId,
+            teams: [],
+            invitedMembers: [],
+            isPlatform: data.isPlatform ?? false,
+            logo: data.logo ?? null,
+            bio: data.bio ?? null,
+            brandColor: data.brandColor ?? null,
+            bannerUrl: data.bannerUrl ?? null,
+          },
+        });
+      }),
+      createPaymentIntent: vi.fn().mockResolvedValue({
+        checkoutUrl: "https://stripe.com/checkout/session",
+        organizationOnboarding: {},
+        subscription: {},
+        sessionId: "session-123",
+      }),
+    };
+
+    service = new BillingEnabledOrgOnboardingService(mockUser as any, mockPaymentService);
+  });
+
+  describe("createOnboardingIntent", () => {
+    it("should create onboarding record", async () => {
+      await service.createOnboardingIntent(mockInput);
+
+      expect(mockPaymentService.createOrganizationOnboarding).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: mockInput.name,
+          slug: mockInput.slug,
+          orgOwnerEmail: mockInput.orgOwnerEmail,
+          createdByUserId: mockUser.id,
+        })
+      );
+    });
+
+    it("should create Stripe payment intent with teams and invites", async () => {
+      await service.createOnboardingIntent(mockInput);
+
+      expect(mockPaymentService.createPaymentIntent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teams: expect.arrayContaining([
+            { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+            { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+          ]),
+          invitedMembers: expect.arrayContaining([
+            { email: "member1@example.com", name: "Member 1" },
+            { email: "member2@example.com", name: "Member 2" },
+          ]),
+        }),
+        expect.anything()
+      );
+    });
+
+    it("should return checkout URL", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      expect(result.checkoutUrl).toBe("https://stripe.com/checkout/session");
+      expect(result.organizationId).toBeNull();
+    });
+
+    it("should filter out empty team names", async () => {
+      const inputWithEmptyTeams = {
+        ...mockInput,
+        teams: [
+          { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+          { id: -1, name: "  ", isBeingMigrated: false, slug: null },
+          { id: -1, name: "", isBeingMigrated: false, slug: null },
+        ],
+      };
+
+      await service.createOnboardingIntent(inputWithEmptyTeams);
+
+      expect(mockPaymentService.createPaymentIntent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teams: [{ id: -1, name: "Engineering", isBeingMigrated: false, slug: null }],
+        }),
+        expect.anything()
+      );
+    });
+
+    it("should filter out empty invite emails", async () => {
+      const inputWithEmptyInvites = {
+        ...mockInput,
+        invitedMembers: [
+          { email: "member1@example.com", name: "Member 1" },
+          { email: "  ", name: "Empty" },
+          { email: "", name: "Empty 2" },
+        ],
+      };
+
+      await service.createOnboardingIntent(inputWithEmptyInvites);
+
+      expect(mockPaymentService.createPaymentIntent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          invitedMembers: [{ email: "member1@example.com", name: "Member 1" }],
+        }),
+        expect.anything()
+      );
+    });
+
+    it("should NOT create organization immediately", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      // Organization will be created later via Stripe webhook
+      expect(result.organizationId).toBeNull();
+      expect(result.checkoutUrl).not.toBeNull();
+    });
+
+    it("should return all required fields", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      expect(result).toEqual({
+        userId: mockUser.id,
+        orgOwnerEmail: mockInput.orgOwnerEmail,
+        name: mockInput.name,
+        slug: mockInput.slug,
+        seats: mockInput.seats,
+        pricePerSeat: mockInput.pricePerSeat,
+        billingPeriod: mockInput.billingPeriod,
+        isPlatform: mockInput.isPlatform,
+        organizationOnboardingId: "onboarding-123",
+        checkoutUrl: "https://stripe.com/checkout/session",
+        organizationId: null,
+      });
+    });
+
+    it("should immediately create organization when admin creates org for self", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const adminUser = {
+        id: 1,
+        email: "admin@example.com",
+        role: UserPermissionRole.ADMIN,
+        name: "Admin User",
+      };
+
+      const adminInput = {
+        ...mockInput,
+        orgOwnerEmail: adminUser.email,
+      };
+
+      await prismock.user.create({
+        data: {
+          id: adminUser.id,
+          email: adminUser.email,
+          name: adminUser.name,
+          username: "admin",
+          completedOnboarding: true,
+          emailVerified: new Date(),
+        },
+      });
+
+      const adminService = new BillingEnabledOrgOnboardingService(adminUser as any, mockPaymentService);
+
+      const result = await adminService.createOnboardingIntent(adminInput);
+
+      expect(result.organizationId).not.toBeNull();
+      expect(result.checkoutUrl).toBeNull();
+      expect(mockPaymentService.createPaymentIntent).not.toHaveBeenCalled();
+
+      const onboarding = await prismock.organizationOnboarding.findUnique({
+        where: { id: result.organizationOnboardingId },
+      });
+      expect(onboarding?.isComplete).toBe(true);
+    });
+
+    it("should use checkout flow when admin creates org for someone else with no teams/invites (handover)", async () => {
+      const adminUser = {
+        id: 1,
+        email: "admin@example.com",
+        role: UserPermissionRole.ADMIN,
+        name: "Admin User",
+      };
+
+      const handoverInput = {
+        ...mockInput,
+        orgOwnerEmail: "other@example.com",
+        teams: [],
+        invitedMembers: [],
+      };
+
+      const adminService = new BillingEnabledOrgOnboardingService(adminUser as any, mockPaymentService);
+
+      const result = await adminService.createOnboardingIntent(handoverInput);
+
+      expect(result.organizationId).toBeNull();
+      expect(result.checkoutUrl).toBeNull();
+      expect(result.handoverUrl).toContain("/settings/organizations/new/resume");
+      expect(mockPaymentService.createPaymentIntent).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("createOrganization", () => {
+    // Helper functions for creating test data
+    async function createTestUser(data: {
+      email: string;
+      name?: string;
+      username?: string;
+      metadata?: any;
+      onboardingCompleted?: boolean;
+      emailVerified?: Date | null;
+    }) {
+      return prismock.user.create({
+        data: {
+          email: data.email,
+          name: data.name || "Test User",
+          username: data.username || "testuser",
+          metadata: data.metadata || {},
+          completedOnboarding: data.onboardingCompleted,
+          emailVerified: data.emailVerified,
+        },
+      });
+    }
+
+    async function createTestOrganization(data: {
+      name: string;
+      slug: string;
+      isOrganization?: boolean;
+      metadata?: any;
+    }) {
+      return prismock.team.create({
+        data: {
+          name: data.name,
+          slug: data.slug,
+          isOrganization: data.isOrganization ?? true,
+          metadata: data.metadata || {},
+        },
+      });
+    }
+
+    async function createTestTeam(data: { name: string; slug: string }) {
+      return prismock.team.create({
+        data: {
+          name: data.name,
+          slug: data.slug,
+          isOrganization: false,
+        },
+      });
+    }
+
+    async function createTestMembership(data: { userId: number; teamId: number; role?: MembershipRole }) {
+      return prismock.membership.create({
+        data: {
+          createdAt: new Date(),
+          userId: data.userId,
+          teamId: data.teamId,
+          role: data.role || MembershipRole.MEMBER,
+          accepted: true,
+        },
+      });
+    }
+
+    async function createTestOnboarding(overrides?: Partial<typeof mockOrganizationOnboardingData>) {
+      return await prismock.organizationOnboarding.create({
+        data: {
+          ...mockOrganizationOnboardingData,
+          ...overrides,
+        },
+      });
+    }
+
+    const mockOrganizationOnboardingData = {
+      id: "onboarding-123",
+      organizationId: null,
+      name: "Test Org",
+      slug: "test-org",
+      orgOwnerEmail: "owner@example.com",
+      seats: 5,
+      pricePerSeat: 20,
+      billingPeriod: BillingPeriod.MONTHLY,
+      invitedMembers: [{ email: "member1@example.com" }, { email: "member2@example.com" }],
+      teams: [
+        { id: 1, name: "Team To Move", isBeingMigrated: true, slug: "new-team-slug" },
+        { id: -1, name: "New Team", isBeingMigrated: false, slug: null },
+      ],
+      isPlatform: false,
+      logo: null,
+      bio: null,
+      brandColor: null,
+      bannerUrl: null,
+      stripeCustomerId: "cus_123",
+      isDomainConfigured: false,
+      isComplete: false,
+      createdById: null,
+    };
+
+    it("should require payment details for billing-enabled flow", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await expect(service.createOrganization(mockOrganizationOnboarding)).rejects.toThrow(
+        "payment_subscription_id_and_payment_subscription_item_id_are_required"
+      );
+    });
+
+    it("should create organization with existing user as owner", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        name: "Existing User",
+        username: "existinguser",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const { organization, owner } = await service.createOrganization(mockOrganizationOnboarding, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      // Verify organization creation
+      expect(organization).toBeDefined();
+      expect(organization.name).toBe(mockOrganizationOnboarding.name);
+      expect(organization.slug).toBe(mockOrganizationOnboarding.slug);
+
+      // Verify owner is the existing user
+      expect(owner.id).toBe(existingUser.id);
+      expect(owner.email).toBe(existingUser.email);
+
+      expect(createDomain).toHaveBeenCalledWith(organization.slug);
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalled();
+      expect(createTeamsHandler).toHaveBeenCalled();
+    });
+
+    it("should reuse existing organization if organizationId is already set (idempotency)", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      const existingOrg = await createTestOrganization({
+        name: mockOrganizationOnboarding.name,
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithOrgId = {
+        ...mockOrganizationOnboarding,
+        organizationId: existingOrg.id,
+      };
+
+      const { organization } = await service.createOrganization(onboardingWithOrgId, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      // Verify the existing organization was reused
+      expect(organization.id).toBe(existingOrg.id);
+    });
+
+    it("should throw error if organization with same slug exists", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      await createTestOrganization({
+        name: "Conflicting Org",
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      await expect(
+        service.createOrganization(mockOrganizationOnboarding, {
+          subscriptionId: "sub_123",
+          subscriptionItemId: "si_123",
+        })
+      ).rejects.toThrow("organization_url_taken");
+    });
+
+    it("should update stripe customer ID for existing user", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      await service.createOrganization(mockOrganizationOnboarding, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      // Verify user's stripe customer ID was updated
+      const updatedUser = await prismock.user.findUnique({
+        where: { id: existingUser.id },
+      });
+
+      expect(updatedUser?.metadata).toEqual(
+        expect.objectContaining({
+          stripeCustomerId: mockOrganizationOnboarding.stripeCustomerId,
+        })
+      );
+    });
+
+    it("should create organization even if there is a team with same slug that orgOwner is a member of", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const teamWithConflictingSlug = await createTestTeam({
+        name: "TestTeamWithConflictingSlug",
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      // Make the orgOwner a member of the team
+      await createTestMembership({
+        userId: existingUser.id,
+        teamId: teamWithConflictingSlug.id,
+        role: MembershipRole.ADMIN,
+      });
+
+      const { organization } = await service.createOrganization(mockOrganizationOnboarding, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      expect(organization.slug).toBe(mockOrganizationOnboarding.slug);
+    });
+
+    it("should not create organization if there is a team with same slug that orgOwner is NOT a member of", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      await createTestTeam({
+        name: "TestTeamWithConflictingSlugNotOwnedByOrgOwner",
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      await expect(
+        service.createOrganization(mockOrganizationOnboarding, {
+          subscriptionId: "sub_123",
+          subscriptionItemId: "si_123",
+        })
+      ).rejects.toThrow("organization_url_taken");
+    });
+
+    it("should invite members with isDirectUserAction set to false", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        username: "org-owner",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const result = await service.createOrganization(mockOrganizationOnboarding, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      // Verify inviteMembersWithNoInviterPermissionCheck was called with isDirectUserAction: false
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teamId: result.organization.id,
+          invitations: [
+            { usernameOrEmail: "member1@example.com", role: MembershipRole.MEMBER },
+            { usernameOrEmail: "member2@example.com", role: MembershipRole.MEMBER },
+          ],
+          isDirectUserAction: false,
+        })
+      );
+    });
+
+    it("should invite members to specific teams based on teamName", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithTeamInvites = {
+        ...mockOrganizationOnboarding,
+        teams: [
+          { id: -1, name: "Marketing", isBeingMigrated: false, slug: null },
+          { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+        ],
+        invitedMembers: [
+          { email: "marketer@example.com", teamName: "marketing", role: MembershipRole.MEMBER },
+          { email: "engineer@example.com", teamName: "engineering", role: MembershipRole.ADMIN },
+          { email: "orguser@example.com" },
+        ],
+      };
+
+      // Setup: createTeamsHandler will be called and we need teams to exist for inviteMembers
+      vi.mocked(createTeamsHandler).mockImplementation(async (options) => {
+        const marketing = await prismock.team.create({
+          data: {
+            name: "Marketing",
+            slug: "marketing",
+            parentId: options.input.orgId,
+          },
+        });
+        const engineering = await prismock.team.create({
+          data: {
+            name: "Engineering",
+            slug: "engineering",
+            parentId: options.input.orgId,
+          },
+        });
+        return { teams: [marketing, engineering] } as any;
+      });
+
+      const result = await service.createOrganization(onboardingWithTeamInvites, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      // Verify invites were sent to 3 different targets (org + 2 teams)
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledTimes(3);
+
+      // Check org-level invite
+      const orgInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === result.organization.id);
+      expect(orgInviteCall).toBeDefined();
+      expect(orgInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "orguser@example.com", role: MembershipRole.MEMBER },
+      ]);
+
+      // Check Marketing team invite
+      const teams = await prismock.team.findMany({ where: { parentId: result.organization.id } });
+      const marketingTeam = teams.find((t) => t.name === "Marketing");
+      const marketingInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === marketingTeam!.id);
+      expect(marketingInviteCall).toBeDefined();
+      expect(marketingInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "marketer@example.com", role: MembershipRole.MEMBER },
+      ]);
+
+      // Check Engineering team invite
+      const engineeringTeam = teams.find((t) => t.name === "Engineering");
+      const engineeringInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === engineeringTeam!.id);
+      expect(engineeringInviteCall).toBeDefined();
+      expect(engineeringInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "engineer@example.com", role: MembershipRole.ADMIN },
+      ]);
+    });
+
+    it("should preserve custom roles for invited members", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithRoles = {
+        ...mockOrganizationOnboarding,
+        invitedMembers: [
+          { email: "admin@example.com", role: MembershipRole.ADMIN },
+          { email: "member@example.com", role: MembershipRole.MEMBER },
+        ],
+      };
+
+      const result = await service.createOrganization(onboardingWithRoles, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      const inviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === result.organization.id);
+
+      expect(inviteCall).toBeDefined();
+      expect(inviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "admin@example.com", role: MembershipRole.ADMIN },
+        { usernameOrEmail: "member@example.com", role: MembershipRole.MEMBER },
+      ]);
+    });
+
+    it("should handle mixed org-level and team-specific invites", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithMixedInvites = {
+        ...mockOrganizationOnboarding,
+        teams: [{ id: -1, name: "Sales", isBeingMigrated: false, slug: null }],
+        invitedMembers: [
+          { email: "sales1@example.com", teamName: "sales", role: MembershipRole.MEMBER },
+          { email: "sales2@example.com", teamName: "sales", role: MembershipRole.ADMIN },
+          { email: "org1@example.com", role: MembershipRole.MEMBER },
+          { email: "org2@example.com", role: MembershipRole.MEMBER },
+        ],
+      };
+
+      vi.mocked(createTeamsHandler).mockImplementation(async (options) => {
+        const salesTeam = await prismock.team.create({
+          data: {
+            name: "Sales",
+            slug: "sales",
+            parentId: options.input.orgId,
+          },
+        });
+        return { teams: [salesTeam] } as any;
+      });
+
+      const result = await service.createOrganization(onboardingWithMixedInvites, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledTimes(2);
+
+      // Find org-level invites
+      const orgInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === result.organization.id);
+
+      expect(orgInviteCall).toBeDefined();
+      expect(orgInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "org1@example.com", role: MembershipRole.MEMBER },
+        { usernameOrEmail: "org2@example.com", role: MembershipRole.MEMBER },
+      ]);
+
+      // Find Sales team invites
+      const teams = await prismock.team.findMany({ where: { parentId: result.organization.id } });
+      const salesTeam = teams.find((t) => t.name === "Sales");
+      const salesInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === salesTeam!.id);
+
+      expect(salesInviteCall).toBeDefined();
+      expect(salesInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "sales1@example.com", role: MembershipRole.MEMBER },
+        { usernameOrEmail: "sales2@example.com", role: MembershipRole.ADMIN },
+      ]);
+    });
+
+    it("should fall back to org-level invite if teamName does not match any created team", async () => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(false);
+
+      const mockOrganizationOnboarding = await createTestOnboarding();
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithNonMatchingTeam = {
+        ...mockOrganizationOnboarding,
+        teams: [{ id: -1, name: "Marketing", isBeingMigrated: false, slug: null }],
+        invitedMembers: [
+          { email: "user@example.com", teamName: "NonExistentTeam", role: MembershipRole.MEMBER },
+        ],
+      };
+
+      vi.mocked(createTeamsHandler).mockResolvedValue({
+        teams: [{ id: 300, name: "Marketing" }],
+      } as any);
+
+      const result = await service.createOrganization(onboardingWithNonMatchingTeam, {
+        subscriptionId: "sub_123",
+        subscriptionItemId: "si_123",
+      });
+
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teamId: result.organization.id,
+          invitations: [{ usernameOrEmail: "user@example.com", role: MembershipRole.MEMBER }],
+          isDirectUserAction: false,
+        })
+      );
+    });
+  });
+});
diff --git a/packages/features/ee/organizations/lib/service/onboarding/__tests__/OrganizationOnboardingFactory.test.ts b/packages/features/ee/organizations/lib/service/onboarding/__tests__/OrganizationOnboardingFactory.test.ts
new file mode 100644
index 00000000000000..2299ffe0f989a7
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/__tests__/OrganizationOnboardingFactory.test.ts
@@ -0,0 +1,204 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+
+import { UserPermissionRole } from "@calcom/prisma/enums";
+
+const mockRegularUser = {
+  id: 1,
+  email: "user@example.com",
+  role: UserPermissionRole.USER,
+  name: "Regular User",
+};
+
+const mockAdminUser = {
+  id: 2,
+  email: "admin@example.com",
+  role: UserPermissionRole.ADMIN,
+  name: "Admin User",
+};
+
+describe("OrganizationOnboardingFactory", () => {
+  let originalEnv: NodeJS.ProcessEnv;
+
+  beforeEach(() => {
+    originalEnv = { ...process.env };
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+    vi.restoreAllMocks();
+    vi.resetModules();
+  });
+
+  describe("create", () => {
+    it("should return BillingEnabledOrgOnboardingService for regular user when billing is enabled", async () => {
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: true,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockRegularUser as any);
+
+      expect(service.constructor.name).toBe("BillingEnabledOrgOnboardingService");
+    });
+
+    it("should return BillingEnabledOrgOnboardingService for admin on hosted (billing enabled)", async () => {
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: true,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockAdminUser as any);
+
+      expect(service.constructor.name).toBe("BillingEnabledOrgOnboardingService");
+    });
+
+    it("should return SelfHostedOrganizationOnboardingService for admin when IS_TEAM_BILLING_ENABLED is false", async () => {
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: false,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockAdminUser as any);
+
+      // Self-hosted admins skip billing
+      expect(service.constructor.name).toBe("SelfHostedOrganizationOnboardingService");
+    });
+
+    it("should return SelfHostedOrganizationOnboardingService for regular user when IS_TEAM_BILLING_ENABLED is false", async () => {
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: false,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockRegularUser as any);
+
+      // When billing is disabled, everyone uses self-hosted flow
+      expect(service.constructor.name).toBe("SelfHostedOrganizationOnboardingService");
+    });
+
+    it("should return SelfHostedOrganizationOnboardingService in E2E mode", async () => {
+      process.env.NEXT_PUBLIC_IS_E2E = "1";
+
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: true,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockAdminUser as any);
+
+      // E2E mode returns false from isBillingEnabled, meaning SelfHosted flow
+      expect(service.constructor.name).toBe("SelfHostedOrganizationOnboardingService");
+    });
+
+    it("should return BillingEnabledOrgOnboardingService when billing is enabled for regular user", async () => {
+      vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+        const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+        return {
+          ...actual,
+          IS_TEAM_BILLING_ENABLED: true,
+        };
+      });
+
+      const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+      const service = Factory.create(mockRegularUser as any);
+
+      expect(service.constructor.name).toBe("BillingEnabledOrgOnboardingService");
+    });
+  });
+
+  describe("Factory Decision Matrix", () => {
+    const testCases = [
+      {
+        scenario: "Hosted (billing enabled) + Regular User",
+        user: mockRegularUser,
+        isBillingEnabled: true,
+        isE2E: false,
+        expected: "BillingEnabled",
+      },
+      {
+        scenario: "Hosted (billing enabled) + Admin User",
+        user: mockAdminUser,
+        isBillingEnabled: true,
+        isE2E: false,
+        expected: "BillingEnabled",
+      },
+      {
+        scenario: "Self-hosted (billing disabled) + Regular User",
+        user: mockRegularUser,
+        isBillingEnabled: false,
+        isE2E: false,
+        expected: "SelfHosted", // Everyone uses self-hosted when billing disabled
+      },
+      {
+        scenario: "Self-hosted (billing disabled) + Admin User",
+        user: mockAdminUser,
+        isBillingEnabled: false,
+        isE2E: false,
+        expected: "SelfHosted", // Everyone uses self-hosted when billing disabled
+      },
+      {
+        scenario: "E2E mode + Admin User",
+        user: mockAdminUser,
+        isBillingEnabled: true,
+        isE2E: true,
+        expected: "SelfHosted", // E2E always uses self-hosted flow
+      },
+      {
+        scenario: "E2E mode + Regular User",
+        user: mockRegularUser,
+        isBillingEnabled: true,
+        isE2E: true,
+        expected: "SelfHosted", // E2E always uses self-hosted flow
+      },
+    ];
+
+    testCases.forEach(({ scenario, user, isBillingEnabled, isE2E, expected }) => {
+      it(`${scenario} → ${expected}`, async () => {
+        // Setup environment
+        if (isE2E) {
+          process.env.NEXT_PUBLIC_IS_E2E = "1";
+        } else {
+          delete process.env.NEXT_PUBLIC_IS_E2E;
+        }
+
+        vi.doMock("@calcom/lib/constants", async (importOriginal) => {
+          const actual = await importOriginal<typeof import("@calcom/lib/constants")>();
+          return {
+            ...actual,
+            IS_TEAM_BILLING_ENABLED: isBillingEnabled,
+          };
+        });
+
+        const { OrganizationOnboardingFactory: Factory } = await import("../OrganizationOnboardingFactory");
+        const service = Factory.create(user as any);
+
+        if (expected === "BillingEnabled") {
+          expect(service.constructor.name).toBe("BillingEnabledOrgOnboardingService");
+        } else {
+          expect(service.constructor.name).toBe("SelfHostedOrganizationOnboardingService");
+        }
+      });
+    });
+  });
+});
diff --git a/packages/features/ee/organizations/lib/service/onboarding/__tests__/SelfHostedOnboardingService.test.ts b/packages/features/ee/organizations/lib/service/onboarding/__tests__/SelfHostedOnboardingService.test.ts
new file mode 100644
index 00000000000000..84bad8b01031f0
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/__tests__/SelfHostedOnboardingService.test.ts
@@ -0,0 +1,523 @@
+import prismock from "../../../../../../../../tests/libs/__mocks__/prisma";
+
+import { describe, expect, it, vi, beforeEach } from "vitest";
+
+import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
+import * as constants from "@calcom/lib/constants";
+import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
+import { UserPermissionRole, CreationSource, MembershipRole, BillingPeriod } from "@calcom/prisma/enums";
+import { createTeamsHandler } from "@calcom/trpc/server/routers/viewer/organizations/createTeams.handler";
+import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
+
+import { SelfHostedOrganizationOnboardingService } from "../SelfHostedOnboardingService";
+import type { CreateOnboardingIntentInput, OrganizationOnboardingData } from "../types";
+
+vi.mock("../../OrganizationPaymentService");
+vi.mock("@calcom/lib/server/repository/organizationOnboarding");
+vi.mock("@calcom/ee/common/server/LicenseKeyService", () => ({
+  LicenseKeySingleton: {
+    getInstance: vi.fn(),
+  },
+}));
+
+vi.mock("@calcom/features/auth/lib/verifyEmail", () => ({
+  sendEmailVerification: vi.fn(),
+}));
+
+vi.mock("@calcom/emails/email-manager", () => ({
+  sendOrganizationCreationEmail: vi.fn(),
+}));
+
+vi.mock("@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler", () => ({
+  inviteMembersWithNoInviterPermissionCheck: vi.fn(),
+}));
+
+vi.mock("@calcom/trpc/server/routers/viewer/organizations/createTeams.handler", () => ({
+  createTeamsHandler: vi.fn(),
+}));
+
+vi.mock("@calcom/lib/domainManager/organization", () => ({
+  createDomain: vi.fn(),
+}));
+
+vi.mock("@calcom/lib/server/i18n", () => {
+  return {
+    getTranslation: async (locale: string, namespace: string) => {
+      const t = (key: string) => key;
+      t.locale = locale;
+      t.namespace = namespace;
+      return t;
+    },
+  };
+});
+
+const mockAdminUser = {
+  id: 2,
+  email: "admin@example.com",
+  role: UserPermissionRole.ADMIN,
+  name: "Admin User",
+};
+
+const mockInput: CreateOnboardingIntentInput = {
+  name: "Test Organization",
+  slug: "test-org",
+  orgOwnerEmail: "owner@example.com",
+  seats: 10,
+  pricePerSeat: 20,
+  isPlatform: false,
+  creationSource: CreationSource.WEBAPP,
+  logo: "https://example.com/logo.png",
+  bio: "Test bio",
+  brandColor: "#000000",
+  bannerUrl: "https://example.com/banner.png",
+  teams: [
+    { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+    { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+  ],
+  invitedMembers: [
+    { email: "member1@example.com", name: "Member 1" },
+    { email: "member2@example.com", name: "Member 2" },
+  ],
+};
+
+describe("SelfHostedOrganizationOnboardingService", () => {
+  let service: SelfHostedOrganizationOnboardingService;
+  let mockPaymentService: any;
+
+  beforeEach(async () => {
+    vi.resetAllMocks();
+    // @ts-expect-error reset is a method on Prismock
+    await prismock.reset();
+
+    // Mock license check
+    vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+      checkLicense: vi.fn().mockResolvedValue(true),
+    } as any);
+
+    mockPaymentService = {
+      createOrganizationOnboarding: vi.fn().mockResolvedValue({
+        id: "onboarding-123",
+        name: mockInput.name,
+        slug: mockInput.slug,
+        orgOwnerEmail: mockInput.orgOwnerEmail,
+        seats: mockInput.seats,
+        pricePerSeat: mockInput.pricePerSeat,
+        billingPeriod: "MONTHLY",
+        isComplete: false,
+        stripeCustomerId: null,
+      }),
+    };
+
+    vi.mocked(OrganizationOnboardingRepository.update).mockResolvedValue({
+      id: "onboarding-123",
+      teams: [],
+      invitedMembers: [],
+    } as any);
+
+    vi.mocked(OrganizationOnboardingRepository.markAsComplete).mockResolvedValue({} as any);
+
+    service = new SelfHostedOrganizationOnboardingService(mockAdminUser as any, mockPaymentService);
+  });
+
+  describe("createOnboardingIntent", () => {
+    it("should create onboarding record", async () => {
+      await service.createOnboardingIntent(mockInput);
+
+      expect(mockPaymentService.createOrganizationOnboarding).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: mockInput.name,
+          slug: mockInput.slug,
+          orgOwnerEmail: mockInput.orgOwnerEmail,
+          createdByUserId: mockAdminUser.id,
+        })
+      );
+    });
+
+    it("should store teams and invites in onboarding record", async () => {
+      await service.createOnboardingIntent(mockInput);
+
+      // Teams and invites are now passed during creation, not via update
+      expect(mockPaymentService.createOrganizationOnboarding).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teams: expect.arrayContaining([
+            { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+            { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+          ]),
+          invitedMembers: expect.arrayContaining([
+            { email: "member1@example.com", name: "Member 1" },
+            { email: "member2@example.com", name: "Member 2" },
+          ]),
+        })
+      );
+    });
+
+    it("should mark onboarding as complete", async () => {
+      await service.createOnboardingIntent(mockInput);
+
+      expect(OrganizationOnboardingRepository.markAsComplete).toHaveBeenCalledWith("onboarding-123");
+    });
+
+    it("should return organization ID (not checkout URL)", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      expect(result.organizationId).toBe(1);
+      expect(result.checkoutUrl).toBeNull();
+    });
+
+    it("should filter out empty team names", async () => {
+      const inputWithEmptyTeams = {
+        ...mockInput,
+        teams: [
+          { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+          { id: -1, name: "  ", isBeingMigrated: false, slug: null },
+          { id: -1, name: "", isBeingMigrated: false, slug: null },
+        ],
+      };
+
+      await service.createOnboardingIntent(inputWithEmptyTeams);
+
+      // Teams are now passed during creation with empty names filtered out
+      expect(mockPaymentService.createOrganizationOnboarding).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teams: [{ id: -1, name: "Engineering", isBeingMigrated: false, slug: null }],
+        })
+      );
+    });
+
+    it("should filter out empty invite emails", async () => {
+      const inputWithEmptyInvites = {
+        ...mockInput,
+        invitedMembers: [
+          { email: "member1@example.com", name: "Member 1" },
+          { email: "  ", name: "Empty" },
+          { email: "", name: "Empty 2" },
+        ],
+      };
+
+      await service.createOnboardingIntent(inputWithEmptyInvites);
+
+      // Invites are now passed during creation with empty emails filtered out
+      expect(mockPaymentService.createOrganizationOnboarding).toHaveBeenCalledWith(
+        expect.objectContaining({
+          invitedMembers: [{ email: "member1@example.com", name: "Member 1" }],
+        })
+      );
+    });
+
+    it("should create organization immediately", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      // Organization created immediately, not pending payment
+      expect(result.organizationId).toBe(1);
+      expect(result.checkoutUrl).toBeNull();
+    });
+
+    it("should return all required fields", async () => {
+      const result = await service.createOnboardingIntent(mockInput);
+
+      expect(result).toEqual({
+        userId: mockAdminUser.id,
+        orgOwnerEmail: mockInput.orgOwnerEmail,
+        name: mockInput.name,
+        slug: mockInput.slug,
+        seats: mockInput.seats,
+        pricePerSeat: mockInput.pricePerSeat,
+        billingPeriod: mockInput.billingPeriod,
+        isPlatform: mockInput.isPlatform,
+        organizationOnboardingId: "onboarding-123",
+        checkoutUrl: null,
+        organizationId: 1,
+      });
+    });
+  });
+
+  describe("createOrganization", () => {
+    beforeEach(() => {
+      vi.spyOn(constants, "IS_SELF_HOSTED", "get").mockReturnValue(true);
+    });
+
+    // Helper functions
+    async function createTestUser(data: {
+      email: string;
+      name?: string;
+      username?: string;
+      metadata?: any;
+      onboardingCompleted?: boolean;
+      emailVerified?: Date | null;
+    }) {
+      return prismock.user.create({
+        data: {
+          email: data.email,
+          name: data.name || "Test User",
+          username: data.username || "testuser",
+          metadata: data.metadata || {},
+          completedOnboarding: data.onboardingCompleted,
+          emailVerified: data.emailVerified,
+        },
+      });
+    }
+
+    async function createTestTeam(data: { name: string; slug: string }) {
+      return prismock.team.create({
+        data: {
+          name: data.name,
+          slug: data.slug,
+          isOrganization: false,
+        },
+      });
+    }
+
+    async function createTestMembership(data: { userId: number; teamId: number; role?: MembershipRole }) {
+      return prismock.membership.create({
+        data: {
+          createdAt: new Date(),
+          userId: data.userId,
+          teamId: data.teamId,
+          role: data.role || MembershipRole.MEMBER,
+          accepted: true,
+        },
+      });
+    }
+
+    const mockOrganizationOnboarding: OrganizationOnboardingData = {
+      id: "onboarding-123",
+      organizationId: null,
+      name: "Test Org",
+      slug: "test-org",
+      orgOwnerEmail: "test@example.com",
+      billingPeriod: BillingPeriod.MONTHLY,
+      seats: 5,
+      pricePerSeat: 20,
+      stripeCustomerId: null,
+      invitedMembers: [{ email: "member1@example.com" }, { email: "member2@example.com" }],
+      teams: [
+        { id: 1, name: "Team To Move", isBeingMigrated: true, slug: "new-team-slug" },
+        { id: 2, name: "New Team", isBeingMigrated: false, slug: null },
+      ],
+      logo: null,
+      bio: null,
+      brandColor: null,
+      bannerUrl: null,
+      isDomainConfigured: false,
+      isPlatform: false,
+    };
+
+    it("should fail if the license is invalid", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(false),
+      } as any);
+
+      await expect(service.createOrganization(mockOrganizationOnboarding)).rejects.toThrow(
+        "Self hosted license not valid"
+      );
+    });
+
+    it("should create an organization with a valid license", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        name: "Existing User",
+        username: "existinguser",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const { organization, owner } = await service.createOrganization(mockOrganizationOnboarding);
+
+      expect(organization).toBeDefined();
+      expect(organization.name).toBe(mockOrganizationOnboarding.name);
+      expect(organization.slug).toBe(mockOrganizationOnboarding.slug);
+      expect(owner).toBeDefined();
+      expect(owner.id).toBe(existingUser.id);
+    });
+
+    it("should create organization with existing user as owner", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        name: "Existing User",
+        username: "existinguser",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const { organization, owner } = await service.createOrganization(mockOrganizationOnboarding);
+
+      expect(organization).toBeDefined();
+      expect(owner.id).toBe(existingUser.id);
+      expect(owner.email).toBe(existingUser.email);
+
+      // Verify teams and members
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalled();
+      expect(createTeamsHandler).toHaveBeenCalled();
+    });
+
+    it("should throw error if organization with same slug exists", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      // Create existing organization with same slug
+      await prismock.team.create({
+        data: {
+          name: "Conflicting Org",
+          slug: mockOrganizationOnboarding.slug,
+          isOrganization: true,
+        },
+      });
+
+      await expect(service.createOrganization(mockOrganizationOnboarding)).rejects.toThrow(
+        "organization_url_taken"
+      );
+    });
+
+    it("should create organization with slug set even if there is a team with same slug owned by orgOwner", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      const existingUser = await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const teamWithConflictingSlug = await createTestTeam({
+        name: "TestTeamWithConflictingSlug",
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      // Make the orgOwner a member of the team
+      await createTestMembership({
+        userId: existingUser.id,
+        teamId: teamWithConflictingSlug.id,
+        role: MembershipRole.ADMIN,
+      });
+
+      const { organization } = await service.createOrganization(mockOrganizationOnboarding);
+
+      expect(organization.slug).toBe(mockOrganizationOnboarding.slug);
+    });
+
+    it("should not create organization if there is a team with same slug not owned by orgOwner", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      await createTestTeam({
+        name: "TestTeamWithConflictingSlugNotOwnedByOrgOwner",
+        slug: mockOrganizationOnboarding.slug,
+      });
+
+      // Don't make the orgOwner a member of the team
+
+      await expect(service.createOrganization(mockOrganizationOnboarding)).rejects.toThrow(
+        "organization_url_taken"
+      );
+    });
+
+    it("should invite members with isDirectUserAction set to false", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      await createTestUser({
+        email: mockOrganizationOnboarding.orgOwnerEmail,
+        username: "org-owner",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const result = await service.createOrganization(mockOrganizationOnboarding);
+
+      // Verify inviteMembersWithNoInviterPermissionCheck was called with isDirectUserAction: false
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teamId: result.organization.id,
+          invitations: [
+            { usernameOrEmail: "member1@example.com", role: MembershipRole.MEMBER },
+            { usernameOrEmail: "member2@example.com", role: MembershipRole.MEMBER },
+          ],
+          isDirectUserAction: false,
+        })
+      );
+    });
+
+    it("should invite members to specific teams based on teamName", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+      } as any);
+
+      await createTestUser({
+        email: "owner@example.com",
+        onboardingCompleted: true,
+        emailVerified: new Date(),
+      });
+
+      const onboardingWithTeamInvites: OrganizationOnboardingData = {
+        ...mockOrganizationOnboarding,
+        orgOwnerEmail: "owner@example.com",
+        teams: [
+          { id: -1, name: "Marketing", isBeingMigrated: false, slug: null },
+          { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+        ],
+        invitedMembers: [
+          { email: "marketer@example.com", teamName: "marketing", role: "MEMBER" },
+          { email: "engineer@example.com", teamName: "engineering", role: "ADMIN" },
+          { email: "orguser@example.com" },
+        ],
+      };
+
+      // Setup: createTeamsHandler will be called and we need teams to exist for inviteMembers
+      vi.mocked(createTeamsHandler).mockImplementation(async (options) => {
+        const marketing = await prismock.team.create({
+          data: {
+            name: "Marketing",
+            slug: "marketing",
+            parentId: options.input.orgId,
+          },
+        });
+        const engineering = await prismock.team.create({
+          data: {
+            name: "Engineering",
+            slug: "engineering",
+            parentId: options.input.orgId,
+          },
+        });
+        return { teams: [marketing, engineering] } as any;
+      });
+
+      const result = await service.createOrganization(onboardingWithTeamInvites);
+
+      // Verify invites were sent to 3 different targets (org + 2 teams)
+      expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledTimes(3);
+
+      // Check org-level invite
+      const orgInviteCall = vi
+        .mocked(inviteMembersWithNoInviterPermissionCheck)
+        .mock.calls.find((call) => call[0].teamId === result.organization.id);
+      expect(orgInviteCall).toBeDefined();
+      expect(orgInviteCall![0].invitations).toEqual([
+        { usernameOrEmail: "orguser@example.com", role: MembershipRole.MEMBER },
+      ]);
+    });
+  });
+});
diff --git a/packages/features/ee/organizations/lib/service/onboarding/index.ts b/packages/features/ee/organizations/lib/service/onboarding/index.ts
new file mode 100644
index 00000000000000..dc9f67ba9bed2d
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/index.ts
@@ -0,0 +1,5 @@
+export { OrganizationOnboardingFactory } from "./OrganizationOnboardingFactory";
+export type { IOrganizationOnboardingService } from "./IOrganizationOnboardingService";
+export type { CreateOnboardingIntentInput, OnboardingIntentResult } from "./types";
+export { BillingEnabledOrgOnboardingService } from "../service/BillingEnabledOrgOnboardingService";
+export { SelfHostedOrganizationOnboardingService } from "./SelfHostedOnboardingService";
diff --git a/packages/features/ee/organizations/lib/service/onboarding/types.ts b/packages/features/ee/organizations/lib/service/onboarding/types.ts
new file mode 100644
index 00000000000000..32a68cc2d66aec
--- /dev/null
+++ b/packages/features/ee/organizations/lib/service/onboarding/types.ts
@@ -0,0 +1,109 @@
+import type { Prisma } from "@calcom/prisma/client";
+import type { BillingPeriod, CreationSource } from "@calcom/prisma/enums";
+
+export type TeamInput = {
+  id: number;
+  name: string;
+  isBeingMigrated: boolean;
+  slug: string | null;
+};
+
+export type InvitedMemberInput = {
+  email: string;
+  name?: string;
+  teamId?: number;
+  teamName?: string;
+  role?: string;
+};
+
+export type CreateOnboardingIntentInput = {
+  name: string;
+  slug: string;
+  orgOwnerEmail: string;
+  seats?: number | null;
+  pricePerSeat?: number | null;
+  billingPeriod?: BillingPeriod;
+  isPlatform: boolean;
+  creationSource: CreationSource;
+  logo?: string | null;
+  bio?: string | null;
+  brandColor?: string | null;
+  bannerUrl?: string | null;
+  teams?: TeamInput[];
+  invitedMembers?: InvitedMemberInput[];
+  onboardingId?: string;
+};
+
+export type OnboardingIntentResult = {
+  userId: number;
+  orgOwnerEmail: string;
+  name: string;
+  slug: string;
+  seats: number | null;
+  pricePerSeat: number | null;
+  billingPeriod?: BillingPeriod;
+  isPlatform: boolean;
+  organizationOnboardingId: string;
+  checkoutUrl: string | null;
+  organizationId?: number | null;
+  handoverUrl?: string | null;
+};
+
+export interface OnboardingUser {
+  id: number;
+  email: string;
+  role: "ADMIN" | "USER";
+  name?: string;
+}
+
+export type OrganizationOnboardingData = {
+  id: string;
+  organizationId: number | null;
+  name: string;
+  slug: string;
+  orgOwnerEmail: string;
+  seats: number | null;
+  pricePerSeat: number | null;
+  billingPeriod: BillingPeriod;
+  invitedMembers: Prisma.JsonValue;
+  teams: Prisma.JsonValue;
+  isPlatform: boolean;
+  logo: string | null;
+  bio: string | null;
+  brandColor: string | null;
+  bannerUrl: string | null;
+  stripeCustomerId: string | null;
+  isDomainConfigured: boolean;
+};
+
+export type OrganizationData = {
+  id: number | null;
+  name: string;
+  slug: string;
+  isOrganizationConfigured: boolean;
+  isOrganizationAdminReviewed: boolean;
+  autoAcceptEmail: string;
+  seats: number | null;
+  pricePerSeat: number | null;
+  isPlatform: boolean;
+  logoUrl: string | null;
+  bio: string | null;
+  brandColor: string | null;
+  bannerUrl: string | null;
+  billingPeriod?: "MONTHLY" | "ANNUALLY";
+};
+
+export type TeamData = {
+  id: number;
+  name: string;
+  isBeingMigrated: boolean;
+  slug: string | null;
+};
+
+export type InvitedMember = {
+  email: string;
+  name?: string;
+  teamId?: number;
+  teamName?: string;
+  role?: string;
+};
diff --git a/packages/features/ee/organizations/lib/utils.ts b/packages/features/ee/organizations/lib/utils.ts
index 72180e28524060..5f2d778a43f8eb 100644
--- a/packages/features/ee/organizations/lib/utils.ts
+++ b/packages/features/ee/organizations/lib/utils.ts
@@ -6,3 +6,45 @@ export function extractDomainFromEmail(email: string) {
   } catch (ignore) {}
   return out.split(".")[0];
 }
+
+/**
+ * Checks if an email is a company email (not a personal email provider)
+ */
+export function isCompanyEmail(email: string): boolean {
+  // A list of popular @domains that are personal email providers
+  const personalEmailProviders = [
+    "gmail.com",
+    "yahoo.com",
+    "outlook.com",
+    "hotmail.com",
+    "aol.com",
+    "icloud.com",
+    "mail.com",
+    "protonmail.com",
+    "proton.me",
+    "zoho.com",
+    "yandex.com",
+    "gmx.com",
+    "fastmail.com",
+    "inbox.com",
+    "me.com",
+    "hushmail.com",
+    "live.com",
+    "rediffmail.com",
+    "tutanota.com",
+    "mail.ru",
+    "usa.com",
+    "qq.com",
+    "163.com",
+    "web.de",
+    "rocketmail.com",
+    "excite.com",
+    "lycos.com",
+    "outlook.co",
+    "hotmail.co.uk",
+  ];
+
+  const emailParts = email.split("@");
+  if (emailParts.length < 2) return false;
+  return !personalEmailProviders.includes(emailParts[1].toLowerCase());
+}
diff --git a/packages/features/ee/organizations/pages/components/OtherTeamList.tsx b/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
index 90ea73deac770f..8e501f1abfb171 100644
--- a/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
+++ b/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
@@ -3,7 +3,7 @@
 import { useState } from "react";
 
 import { trackFormbricksAction } from "@calcom/lib/formbricks-client";
-import type { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import type { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { trpc } from "@calcom/trpc/react";
 import { showToast } from "@calcom/ui/components/toast";
 
diff --git a/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx b/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
index 7cf77ac23c498b..e76929207cc8f9 100644
--- a/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
+++ b/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import type { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 
 import OtherTeamList from "./OtherTeamList";
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
index c93ce736c11262..7107f59d9c0db3 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
@@ -38,7 +38,7 @@ function MembersList(props: MembersListProps) {
   return (
     <div className="flex flex-col gap-y-3">
       {members?.length && team ? (
-        <ul className="divide-subtle border-subtle divide-y rounded-md border ">
+        <ul className="divide-subtle border-subtle divide-y rounded-md border">
           {members.map((member) => {
             return <MemberListItem key={member.id} member={member} />;
           })}
@@ -95,7 +95,6 @@ const MembersView = () => {
   const router = useRouter();
   const params = useParamsWithFallback();
   const teamId = Number(params.id);
-  const session = useSession();
   const utils = trpc.useUtils();
   // const [query, setQuery] = useState<string | undefined>("");
   // const [queryToFetch, setQueryToFetch] = useState<string | undefined>("");
@@ -193,7 +192,7 @@ const MembersView = () => {
 
             {team && (
               <>
-                <hr className="border-subtle my-8" />
+                <hr className="border-subtle my-8 mt-6" />
                 <MakeTeamPrivateSwitch
                   teamId={team.id}
                   isPrivate={team.isPrivate}
diff --git a/packages/features/ee/organizations/pages/settings/privacy.tsx b/packages/features/ee/organizations/pages/settings/privacy.tsx
index 191fe1e85531ba..f27225ffcbf563 100644
--- a/packages/features/ee/organizations/pages/settings/privacy.tsx
+++ b/packages/features/ee/organizations/pages/settings/privacy.tsx
@@ -1,10 +1,26 @@
 "use client";
 
+import { DataTableProvider } from "@calcom/features/data-table";
+import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import MakeTeamPrivateSwitch from "@calcom/features/ee/teams/components/MakeTeamPrivateSwitch";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 
-const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit: boolean } }) => {
+import { BlocklistTable } from "~/settings/organizations/privacy/blocklist-table";
+
+const PrivacyView = ({
+  permissions,
+  watchlistPermissions,
+}: {
+  permissions: { canRead: boolean; canEdit: boolean };
+  watchlistPermissions?: {
+    canRead: boolean;
+    canCreate: boolean;
+    canDelete: boolean;
+  };
+}) => {
+  const { t } = useLocale();
   const { data: currentOrg } = trpc.viewer.organizations.listCurrent.useQuery();
   const isInviteOpen = !currentOrg?.user.accepted;
 
@@ -14,13 +30,27 @@ const PrivacyView = ({ permissions }: { permissions: { canRead: boolean; canEdit
 
   return (
     <LicenseRequired>
-      <div>
+      <div className="space-y-8">
         <MakeTeamPrivateSwitch
           isOrg={true}
           teamId={currentOrg.id}
           isPrivate={currentOrg.isPrivate}
           disabled={isDisabled}
         />
+
+        {watchlistPermissions?.canRead && (
+          <div>
+            <div>
+              <h2 className="text-emphasis text-base font-semibold">{t("organization_blocklist")}</h2>
+              <p className="text-muted text-sm">{t("manage_blocked_emails_and_domains")}</p>
+            </div>
+            <div className="mt-2">
+              <DataTableProvider useSegments={useSegments} defaultPageSize={25}>
+                <BlocklistTable permissions={watchlistPermissions} />
+              </DataTableProvider>
+            </div>
+          </div>
+        )}
       </div>
     </LicenseRequired>
   );
diff --git a/packages/lib/server/repository/organization.test.ts b/packages/features/ee/organizations/repositories/OrganizationRepository.test.ts
similarity index 94%
rename from packages/lib/server/repository/organization.test.ts
rename to packages/features/ee/organizations/repositories/OrganizationRepository.test.ts
index e23ffda402624d..a30b679110dd78 100644
--- a/packages/lib/server/repository/organization.test.ts
+++ b/packages/features/ee/organizations/repositories/OrganizationRepository.test.ts
@@ -1,12 +1,11 @@
-import prismock from "../../../../tests/libs/__mocks__/prisma";
+import prismock from "../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, it, expect, beforeEach, vi } from "vitest";
 
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import type { Prisma } from "@calcom/prisma/client";
 
-import { OrganizationRepository } from "./organization";
-
-vi.mock("./teamUtils", () => ({
+vi.mock("@calcom/lib/server/repository/teamUtils", () => ({
   getParsedTeam: (org: any) => org,
 }));
 
diff --git a/packages/lib/server/repository/organization.ts b/packages/features/ee/organizations/repositories/OrganizationRepository.ts
similarity index 97%
rename from packages/lib/server/repository/organization.ts
rename to packages/features/ee/organizations/repositories/OrganizationRepository.ts
index fb6dceaf7e47bb..a0990df4b79ff2 100644
--- a/packages/lib/server/repository/organization.ts
+++ b/packages/features/ee/organizations/repositories/OrganizationRepository.ts
@@ -1,18 +1,17 @@
 import type { z } from "zod";
 
 import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
+import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { CreationSource } from "@calcom/prisma/enums";
 import type { teamMetadataStrictSchema } from "@calcom/prisma/zod-utils";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
-import { createAProfileForAnExistingUser } from "../../createAProfileForAnExistingUser";
-import { getParsedTeam } from "./teamUtils";
-import { UserRepository } from "./user";
-
 const orgSelect = {
   id: true,
   name: true,
diff --git a/packages/features/ee/organizations/types/schemas.ts b/packages/features/ee/organizations/types/schemas.ts
index 27c0155a2045ac..2df5e8e1ee03a5 100644
--- a/packages/features/ee/organizations/types/schemas.ts
+++ b/packages/features/ee/organizations/types/schemas.ts
@@ -7,6 +7,8 @@ export const createOrganizationSchema = z.object({
   language: z.string().optional(),
   logo: z.string().nullish(),
   bio: z.string().nullish(),
+  brandColor: z.string().nullish(),
+  bannerUrl: z.string().nullish(),
   onboardingId: z.string(),
   invitedMembers: orgOnboardingInvitedMembersSchema.optional(),
   teams: orgOnboardingTeamsSchema.optional(),
diff --git a/packages/features/ee/payments/components/Payment.tsx b/packages/features/ee/payments/components/Payment.tsx
index ae49c0a5d01751..bb07084262089b 100644
--- a/packages/features/ee/payments/components/Payment.tsx
+++ b/packages/features/ee/payments/components/Payment.tsx
@@ -7,7 +7,7 @@ import type { SyntheticEvent } from "react";
 import { useEffect, useState } from "react";
 
 import getStripe from "@calcom/app-store/stripepayment/lib/client";
-import { useBookingSuccessRedirect } from "@calcom/lib/bookingSuccessRedirect";
+import { useBookingSuccessRedirect } from "@calcom/features/bookings/lib/bookingSuccessRedirect";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
diff --git a/packages/features/ee/payments/pages/payment.tsx b/packages/features/ee/payments/pages/payment.tsx
index 23f55557d44a7e..c3ee0b906c71f3 100644
--- a/packages/features/ee/payments/pages/payment.tsx
+++ b/packages/features/ee/payments/pages/payment.tsx
@@ -3,7 +3,7 @@ import { z } from "zod";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getClientSecretFromPayment } from "@calcom/features/ee/payments/pages/getClientSecretFromPayment";
-import { shouldHideBrandingForEvent } from "@calcom/lib/hideBranding";
+import { shouldHideBrandingForEvent } from "@calcom/features/profile/lib/hideBranding";
 import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
 import { paymentDataSelect } from "@calcom/prisma/selects/payment";
diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts
index 1a9a50efda16c8..b31d2d8e90eb2a 100644
--- a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts
+++ b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts
@@ -18,7 +18,7 @@ import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAn
 import { describe, vi, expect } from "vitest";
 
 import { OrganizerDefaultConferencingAppType } from "@calcom/app-store/locations";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { SchedulingType, BookingStatus, WorkflowMethods } from "@calcom/prisma/enums";
 import { test } from "@calcom/web/test/fixtures/fixtures";
 
diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.ts
index e197f0d7e6337f..ff07e155e18cde 100644
--- a/packages/features/ee/round-robin/roundRobinManualReassignment.ts
+++ b/packages/features/ee/round-robin/roundRobinManualReassignment.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
+ 
 import { cloneDeep } from "lodash";
 
 import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
@@ -26,7 +26,7 @@ import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/rem
 import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
 import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser";
 import { SENDER_NAME } from "@calcom/lib/constants";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { IdempotencyKeyService } from "@calcom/lib/idempotencyKey/idempotencyKeyService";
 import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
 import logger from "@calcom/lib/logger";
@@ -312,6 +312,13 @@ export const roundRobinManualReassignment = async ({
     conferenceCredentialId: conferenceCredentialId ?? undefined,
   };
 
+  if( hasOrganizerChanged ){
+    // location might changed and will be new created in eventManager.create (organizer default location)
+    evt.videoCallData = undefined;
+    // To prevent "The requested identifier already exists" error while updating event, we need to remove iCalUID
+    evt.iCalUID = undefined;
+  }
+
   const credentials = await prisma.credential.findMany({
     where: { userId: newUser.id },
     include: { user: { select: { email: true } } },
diff --git a/packages/features/ee/round-robin/roundRobinReassignment.test.ts b/packages/features/ee/round-robin/roundRobinReassignment.test.ts
index 375c1384e5c3ff..04165a81771f44 100644
--- a/packages/features/ee/round-robin/roundRobinReassignment.test.ts
+++ b/packages/features/ee/round-robin/roundRobinReassignment.test.ts
@@ -17,7 +17,7 @@ import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAn
 
 import { describe, vi, expect } from "vitest";
 
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { SchedulingType, BookingStatus, WorkflowMethods } from "@calcom/prisma/enums";
 import { test } from "@calcom/web/test/fixtures/fixtures";
 
diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts
index af5eaa304d5782..08255c4ab1a8ee 100644
--- a/packages/features/ee/round-robin/roundRobinReassignment.ts
+++ b/packages/features/ee/round-robin/roundRobinReassignment.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
+ 
 import { cloneDeep } from "lodash";
 
 import {
@@ -341,6 +341,12 @@ export const roundRobinReassignment = async ({
     ...(platformClientParams ? platformClientParams : {}),
   };
 
+  if(hasOrganizerChanged){
+    // location might changed and will be new created in eventManager.create (organizer default location)
+    evt.videoCallData = undefined;
+    // To prevent "The requested identifier already exists" error while updating event, we need to remove iCalUID
+    evt.iCalUID = undefined;
+  }
   const credentials = await prisma.credential.findMany({
     where: {
       userId: organizer.id,
diff --git a/packages/features/ee/round-robin/utils/validateRoundRobinSlotAvailability.ts b/packages/features/ee/round-robin/utils/validateRoundRobinSlotAvailability.ts
new file mode 100644
index 00000000000000..c83c79dc79f2b1
--- /dev/null
+++ b/packages/features/ee/round-robin/utils/validateRoundRobinSlotAvailability.ts
@@ -0,0 +1,90 @@
+import { DateTime } from "luxon";
+
+import { HttpError } from "@calcom/lib/http-error";
+import { prisma } from "@calcom/prisma";
+import type { Host } from "@calcom/prisma/client";
+
+export async function validateRoundRobinSlotAvailability(
+  eventTypeId: number,
+  startDate: DateTime,
+  endDate: DateTime,
+  hosts: Host[]
+) {
+  const fixedHosts = hosts.filter((host) => host.isFixed === true);
+  const nonFixedHosts = hosts.filter((host) => host.isFixed === false);
+
+  if (fixedHosts.length > 0) {
+    await validateFixedHostsAvailability(eventTypeId, startDate, endDate, fixedHosts);
+  } else {
+    await validateNonFixedHostsAvailability(eventTypeId, startDate, endDate, nonFixedHosts);
+  }
+}
+
+async function validateFixedHostsAvailability(
+  eventTypeId: number,
+  startDate: DateTime,
+  endDate: DateTime,
+  hosts: Host[]
+) {
+  const existingBooking = await prisma.booking.findFirst({
+    where: {
+      eventTypeId,
+      startTime: startDate.toJSDate(),
+      endTime: endDate.toJSDate(),
+    },
+    select: { attendees: true, userId: true, status: true },
+  });
+  const existingSlotReservation = await prisma.selectedSlots.count({
+    where: {
+      eventTypeId,
+      slotUtcStartDate: startDate.toISO() ?? "",
+      slotUtcEndDate: endDate.toISO() ?? "",
+      // Only consider non-expired reservations
+      releaseAt: { gt: DateTime.utc().toJSDate() },
+    },
+  });
+
+  const hasHostAsAttendee = hosts.some(
+    (host) =>
+      existingBooking?.attendees.some((attendee) => attendee.id === host.userId) ||
+      existingBooking?.userId === host.userId
+  );
+
+  if (existingSlotReservation > 0) {
+    throw new HttpError({
+      statusCode: 422,
+      message: `Can't reserve the slot because the round robin event type has no available hosts left at this time slot.`,
+    });
+  }
+
+  if (hasHostAsAttendee) {
+    throw new HttpError({
+      statusCode: 422,
+      message: `Can't reserve a slot if the event is already booked.`,
+    });
+  }
+}
+
+async function validateNonFixedHostsAvailability(
+  eventTypeId: number,
+  startDate: DateTime,
+  endDate: DateTime,
+  hosts: Host[]
+) {
+  const existingSlotReservations = await prisma.selectedSlots.count({
+    where: {
+      eventTypeId,
+      slotUtcStartDate: startDate.toISO() ?? "",
+      slotUtcEndDate: endDate.toISO() ?? "",
+      // Only consider non-expired reservations
+      releaseAt: { gt: DateTime.utc().toJSDate() },
+    },
+  });
+
+  if (existingSlotReservations === hosts.length) {
+    throw new HttpError({
+      statusCode: 422,
+      message: `Can't reserve the slot because the round robin event type has no available hosts left at this time slot.`,
+    });
+  }
+}
diff --git a/packages/features/ee/sso/lib/sso.ts b/packages/features/ee/sso/lib/sso.ts
index 1201f3c6027405..4915ee5dbcf5c5 100644
--- a/packages/features/ee/sso/lib/sso.ts
+++ b/packages/features/ee/sso/lib/sso.ts
@@ -1,6 +1,6 @@
 import createUsersAndConnectToOrg from "@calcom/features/ee/dsync/lib/users/createUsersAndConnectToOrg";
 import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { IdentityProvider } from "@calcom/prisma/enums";
 
diff --git a/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx b/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
index c412e18e2f90df..883adaf307b1f1 100644
--- a/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
+++ b/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
@@ -45,7 +45,6 @@ const MakeTeamPrivateSwitch = ({
           setTeamPrivate(checked);
           mutation.mutate({ id: teamId, isPrivate: checked });
         }}
-        switchContainerClassName="mt-6"
         data-testid="make-team-private-check"
       />
     </>
diff --git a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
index 7478ef5f13e110..8b829b7ff49f1c 100644
--- a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
+++ b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
@@ -9,8 +9,8 @@ import React from "react";
 import type { ITimezone } from "react-timezone-select";
 
 import type { Dayjs } from "@calcom/dayjs";
+import getSlots from "@calcom/features/schedules/lib/slots";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import getSlots from "@calcom/lib/slots";
 import { trpc } from "@calcom/trpc/react";
 
 import SkeletonLoader from "./SkeletonLoaderAvailabilityTimes";
diff --git a/packages/features/ee/teams/components/TeamEventTypeForm.tsx b/packages/features/ee/teams/components/TeamEventTypeForm.tsx
index 8928daf6575217..a05365fab9639d 100644
--- a/packages/features/ee/teams/components/TeamEventTypeForm.tsx
+++ b/packages/features/ee/teams/components/TeamEventTypeForm.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
 import type { UseFormReturn } from "react-hook-form";
 
 import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import type { CreateEventTypeFormValues } from "@calcom/lib/hooks/useCreateEventType";
+import type { CreateEventTypeFormValues } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import slugify from "@calcom/lib/slugify";
 import { SchedulingType } from "@calcom/prisma/enums";
diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/packages/features/ee/teams/components/TeamListItem.tsx
index d027c0665959b1..251b7828678c99 100644
--- a/packages/features/ee/teams/components/TeamListItem.tsx
+++ b/packages/features/ee/teams/components/TeamListItem.tsx
@@ -6,8 +6,8 @@ import InviteLinkSettingsModal from "@calcom/ee/teams/components/InviteLinkSetti
 import { MemberInvitationModalWithoutMembers } from "@calcom/ee/teams/components/MemberInvitationModal";
 import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { getTeamUrlSync } from "@calcom/features/ee/organizations/lib/getTeamUrlSync";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useRefreshData } from "@calcom/lib/hooks/useRefreshData";
diff --git a/packages/features/ee/teams/lib/deleteWorkflowRemindersOfRemovedMember.ts b/packages/features/ee/teams/lib/deleteWorkflowRemindersOfRemovedMember.ts
index 1861df56c133d7..18c6a35f3ac2d1 100644
--- a/packages/features/ee/teams/lib/deleteWorkflowRemindersOfRemovedMember.ts
+++ b/packages/features/ee/teams/lib/deleteWorkflowRemindersOfRemovedMember.ts
@@ -1,4 +1,4 @@
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import prisma from "@calcom/prisma";
 
 // cancel/delete all workflowReminders of the removed member that come from that team (org teams only)
diff --git a/packages/features/ee/teams/lib/queries.ts b/packages/features/ee/teams/lib/queries.ts
index a90f4a1d508736..5a5b660338edca 100644
--- a/packages/features/ee/teams/lib/queries.ts
+++ b/packages/features/ee/teams/lib/queries.ts
@@ -2,12 +2,12 @@ import { z } from "zod";
 
 import { getAppFromSlug } from "@calcom/app-store/utils";
 import { DATABASE_CHUNK_SIZE } from "@calcom/lib/constants";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { getTeam, getOrg } from "@calcom/lib/server/repository/team";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { getTeam, getOrg } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { Team } from "@calcom/prisma/client";
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index 5fe579cf623c59..5d8827fe60fb55 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -10,11 +10,11 @@ import { z } from "zod";
 
 import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
+import { getTeamUrlSync } from "@calcom/features/ee/organizations/lib/getTeamUrlSync";
 import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
 import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { trackFormbricksAction } from "@calcom/lib/formbricks-client";
-import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
 import { md } from "@calcom/lib/markdownIt";
diff --git a/packages/features/ee/teams/pages/team-settings-view.tsx b/packages/features/ee/teams/pages/team-settings-view.tsx
index 1f11df6a5df74e..c8ca1eaa686e7f 100644
--- a/packages/features/ee/teams/pages/team-settings-view.tsx
+++ b/packages/features/ee/teams/pages/team-settings-view.tsx
@@ -159,7 +159,6 @@ const PrivacySettingsView = ({ team }: ProfileViewProps) => {
   const isAdmin = team && checkAdminOrOwner(team.membership.role);
   const isOrgAdminOrOwner = checkAdminOrOwner(session?.data?.user.org?.role);
   const isInviteOpen = !team?.membership.accepted;
-  const { t } = useLocale();
 
   return (
     <>
@@ -173,12 +172,14 @@ const PrivacySettingsView = ({ team }: ProfileViewProps) => {
         )}
 
         {team && team.id && (isAdmin || isOrgAdminOrOwner) && (
-          <MakeTeamPrivateSwitch
-            isOrg={false}
-            teamId={team.id}
-            isPrivate={team.isPrivate ?? false}
-            disabled={isInviteOpen}
-          />
+          <div className="mt-6">
+            <MakeTeamPrivateSwitch
+              isOrg={false}
+              teamId={team.id}
+              isPrivate={team.isPrivate ?? false}
+              disabled={isInviteOpen}
+            />
+          </div>
         )}
       </div>
     </>
diff --git a/packages/lib/server/repository/team.test.ts b/packages/features/ee/teams/repositories/TeamRepository.test.ts
similarity index 57%
rename from packages/lib/server/repository/team.test.ts
rename to packages/features/ee/teams/repositories/TeamRepository.test.ts
index 8e2e71885da370..9d56ec29f12af2 100644
--- a/packages/lib/server/repository/team.test.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.test.ts
@@ -1,18 +1,23 @@
-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
+import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";
 
-import { it, describe, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
-import { getTeam, getOrg } from "./team";
+import type { Team } from "@calcom/prisma/client";
+
+import { getTeam, getOrg, TeamRepository } from "./TeamRepository";
 
 const sampleTeamProps = {
   logo: null,
+  logoUrl: null,
+  calVideoLogo: null,
   appLogo: null,
+  appIconLogo: null,
   bio: null,
   description: null,
   hideBranding: false,
   isPrivate: false,
-  appIconLogo: null,
   hideBookATeamMember: false,
+  hideTeamProfileLink: false,
   createdAt: new Date(),
   theme: null,
   brandColor: "",
@@ -21,8 +26,159 @@ const sampleTeamProps = {
   timeZone: "",
   weekStart: "",
   parentId: null,
+  metadata: null,
+  isOrganization: false,
+  organizationSettings: null,
+  isPlatform: false,
+  bannerUrl: null,
+  rrResetInterval: 0,
+  rrResetOccurrence: 0,
+  rrResetLimitOn: null,
+  rrResetLimitOccurrences: null,
+  rrResetLimitDate: null,
+  includeManagedEventsInLimits: false,
+  rrTimestampBasis: null,
+  pendingPayment: false,
+  createdByOAuthClientId: null,
+  smsLockState: null,
+  smsLockReviewedByAdmin: false,
+  bookingLimits: null,
 };
 
+describe("TeamRepository", () => {
+  let teamRepository: TeamRepository;
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+    teamRepository = new TeamRepository(prismaMock);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("findById", () => {
+    it("should return null if team is not found", async () => {
+      prismaMock.team.findUnique.mockResolvedValue(null);
+      const result = await teamRepository.findById({ id: 1 });
+      expect(result).toBeNull();
+    });
+
+    it("should return parsed team if found", async () => {
+      const mockTeam = {
+        id: 1,
+        name: "Test Team",
+        slug: "test-team",
+        logoUrl: "test-logo-url",
+        parentId: 1,
+        metadata: {
+          requestedSlug: null,
+        },
+        isOrganization: true,
+        organizationSettings: {},
+        isPlatform: true,
+        requestedSlug: null,
+      };
+      prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team);
+      const result = await teamRepository.findById({ id: 1 });
+      expect(result).toEqual(mockTeam);
+    });
+  });
+
+  describe("deleteById", () => {
+    it("should delete team and related data", async () => {
+      const mockDeletedTeam = { id: 1, name: "Deleted Team" };
+      const deleteManyEventTypeMock = vi.fn();
+      const deleteManyMembershipMock = vi.fn();
+      const deleteTeamMock = vi.fn().mockResolvedValue(mockDeletedTeam as unknown as Team);
+      prismaMock.$transaction.mockImplementation(async (callback) => {
+        const mockTx = {
+          ...prismaMock,
+          eventType: {
+            ...prismaMock.eventType,
+            deleteMany: deleteManyEventTypeMock,
+          },
+          membership: {
+            ...prismaMock.membership,
+            deleteMany: deleteManyMembershipMock,
+          },
+          team: {
+            ...prismaMock.team,
+            delete: deleteTeamMock,
+          },
+        };
+        return callback(mockTx);
+      });
+
+      const result = await teamRepository.deleteById({ id: 1 });
+
+      expect(deleteManyEventTypeMock).toHaveBeenCalledWith({
+        where: {
+          teamId: 1,
+          schedulingType: "MANAGED",
+        },
+      });
+      expect(deleteManyMembershipMock).toHaveBeenCalledWith({
+        where: {
+          teamId: 1,
+        },
+      });
+      expect(deleteTeamMock).toHaveBeenCalledWith({
+        where: {
+          id: 1,
+        },
+      });
+      expect(result).toEqual(mockDeletedTeam);
+    });
+  });
+
+  describe("findAllByParentId", () => {
+    it("should return all teams with given parentId", async () => {
+      const mockTeams = [{ id: 1 }, { id: 2 }];
+      prismaMock.team.findMany.mockResolvedValue(mockTeams as unknown as Team[]);
+      const result = await teamRepository.findAllByParentId({ parentId: 1 });
+      expect(prismaMock.team.findMany).toHaveBeenCalledWith({
+        where: { parentId: 1 },
+        select: {
+          id: true,
+          name: true,
+          slug: true,
+          logoUrl: true,
+          parentId: true,
+          metadata: true,
+          isOrganization: true,
+          organizationSettings: true,
+          isPlatform: true,
+        },
+      });
+      expect(result).toEqual(mockTeams);
+    });
+  });
+
+  describe("findTeamWithMembers", () => {
+    it("should return team with its members", async () => {
+      const mockTeam = { id: 1, members: [] };
+      prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team & { members: [] });
+      const result = await teamRepository.findTeamWithMembers(1);
+      expect(prismaMock.team.findUnique).toHaveBeenCalledWith({
+        where: { id: 1 },
+        select: {
+          members: {
+            select: {
+              accepted: true,
+            },
+          },
+          id: true,
+          metadata: true,
+          parentId: true,
+          isOrganization: true,
+        },
+      });
+      expect(result).toEqual(mockTeam);
+    });
+  });
+});
+
 describe("getOrg", () => {
   it("should return an Organization correctly by slug even if there is a team with the same slug", async () => {
     prismaMock.team.findMany.mockResolvedValue([
@@ -31,7 +187,7 @@ describe("getOrg", () => {
         name: "Test Team",
         slug: "test-slug",
         isOrganization: true,
-      },
+      } as Team,
     ]);
 
     const org = await getOrg({
@@ -70,7 +226,7 @@ describe("getOrg", () => {
         name: "Test Team",
         slug: "test-slug",
         metadata: {},
-      },
+      } as Team,
     ]);
 
     const org = await getOrg({
@@ -109,7 +265,7 @@ describe("getOrg", () => {
         name: "Test Team",
         slug: "test-slug",
         metadata: [],
-      },
+      } as Team,
     ]);
 
     await expect(() =>
@@ -139,7 +295,7 @@ describe("getTeam", () => {
           anything: "here",
           paymentId: "1",
         },
-      },
+      } as Team,
     ]);
 
     const team = await getTeam({
@@ -181,7 +337,7 @@ describe("getTeam", () => {
         name: "Test Team",
         slug: "test-slug",
         isOrganization: true,
-      },
+      } as Team,
     ]);
 
     const team = await getTeam({
@@ -222,7 +378,7 @@ describe("getTeam", () => {
         slug: "test-slug",
         parentId: 100,
         metadata: null,
-      },
+      } as Team,
     ]);
 
     await getTeam({
diff --git a/packages/lib/server/repository/team.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
similarity index 91%
rename from packages/lib/server/repository/team.ts
rename to packages/features/ee/teams/repositories/TeamRepository.ts
index 0b794f47f1a72d..fecb76fccf2997 100644
--- a/packages/lib/server/repository/team.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -2,14 +2,13 @@ import type { z } from "zod";
 
 import { whereClauseForOrgWithSlugOrRequestedSlug } from "@calcom/ee/organizations/lib/orgDomains";
 import logger from "@calcom/lib/logger";
+import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";
 import type { PrismaClient } from "@calcom/prisma";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
-import { getParsedTeam } from "./teamUtils";
-
 type TeamGetPayloadWithParsedMetadata<TeamSelect extends Prisma.TeamSelect> =
   | (Omit<Prisma.TeamGetPayload<{ select: TeamSelect }>, "metadata" | "isOrganization"> & {
       metadata: z.infer<typeof teamMetadataSchema>;
@@ -412,6 +411,42 @@ export class TeamRepository {
     });
   }
 
+  async findTeamWithParentHideBranding({ teamId }: { teamId: number }) {
+    return await this.prismaClient.team.findUnique({
+      where: { id: teamId },
+      select: {
+        hideBranding: true,
+        parent: {
+          select: {
+            hideBranding: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findOrganization({ teamId, userId }: { teamId?: number; userId: number }) {
+    return await this.prismaClient.team.findFirst({
+      where: {
+        isOrganization: true,
+        children: {
+          some: {
+            id: teamId,
+          },
+        },
+        members: {
+          some: {
+            userId,
+            accepted: true,
+          },
+        },
+      },
+      select: {
+        id: true,
+      },
+    });
+  }
+
   async isSlugAvailableForUpdate({
     slug,
     teamId,
@@ -464,4 +499,16 @@ export class TeamRepository {
       },
     });
   }
+
+  async findOrgTeamsExcludingTeam({ parentId, excludeTeamId }: { parentId: number; excludeTeamId: number }) {
+    return await this.prismaClient.team.findMany({
+      where: {
+        parentId,
+        id: {
+          not: excludeTeamId,
+        },
+      },
+      select: { id: true },
+    });
+  }
 }
diff --git a/packages/lib/server/service/teamService.alternative.test.ts b/packages/features/ee/teams/services/teamService.alternative.test.ts
similarity index 91%
rename from packages/lib/server/service/teamService.alternative.test.ts
rename to packages/features/ee/teams/services/teamService.alternative.test.ts
index 9b4809a640ec33..2d15dbcfaa60ff 100644
--- a/packages/lib/server/service/teamService.alternative.test.ts
+++ b/packages/features/ee/teams/services/teamService.alternative.test.ts
@@ -4,8 +4,8 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
 import { TeamBilling } from "@calcom/features/ee/billing/teams";
 import { deleteDomain } from "@calcom/lib/domainManager/organization";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 
 import { TeamService } from "./teamService";
 
@@ -14,8 +14,8 @@ vi.mock("@calcom/prisma", () => ({
 }));
 
 vi.mock("@calcom/features/ee/billing/teams");
-vi.mock("@calcom/lib/server/repository/team");
-vi.mock("@calcom/lib/server/service/workflows");
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService");
 vi.mock("@calcom/lib/domainManager/organization");
 vi.mock("@calcom/features/ee/teams/lib/removeMember");
 class Database {
diff --git a/packages/lib/server/service/__tests__/teamService.integration-test.ts b/packages/features/ee/teams/services/teamService.integration-test.ts
similarity index 99%
rename from packages/lib/server/service/__tests__/teamService.integration-test.ts
rename to packages/features/ee/teams/services/teamService.integration-test.ts
index 78e6634f58f228..434ccdb4b5b8ac 100644
--- a/packages/lib/server/service/__tests__/teamService.integration-test.ts
+++ b/packages/features/ee/teams/services/teamService.integration-test.ts
@@ -4,7 +4,7 @@ import prisma from "@calcom/prisma";
 import type { Team, User } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { TeamService } from "../teamService";
+import { TeamService } from "./teamService";
 
 vi.mock("@calcom/features/ee/billing/teams", () => {
   const mockUpdateQuantity = vi.fn().mockResolvedValue(undefined);
diff --git a/packages/lib/server/service/teamService.test.ts b/packages/features/ee/teams/services/teamService.test.ts
similarity index 95%
rename from packages/lib/server/service/teamService.test.ts
rename to packages/features/ee/teams/services/teamService.test.ts
index f1adf3f68228bd..657bb5f4cacd6b 100644
--- a/packages/lib/server/service/teamService.test.ts
+++ b/packages/features/ee/teams/services/teamService.test.ts
@@ -1,13 +1,13 @@
-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
+import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";
 
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
 import { TeamBilling } from "@calcom/features/ee/billing/teams";
 import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
-import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import { deleteDomain } from "@calcom/lib/domainManager/organization";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import type { Membership, Team, User, VerificationToken, Profile } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 
@@ -16,11 +16,11 @@ import { TRPCError } from "@trpc/server";
 import { TeamService } from "./teamService";
 
 vi.mock("@calcom/features/ee/billing/teams");
-vi.mock("@calcom/lib/server/repository/team");
-vi.mock("@calcom/lib/server/service/workflows");
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService");
 vi.mock("@calcom/lib/domainManager/organization");
 vi.mock("@calcom/features/ee/teams/lib/removeMember");
-vi.mock("@calcom/lib/createAProfileForAnExistingUser");
+vi.mock("@calcom/features/profile/lib/createAProfileForAnExistingUser");
 vi.mock("@calcom/features/ee/teams/lib/queries");
 
 const mockTeamBilling = {
diff --git a/packages/lib/server/service/teamService.ts b/packages/features/ee/teams/services/teamService.ts
similarity index 97%
rename from packages/lib/server/service/teamService.ts
rename to packages/features/ee/teams/services/teamService.ts
index 3f0a333393f649..66256e2e832a0d 100644
--- a/packages/lib/server/service/teamService.ts
+++ b/packages/features/ee/teams/services/teamService.ts
@@ -4,12 +4,12 @@ import { TeamBilling } from "@calcom/features/ee/billing/teams";
 import { deleteWorkfowRemindersOfRemovedMember } from "@calcom/features/ee/teams/lib/deleteWorkflowRemindersOfRemovedMember";
 import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import { deleteDomain } from "@calcom/lib/domainManager/organization";
 import logger from "@calcom/lib/logger";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { prisma } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import type { Membership } from "@calcom/prisma/client";
diff --git a/packages/features/ee/workflows/api/scheduleEmailReminders.ts b/packages/features/ee/workflows/api/scheduleEmailReminders.ts
index e689dd195b7b6c..646837f87b6a8b 100644
--- a/packages/features/ee/workflows/api/scheduleEmailReminders.ts
+++ b/packages/features/ee/workflows/api/scheduleEmailReminders.ts
@@ -8,7 +8,7 @@ import { v4 as uuidv4 } from "uuid";
 import dayjs from "@calcom/dayjs";
 import generateIcsString from "@calcom/emails/lib/generateIcsString";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts
index d3ed23d6a14db5..96e4c5b223060f 100644
--- a/packages/features/ee/workflows/api/scheduleSMSReminders.ts
+++ b/packages/features/ee/workflows/api/scheduleSMSReminders.ts
@@ -7,7 +7,7 @@ import { bulkShortenLinks } from "@calcom/ee/workflows/lib/reminders/utils";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { isAttendeeAction } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
 import { scheduleSmsOrFallbackEmail } from "@calcom/features/ee/workflows/lib/reminders/messageDispatcher";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import prisma from "@calcom/prisma";
diff --git a/packages/features/ee/workflows/components/AddActionDialog.tsx b/packages/features/ee/workflows/components/AddActionDialog.tsx
index 7f8a262f3779b7..9645777b87c786 100644
--- a/packages/features/ee/workflows/components/AddActionDialog.tsx
+++ b/packages/features/ee/workflows/components/AddActionDialog.tsx
@@ -10,7 +10,6 @@ import PhoneInput from "@calcom/features/components/phone-input";
 import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { WorkflowActions } from "@calcom/prisma/enums";
-import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
 import { DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
 import { EmailField } from "@calcom/ui/components/form";
@@ -35,6 +34,13 @@ interface IAddActionDialog {
     senderId?: string,
     senderName?: string
   ) => void;
+  actionOptions: {
+    label: string;
+    value: WorkflowActions;
+    needsCredits: boolean;
+    creditsTeamId?: number;
+    isOrganization?: boolean;
+  }[];
 }
 
 interface ISelectActionOption {
@@ -52,11 +58,10 @@ type AddActionFormValues = {
 
 export const AddActionDialog = (props: IAddActionDialog) => {
   const { t } = useLocale();
-  const { isOpenDialog, setIsOpenDialog, addAction } = props;
+  const { isOpenDialog, setIsOpenDialog, addAction, actionOptions } = props;
   const [isPhoneNumberNeeded, setIsPhoneNumberNeeded] = useState(false);
   const [isSenderIdNeeded, setIsSenderIdNeeded] = useState(false);
   const [isEmailAddressNeeded, setIsEmailAddressNeeded] = useState(false);
-  const { data: actionOptions } = trpc.viewer.workflows.getWorkflowActionOptions.useQuery();
 
   const formSchema = z.object({
     action: z.enum(WORKFLOW_ACTIONS),
@@ -165,9 +170,7 @@ export const AddActionDialog = (props: IAddActionDialog) => {
                       menuPlacement="bottom"
                       defaultValue={actionOptions[0]}
                       onChange={handleSelectAction}
-                      options={actionOptions.map((option) => ({
-                        ...option,
-                      }))}
+                      options={actionOptions}
                     />
                   );
                 }}
diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
index 079dc41a421ed9..f2662b9cee46ba 100644
--- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
+++ b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
@@ -6,16 +6,20 @@ import type { UseFormReturn } from "react-hook-form";
 import { SENDER_ID, SENDER_NAME, SCANNING_WORKFLOW_STEPS } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { WorkflowPermissions } from "@calcom/lib/server/repository/workflow-permissions";
-import type { WorkflowActions } from "@calcom/prisma/enums";
+import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
+import { WorkflowActions } from "@calcom/prisma/enums";
 import { WorkflowTemplates } from "@calcom/prisma/enums";
 import type { RouterOutputs } from "@calcom/trpc/react";
+import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
 import { FormCard, FormCardBody } from "@calcom/ui/components/card";
 import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 
 import { useAgentsData } from "../hooks/useAgentsData";
-import { isCalAIAction, isSMSAction } from "../lib/actionHelperFunctions";
+import { isCalAIAction, isFormTrigger, isSMSAction } from "../lib/actionHelperFunctions";
+import { ALLOWED_FORM_WORKFLOW_ACTIONS } from "../lib/constants";
+import emailReminderTemplate from "../lib/reminders/templates/emailReminderTemplate";
 import type { FormValues } from "../pages/workflow";
 import { AddActionDialog } from "./AddActionDialog";
 import WorkflowStepContainer from "./WorkflowStepContainer";
@@ -38,16 +42,56 @@ interface Props {
 export default function WorkflowDetailsPage(props: Props) {
   const { form, workflowId, selectedOptions, setSelectedOptions, teamId, isOrg, allOptions, permissions } =
     props;
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
 
   const [isAddActionDialogOpen, setIsAddActionDialogOpen] = useState(false);
   const [isDeleteStepDialogOpen, setIsDeleteStepDialogOpen] = useState(false);
 
   const [reload, setReload] = useState(false);
+  const [updateTemplate, setUpdateTemplate] = useState(false);
 
   const searchParams = useSearchParams();
   const eventTypeId = searchParams?.get("eventTypeId");
 
+  // Get base action options and transform them for form triggers
+  const { data: baseActionOptions } = trpc.viewer.workflows.getWorkflowActionOptions.useQuery();
+
+  const transformedActionOptions = baseActionOptions
+    ? baseActionOptions
+        .filter((option) => {
+          const isFormWorkflowWithInvalidSteps =
+            isFormTrigger(form.getValues("trigger")) &&
+            !ALLOWED_FORM_WORKFLOW_ACTIONS.some((action) => action === option.value);
+
+          const isSelectAllCalAiAction = isCalAIAction(option.value) && form.watch("selectAll");
+
+          const isOrgCalAiAction = isCalAIAction(option.value) && isOrg;
+
+          if (isFormWorkflowWithInvalidSteps || isSelectAllCalAiAction || isOrgCalAiAction) {
+            return false;
+          }
+          return true;
+        })
+        .map((option) => {
+          let label = option.label;
+
+          // Transform labels for form triggers
+          if (isFormTrigger(form.getValues("trigger"))) {
+            if (option.value === WorkflowActions.EMAIL_ATTENDEE) {
+              label = t("email_attendee_action_form");
+            }
+          }
+
+          return {
+            ...option,
+            label,
+            creditsTeamId: teamId,
+            isOrganization: isOrg,
+            isCalAi: isCalAIAction(option.value),
+          };
+        })
+    : [];
+
   useEffect(() => {
     const matchingOption = allOptions.find((option) => option.value === eventTypeId);
     if (matchingOption && !selectedOptions.find((option) => option.value === eventTypeId)) {
@@ -55,7 +99,6 @@ export default function WorkflowDetailsPage(props: Props) {
       setSelectedOptions(newOptions);
       form.setValue("activeOn", newOptions);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [eventTypeId]);
 
   const addAction = (
@@ -73,6 +116,23 @@ export default function WorkflowDetailsPage(props: Props) {
           })[0].id - 1
         : 0;
 
+    const timeFormat = getTimeFormatStringFromUserTimeFormat(props.user.timeFormat);
+
+    const template = isFormTrigger(form.getValues("trigger"))
+      ? WorkflowTemplates.CUSTOM
+      : WorkflowTemplates.REMINDER;
+
+    const { emailBody: reminderBody, emailSubject } =
+      template !== WorkflowTemplates.CUSTOM
+        ? emailReminderTemplate({
+            isEditingMode: true,
+            locale: i18n.language,
+            t,
+            action,
+            timeFormat,
+          })
+        : { emailBody: null, emailSubject: null };
+
     const step = {
       id: id > 0 ? 0 : id, //id of new steps always <= 0
       action,
@@ -84,9 +144,9 @@ export default function WorkflowDetailsPage(props: Props) {
           : 1,
       sendTo: sendTo || null,
       workflowId: workflowId,
-      reminderBody: null,
-      emailSubject: null,
-      template: WorkflowTemplates.REMINDER,
+      reminderBody,
+      emailSubject,
+      template,
       numberRequired: numberRequired || false,
       sender: isSMSAction(action) ? sender || SENDER_ID : SENDER_ID,
       senderName: !isSMSAction(action) ? senderName || SENDER_NAME : SENDER_NAME,
@@ -128,6 +188,9 @@ export default function WorkflowDetailsPage(props: Props) {
               isOrganization={isOrg}
               allOptions={allOptions}
               onSaveWorkflow={props.onSaveWorkflow}
+              actionOptions={transformedActionOptions}
+              updateTemplate={updateTemplate}
+              setUpdateTemplate={setUpdateTemplate}
             />
           </FormCardBody>
         </FormCard>
@@ -205,6 +268,9 @@ export default function WorkflowDetailsPage(props: Props) {
                         inboundAgentData={inboundAgentData}
                         isInboundAgentLoading={isInboundAgentLoading}
                         allOptions={allOptions}
+                        actionOptions={transformedActionOptions}
+                        updateTemplate={updateTemplate}
+                        setUpdateTemplate={setUpdateTemplate}
                       />
                     </FormCardBody>
                   </FormCard>
@@ -234,6 +300,7 @@ export default function WorkflowDetailsPage(props: Props) {
         isOpenDialog={isAddActionDialogOpen}
         setIsOpenDialog={setIsAddActionDialogOpen}
         addAction={addAction}
+        actionOptions={transformedActionOptions}
       />
     </>
   );
diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
index f90a624164c3ad..04620593c9fb12 100644
--- a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
+++ b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
@@ -3,7 +3,7 @@ import { useParams, useRouter, useSearchParams } from "next/navigation";
 import type { Dispatch, SetStateAction } from "react";
 import { useEffect, useRef, useState, useCallback } from "react";
 import type { UseFormReturn } from "react-hook-form";
-import { Controller } from "react-hook-form";
+import { Controller, useWatch } from "react-hook-form";
 import "react-phone-number-input/style.css";
 
 import type { RetellAgentWithDetails } from "@calcom/features/calAIPhone/providers/retellAI";
@@ -60,6 +60,8 @@ import {
   shouldScheduleEmailReminder,
   isSMSOrWhatsappAction,
   isCalAIAction,
+  isFormTrigger,
+  hasCalAIAction,
 } from "../lib/actionHelperFunctions";
 import { DYNAMIC_TEXT_VARIABLES } from "../lib/constants";
 import { getWorkflowTemplateOptions, getWorkflowTriggerOptions } from "../lib/getOptions";
@@ -92,6 +94,16 @@ type WorkflowStepProps = {
   isDeleteStepDialogOpen?: boolean;
   agentData?: RetellAgentWithDetails;
   isAgentLoading?: boolean;
+  actionOptions: {
+    label: string;
+    value: WorkflowActions;
+    needsCredits: boolean;
+    creditsTeamId?: number;
+    isOrganization: boolean;
+    isCalAi: boolean;
+  }[];
+  updateTemplate: boolean;
+  setUpdateTemplate: Dispatch<SetStateAction<boolean>>;
   inboundAgentData?: RetellAgentWithDetails;
   isInboundAgentLoading?: boolean;
 };
@@ -102,27 +114,26 @@ const getTimeSectionText = (trigger: WorkflowTriggerEvents, t: TFunction) => {
     [WorkflowTriggerEvents.BEFORE_EVENT]: "how_long_before",
     [WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW]: "how_long_after_hosts_no_show",
     [WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW]: "how_long_after_guests_no_show",
+    [WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT]: "how_long_after_form_submitted_no_event",
   };
-  if (!triggerMap[trigger]) return null;
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  return t(triggerMap[trigger]!);
+  return triggerMap[trigger] ? t(triggerMap[trigger]) : null;
 };
 
 const CalAIAgentDataSkeleton = () => {
   return (
-    <div className="bg-muted mt-4 rounded-lg p-4">
-      <div className="flex items-center justify-between">
+    <div className="p-4 mt-4 rounded-lg bg-muted">
+      <div className="flex justify-between items-center">
         <div>
-          <SkeletonText className="h-5 w-28" />
-          <div className="mt-2 flex items-center gap-2">
-            <SkeletonText className="h-4 w-4" />
-            <SkeletonText className="h-4 w-32" />
-            <SkeletonText className="h-5 w-12" />
+          <SkeletonText className="w-28 h-5" />
+          <div className="flex gap-2 items-center mt-2">
+            <SkeletonText className="w-4 h-4" />
+            <SkeletonText className="w-32 h-4" />
+            <SkeletonText className="w-12 h-5" />
           </div>
         </div>
-        <div className="flex items-center gap-1">
-          <SkeletonText className="h-8 w-24" />
-          <SkeletonText className="h-8 w-8" />
+        <div className="flex gap-1 items-center">
+          <SkeletonText className="w-24 h-8" />
+          <SkeletonText className="w-8 h-8" />
         </div>
       </div>
     </div>
@@ -164,6 +175,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     isDeleteStepDialogOpen,
     setIsDeleteStepDialogOpen,
     onSaveWorkflow,
+    actionOptions,
+    updateTemplate,
+    setUpdateTemplate,
   } = props;
   const { data: _verifiedNumbers } = trpc.viewer.workflows.getVerifiedNumbers.useQuery(
     { teamId },
@@ -258,7 +272,6 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     WorkflowActions.SMS_NUMBER === action || WorkflowActions.WHATSAPP_NUMBER === action;
   const [isPhoneNumberNeeded, setIsPhoneNumberNeeded] = useState(requirePhoneNumber);
 
-  const [updateTemplate, setUpdateTemplate] = useState(false);
   const [firstRender, setFirstRender] = useState(true);
 
   const senderNeeded =
@@ -278,14 +291,18 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
       : false
   );
 
-  const [timeSectionText, setTimeSectionText] = useState(getTimeSectionText(form.getValues("trigger"), t));
+  const trigger = useWatch({
+    control: form.control,
+    name: "trigger",
+  });
+
+  const [timeSectionText, setTimeSectionText] = useState(getTimeSectionText(trigger, t));
   const isCreatingAgent = useRef(false);
   const hasAutoCreated = useRef(false);
 
   const handleCreateAgent = useCallback(
     async (templateWorkflowId?: string) => {
       if (isCreatingAgent.current || createAgentMutation.isPending) {
-        console.log("Agent creation already in progress, skipping...");
         return;
       }
 
@@ -354,39 +371,24 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     handleCreateAgent,
   ]);
 
-  const { data: actionOptions } = trpc.viewer.workflows.getWorkflowActionOptions.useQuery();
   const triggerOptions = getWorkflowTriggerOptions(t);
-  const templateOptions = getWorkflowTemplateOptions(t, step?.action, hasActiveTeamPlan);
-  if (step && !form.getValues(`steps.${step.stepNumber - 1}.reminderBody`)) {
-    const action = form.getValues(`steps.${step.stepNumber - 1}.action`);
-
-    // Skip setting reminderBody for CAL_AI actions since they don't need email templates
-    if (!isCalAIAction(action)) {
-      const template = getTemplateBodyForAction({
-        action,
-        locale: i18n.language,
-        t,
-        template: step.template ?? WorkflowTemplates.REMINDER,
-        timeFormat,
-      });
-      form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, template);
-    }
-  }
+  const templateOptions = getWorkflowTemplateOptions(t, step?.action, hasActiveTeamPlan, trigger);
 
-  if (step && !form.getValues(`steps.${step.stepNumber - 1}.emailSubject`)) {
-    const action = form.getValues(`steps.${step.stepNumber - 1}.action`);
-    // Skip setting emailSubject for CAL_AI actions since they don't need email subjects
-    if (!isCalAIAction(action)) {
-      const subjectTemplate = emailReminderTemplate({
-        isEditingMode: true,
-        locale: i18n.language,
-        t,
-        action: action,
-        timeFormat,
-      }).emailSubject;
-      form.setValue(`steps.${step.stepNumber - 1}.emailSubject`, subjectTemplate);
-    }
-  }
+  const steps = useWatch({
+    control: form.control,
+    name: "steps",
+  });
+
+  const hasAiAction = hasCalAIAction(steps);
+  const hasSMSAction = steps.some((s) => isSMSAction(s.action));
+  const hasWhatsappAction = steps.some((s) => isWhatsappAction(s.action));
+  const hasEmailToHostAction = steps.some((s) => s.action === WorkflowActions.EMAIL_HOST);
+
+  const disallowFormTriggers = hasAiAction || hasSMSAction || hasEmailToHostAction || hasWhatsappAction;
+
+  const filteredTriggerOptions = triggerOptions.filter(
+    (option) => !(isFormTrigger(option.value) && disallowFormTriggers)
+  );
 
   const { ref: emailSubjectFormRef, ...restEmailSubjectForm } = step
     ? form.register(`steps.${step.stepNumber - 1}.emailSubject`)
@@ -407,9 +409,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
   const [numberVerified, setNumberVerified] = useState(getNumberVerificationStatus());
   const [emailVerified, setEmailVerified] = useState(getEmailVerificationStatus());
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(() => setNumberVerified(getNumberVerificationStatus()), [verifiedNumbers.length]);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(() => setEmailVerified(getEmailVerificationStatus()), [verifiedEmails.length]);
 
   const addVariableEmailSubject = (variable: string) => {
@@ -465,11 +465,6 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     },
   });
 
-  const hasCalAIAction = () => {
-    const steps = form.getValues("steps") || [];
-    return steps.some((step) => isCalAIAction(step.action));
-  };
-
   const verifyEmailCodeMutation = trpc.viewer.workflows.verifyEmailCode.useMutation({
     onSuccess: (isVerified) => {
       showToast(isVerified ? t("verified_successfully") : t("wrong_code"), "success");
@@ -513,7 +508,6 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
 
   //trigger
   if (!step) {
-    const trigger = form.getValues("trigger");
     const triggerString = t(`${trigger.toLowerCase()}_trigger`);
 
     const selectedTrigger = {
@@ -524,7 +518,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     return (
       <>
         <div className="mb-3">
-          <Label className="text-default text-sm leading-none">{t("when")}</Label>
+          <Label className="text-sm leading-none text-default">{t("when")}</Label>
           <Controller
             name="trigger"
             control={form.control}
@@ -538,7 +532,21 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   isDisabled={props.readOnly}
                   onChange={(val) => {
                     if (val) {
+                      const currentTrigger = form.getValues("trigger");
+                      const isCurrentFormTrigger = isFormTrigger(currentTrigger);
+                      const isNewFormTrigger = isFormTrigger(val.value);
+
                       form.setValue("trigger", val.value);
+
+                      // Reset activeOn when switching between form and non-form triggers
+                      if (isCurrentFormTrigger !== isNewFormTrigger) {
+                        form.setValue("activeOn", []);
+                        if (setSelectedOptions) {
+                          setSelectedOptions([]);
+                        }
+                        form.setValue("selectAll", false);
+                      }
+
                       const newTimeSectionText = getTimeSectionText(val.value, t);
                       if (newTimeSectionText) {
                         setTimeSectionText(newTimeSectionText);
@@ -557,10 +565,27 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                         form.unregister("time");
                         form.unregister("timeUnit");
                       }
+                      if (isFormTrigger(val.value)) {
+                        const steps = form.getValues("steps");
+                        if (steps?.length) {
+                          const updatedSteps = steps.map((step) =>
+                            step.template === WorkflowTemplates.CUSTOM
+                              ? step
+                              : {
+                                  ...step,
+                                  reminderBody: " ",
+                                  emailSubject: " ",
+                                  template: WorkflowTemplates.CUSTOM,
+                                }
+                          );
+                          form.setValue("steps", updatedSteps);
+                          setUpdateTemplate(!updateTemplate);
+                        }
+                      }
                     }
                   }}
                   defaultValue={selectedTrigger}
-                  options={triggerOptions}
+                  options={filteredTriggerOptions}
                 />
               );
             }}
@@ -568,8 +593,8 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
         </div>
         <div>
           {!!timeSectionText && (
-            <div className="mb-3 mt-3">
-              <Label className="text-default mb-0">{timeSectionText}</Label>
+            <div className="mt-3 mb-3">
+              <Label className="mb-0 text-default">{timeSectionText}</Label>
               <TimeTimeUnitInput disabled={props.readOnly} />
             </div>
           )}
@@ -577,14 +602,16 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
           {selectedOptions && setSelectedOptions && allOptions && (
             <div className={classNames(!!timeSectionText && "mb-3")}>
               {isOrganization ? (
-                <div className="text-default flex items-center gap-2">
+                <div className="flex gap-2 items-center text-default">
                   <Label>{t("which_team_apply")}</Label>
                   <div className="mb-2">
                     <InfoBadge content={t("team_select_info")} />
                   </div>
                 </div>
               ) : (
-                <Label className="text-default mb-2 block">{t("which_event_type_apply")}</Label>
+                <Label>
+                  {isFormTrigger(trigger) ? t("which_routing_form_apply") : t("which_event_type_apply")}
+                </Label>
               )}
               <Controller
                 name="activeOn"
@@ -600,18 +627,30 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                       setValue={(s: Option[]) => {
                         form.setValue("activeOn", s);
                       }}
-                      countText={isOrganization ? "count_team" : "nr_event_type"}
+                      countText={
+                        isOrganization
+                          ? "count_team"
+                          : isFormTrigger(form.getValues("trigger"))
+                          ? "nr_routing_form"
+                          : "nr_event_type"
+                      }
                     />
                   );
                 }}
               />
-              {!hasCalAIAction() && (
+              {!hasCalAIAction(steps) && (
                 <div className="mt-1">
                   <Controller
                     name="selectAll"
                     render={({ field: { value, onChange } }) => (
                       <CheckboxField
-                        description={isOrganization ? t("apply_to_all_teams") : t("apply_to_all_event_types")}
+                        description={
+                          isOrganization
+                            ? t("apply_to_all_teams")
+                            : isFormTrigger(form.getValues("trigger"))
+                            ? t("apply_to_all_routing_forms")
+                            : t("apply_to_all_event_types")
+                        }
                         disabled={props.readOnly}
                         descriptionClassName="ml-0"
                         onChange={(e) => {
@@ -630,7 +669,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
             </div>
           )}
           {!!timeSectionText && (
-            <div className="mt-1 flex text-gray-500">
+            <div className="flex mt-1 text-gray-500">
               <Icon name="info" className="mr-1 mt-0.5 h-4 w-4" />
               <p className="text-sm">{t("testing_sms_workflow_info_message")}</p>
             </div>
@@ -750,21 +789,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                       }
                     }}
                     defaultValue={selectedAction}
-                    options={actionOptions
-                      ?.filter((option) => {
-                        if (
-                          (isCalAIAction(option.value) && form.watch("selectAll")) ||
-                          (isCalAIAction(option.value) && props.isOrganization)
-                        ) {
-                          return false;
-                        }
-                        return true;
-                      })
-                      ?.map((option) => ({
-                        ...option,
-                        creditsTeamId: teamId ?? creditsTeamId,
-                        isOrganization: props.isOrganization,
-                      }))}
+                    options={actionOptions.map((option) => ({
+                      ...option,
+                      creditsTeamId: teamId ?? creditsTeamId,
+                    }))}
                   />
                 );
               }}
@@ -788,12 +816,12 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                       />
                       <div className="mt-1.5 flex items-center gap-1">
                         <Icon name="info" size="10" className="text-gray-500" />
-                        <div className="text-subtle text-xs">{t("sender_id_info")}</div>
+                        <div className="text-xs text-subtle">{t("sender_id_info")}</div>
                       </div>
                     </div>
                     {form.formState.errors.steps &&
                       form.formState?.errors?.steps[step.stepNumber - 1]?.sender && (
-                        <p className="text-error mt-1 text-xs">{t("sender_id_error_message")}</p>
+                        <p className="mt-1 text-xs text-error">{t("sender_id_error_message")}</p>
                       )}
                   </>
                 ) : (
@@ -812,23 +840,23 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               </div>
             )}
           {isCalAIAction(form.getValues(`steps.${step.stepNumber - 1}.action`)) && !stepAgentId && (
-            <div className="bg-muted border-muted mt-2 rounded-2xl border p-3">
-              <div className="flex flex-col justify-between gap-4 sm:flex-row sm:items-center sm:gap-0">
+            <div className="p-3 mt-2 rounded-2xl border bg-muted border-muted">
+              <div className="flex flex-col gap-4 justify-between sm:flex-row sm:items-center sm:gap-0">
                 <div>
-                  <h2 className="text-emphasis text-sm font-medium leading-none">
+                  <h2 className="text-sm font-medium leading-none text-emphasis">
                     {t("cal_ai_agent")}
-                    <Badge startIcon="info" className="ms-2 rounded-md" variant="warning">
+                    <Badge startIcon="info" className="rounded-md ms-2" variant="warning">
                       {t("set_up_required")}
                     </Badge>
                   </h2>
-                  <p className="text-muted mt-1 text-sm font-medium leading-none">
+                  <p className="mt-1 text-sm font-medium leading-none text-muted">
                     {t("no_phone_number_connected")}.
                   </p>
                 </div>
                 <Button
                   color="primary"
                   disabled={props.readOnly || isCreatingAgent.current || hasAutoCreated.current}
-                  className="flex items-center justify-center"
+                  className="flex justify-center items-center"
                   onClick={() => handleCreateAgent()}
                   loading={createAgentMutation.isPending || isCreatingAgent.current}>
                   {t("set_up_agent")}
@@ -839,9 +867,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
 
           {stepAgentId && isAgentLoading && <CalAIAgentDataSkeleton />}
           {stepAgentId && agentData && (
-            <div className="bg-muted mt-4 rounded-lg p-4">
+            <div className="p-4 mt-4 rounded-lg bg-muted">
               <div
-                className="flex cursor-pointer items-center justify-between"
+                className="flex justify-between items-center cursor-pointer"
                 onClick={(e) => {
                   const target = e.target as HTMLElement;
                   if (
@@ -856,11 +884,11 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   }
                 }}>
                 <div>
-                  <h3 className="text-emphasis text-base font-medium">{t("cal_ai_agent")}</h3>
+                  <h3 className="text-base font-medium text-emphasis">{t("cal_ai_agent")}</h3>
                   {arePhoneNumbersActive.length > 0 ? (
-                    <div className="flex items-center gap-2">
-                      <Icon name="phone" className="text-emphasis h-4 w-4" />
-                      <span className="text-emphasis text-sm">
+                    <div className="flex gap-2 items-center">
+                      <Icon name="phone" className="w-4 h-4 text-emphasis" />
+                      <span className="text-sm text-emphasis">
                         {formatPhoneNumber(arePhoneNumbersActive[0].phoneNumber)}
                       </span>
                       <Badge variant="green" size="sm" withDot>
@@ -868,12 +896,12 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                       </Badge>
                     </div>
                   ) : (
-                    <div className="flex items-center gap-1">
-                      <span className="text-subtle text-sm">{t("no_phone_number_connected")}</span>
+                    <div className="flex gap-1 items-center">
+                      <span className="text-sm text-subtle">{t("no_phone_number_connected")}</span>
                     </div>
                   )}
                 </div>
-                <div className="flex items-center gap-1" onClick={(e) => e.stopPropagation()}>
+                <div className="flex gap-1 items-center" onClick={(e) => e.stopPropagation()}>
                   {arePhoneNumbersActive.length > 0 ? (
                     <Dropdown>
                       <DropdownMenuTrigger asChild>
@@ -983,7 +1011,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
             </div>
           )}
           {isPhoneNumberNeeded && (
-            <div className="bg-muted mt-2 rounded-md p-4 pt-0">
+            <div className="p-4 pt-0 mt-2 rounded-md bg-muted">
               <Label className="pt-4">{t("custom_phone_number")}</Label>
               <div className="block sm:flex">
                 <Controller
@@ -1023,7 +1051,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               </div>
 
               {form.formState.errors.steps && form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo && (
-                <p className="text-error mt-1 text-xs">
+                <p className="mt-1 text-xs text-error">
                   {form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo?.message || ""}
                 </p>
               )}
@@ -1034,9 +1062,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               ) : (
                 !props.readOnly && (
                   <>
-                    <div className="mt-6 flex w-full flex-col">
+                    <div className="flex flex-col mt-6 w-full">
                       <Label className="">{t("verification_code")}</Label>
-                      <div className="flex w-full items-center">
+                      <div className="flex items-center w-full">
                         <TextField
                           containerClassName="w-full"
                           className="h-8 rounded-xl"
@@ -1066,7 +1094,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                     </div>
                     {form.formState.errors.steps &&
                       form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo && (
-                        <p className="text-error mt-1 text-xs">
+                        <p className="mt-1 text-xs text-error">
                           {form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo?.message || ""}
                         </p>
                       )}
@@ -1096,9 +1124,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               </div>
             )}
           {isEmailAddressNeeded && !isCalAIAction(form.getValues(`steps.${step.stepNumber - 1}.action`)) && (
-            <div className="bg-muted border-muted mt-5 rounded-2xl border p-4">
+            <div className="p-4 mt-5 rounded-2xl border bg-muted border-muted">
               <Label>{t("email_address")}</Label>
-              <div className="block items-center gap-2 sm:flex">
+              <div className="block gap-2 items-center sm:flex">
                 <Controller
                   name={`steps.${step.stepNumber - 1}.sendTo`}
                   render={({ field: { value, onChange } }) => (
@@ -1124,7 +1152,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   size="sm"
                   disabled={emailVerified || props.readOnly || false}
                   className={classNames(
-                    "min-w-fit text-sm font-medium",
+                    "text-sm font-medium min-w-fit",
                     emailVerified ? "hidden" : "mt-3 sm:mt-0"
                   )}
                   onClick={() => {
@@ -1138,7 +1166,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                 </Button>
               </div>
               {form.formState.errors.steps && form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo && (
-                <p className="text-error mt-1 text-xs">
+                <p className="mt-1 text-xs text-error">
                   {form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo?.message || ""}
                 </p>
               )}
@@ -1149,9 +1177,9 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               ) : (
                 !props.readOnly && (
                   <>
-                    <div className="mt-3 flex w-full flex-col">
+                    <div className="flex flex-col mt-3 w-full">
                       <Label className="">{t("verification_code")}</Label>
-                      <div className="flex w-full items-center">
+                      <div className="flex items-center w-full">
                         <TextField
                           containerClassName="w-full"
                           className="h-8 rounded-xl"
@@ -1181,7 +1209,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                     </div>
                     {form.formState.errors.steps &&
                       form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo && (
-                        <p className="text-error mt-1 text-xs">
+                        <p className="mt-1 text-xs text-error">
                           {form.formState?.errors?.steps[step.stepNumber - 1]?.sendTo?.message || ""}
                         </p>
                       )}
@@ -1205,19 +1233,20 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                       onChange={(val) => {
                         if (val) {
                           const action = form.getValues(`steps.${step.stepNumber - 1}.action`);
+                          const value = val.value as WorkflowTemplates;
 
                           const template = getTemplateBodyForAction({
                             action,
                             locale: i18n.language,
                             t,
-                            template: val.value ?? WorkflowTemplates.REMINDER,
+                            template: value ?? WorkflowTemplates.REMINDER,
                             timeFormat,
                           });
 
                           form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, template);
 
                           if (shouldScheduleEmailReminder(action)) {
-                            if (val.value === WorkflowTemplates.REMINDER) {
+                            if (value === WorkflowTemplates.REMINDER) {
                               form.setValue(
                                 `steps.${step.stepNumber - 1}.emailSubject`,
                                 emailReminderTemplate({
@@ -1228,7 +1257,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                                   timeFormat,
                                 }).emailSubject
                               );
-                            } else if (val.value === WorkflowTemplates.RATING) {
+                            } else if (value === WorkflowTemplates.RATING) {
                               form.setValue(
                                 `steps.${step.stepNumber - 1}.emailSubject`,
                                 emailRatingTemplate({
@@ -1241,8 +1270,8 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                               );
                             }
                           }
-                          field.onChange(val.value);
-                          form.setValue(`steps.${step.stepNumber - 1}.template`, val.value);
+                          field.onChange(value);
+                          form.setValue(`steps.${step.stepNumber - 1}.template`, value);
                           setUpdateTemplate(!updateTemplate);
                         }
                       }}
@@ -1255,10 +1284,11 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                           option.needsTeamsUpgrade &&
                           !isSMSAction(form.getValues(`steps.${step.stepNumber - 1}.action`)),
                       }))}
-                      //eslint-disable-next-line @typescript-eslint/no-explicit-any
-                      isOptionDisabled={(option: { label: string; value: any; needsTeamsUpgrade: boolean }) =>
-                        option.needsTeamsUpgrade
-                      }
+                      isOptionDisabled={(option: {
+                        label: string;
+                        value: string;
+                        needsTeamsUpgrade: boolean;
+                      }) => option.needsTeamsUpgrade}
                     />
                   );
                 }}
@@ -1266,14 +1296,18 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
             </div>
           )}
           {!isCalAIAction(form.getValues(`steps.${step.stepNumber - 1}.action`)) && (
-            <div className="bg-muted border-muted mt-3 rounded-2xl border p-3">
+            <div className="p-3 mt-3 rounded-2xl border bg-muted border-muted">
               {isEmailSubjectNeeded && (
                 <div className="mb-6">
                   <div className="flex items-center">
-                    <Label className={classNames("flex-none", props.readOnly ? "mb-2" : "mb-0")}>
+                    <Label
+                      className={classNames(
+                        "flex-none",
+                        props.readOnly || isFormTrigger(trigger) ? "mb-2" : "mb-0"
+                      )}>
                       {t("email_subject")}
                     </Label>
-                    {!props.readOnly && (
+                    {!props.readOnly && !isFormTrigger(trigger) && (
                       <div className="flex-grow text-right">
                         <AddVariablesDropdown
                           addVariable={addVariableEmailSubject}
@@ -1295,26 +1329,24 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   />
                   {form.formState.errors.steps &&
                     form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject && (
-                      <p className="text-error mt-1 text-xs">
+                      <p className="mt-1 text-xs text-error">
                         {form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject?.message || ""}
                       </p>
                     )}
                 </div>
               )}
-              <div className="mb-2 flex items-center pb-1">
-                <Label className="mb-0 flex-none">
+              <div className="flex items-center pb-1 mb-2">
+                <Label className="flex-none mb-0">
                   {isEmailSubjectNeeded ? t("email_body") : t("text_message")}
                 </Label>
               </div>
               <Editor
-                getText={() => {
-                  return props.form.getValues(`steps.${step.stepNumber - 1}.reminderBody`) || "";
-                }}
+                getText={() => props.form.getValues(`steps.${step.stepNumber - 1}.reminderBody`) || ""}
                 setText={(text: string) => {
                   props.form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, text);
                   props.form.clearErrors();
                 }}
-                variables={DYNAMIC_TEXT_VARIABLES}
+                variables={!isFormTrigger(trigger) ? DYNAMIC_TEXT_VARIABLES : undefined}
                 addVariableButtonTop={isSMSAction(step.action)}
                 height="200px"
                 updateTemplate={updateTemplate}
@@ -1333,7 +1365,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
 
               {form.formState.errors.steps &&
                 form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody && (
-                  <p className="text-error mt-1 text-sm">
+                  <p className="mt-1 text-sm text-error">
                     {form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody?.message || ""}
                   </p>
                 )}
@@ -1358,12 +1390,12 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   />
                 </div>
               )}
-              {!props.readOnly && (
-                <div className="ml-1 mt-2">
+              {!props.readOnly && !isFormTrigger(trigger) && (
+                <div className="mt-2 ml-1">
                   <button type="button" onClick={() => setIsAdditionalInputsDialogOpen(true)}>
-                    <div className="text-subtle ml-1 flex items-center gap-2">
-                      <Icon name="circle-help" className="h-3 w-3" />
-                      <p className="text-left text-xs">{t("using_booking_questions_as_variables")}</p>
+                    <div className="flex gap-2 items-center ml-1 text-subtle">
+                      <Icon name="circle-help" className="w-3 h-3" />
+                      <p className="text-xs text-left">{t("using_booking_questions_as_variables")}</p>
                     </div>
                   </button>
                 </div>
@@ -1472,23 +1504,23 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
           <DialogContent enableOverflow type="creation" className="sm:max-w-[610px]">
             <div>
               <h1 className="w-full text-xl font-semibold">{t("how_booking_questions_as_variables")}</h1>
-              <div className="bg-muted-3 mb-6 rounded-md sm:p-4">
-                <p className="test-sm font-medium">{t("format")}</p>
-                <ul className="text-emphasis ml-5 mt-2 list-disc">
+              <div className="mb-6 rounded-md bg-muted-3 sm:p-4">
+                <p className="font-medium test-sm">{t("format")}</p>
+                <ul className="mt-2 ml-5 list-disc text-emphasis">
                   <li>{t("uppercase_for_letters")}</li>
                   <li>{t("replace_whitespaces_underscores")}</li>
                   <li>{t("ignore_special_characters_booking_questions")}</li>
                 </ul>
                 <div className="mt-4">
-                  <p className="test-sm w-full font-medium">{t("example_1")}</p>
-                  <div className="mt-2 grid grid-cols-12">
-                    <div className="test-sm text-default col-span-5 ltr:mr-2 rtl:ml-2">
+                  <p className="w-full font-medium test-sm">{t("example_1")}</p>
+                  <div className="grid grid-cols-12 mt-2">
+                    <div className="col-span-5 test-sm text-default ltr:mr-2 rtl:ml-2">
                       {t("booking_question_identifier")}
                     </div>
-                    <div className="test-sm text-emphasis col-span-7">{t("company_size")}</div>
-                    <div className="test-sm text-default col-span-5 w-full">{t("variable")}</div>
+                    <div className="col-span-7 test-sm text-emphasis">{t("company_size")}</div>
+                    <div className="col-span-5 w-full test-sm text-default">{t("variable")}</div>
 
-                    <div className="test-sm text-emphasis col-span-7 break-words">
+                    <div className="col-span-7 break-words test-sm text-emphasis">
                       {" "}
                       {`{${t("company_size")
                         .replace(/[^a-zA-Z0-9 ]/g, "")
@@ -1499,14 +1531,14 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   </div>
                 </div>
                 <div className="mt-4">
-                  <p className="test-sm w-full font-medium">{t("example_2")}</p>
-                  <div className="mt-2 grid grid-cols-12">
-                    <div className="test-sm text-default col-span-5 ltr:mr-2 rtl:ml-2">
+                  <p className="w-full font-medium test-sm">{t("example_2")}</p>
+                  <div className="grid grid-cols-12 mt-2">
+                    <div className="col-span-5 test-sm text-default ltr:mr-2 rtl:ml-2">
                       {t("booking_question_identifier")}
                     </div>
-                    <div className="test-sm text-emphasis col-span-7">{t("what_help_needed")}</div>
-                    <div className="test-sm text-default col-span-5">{t("variable")}</div>
-                    <div className="test-sm text-emphasis col-span-7 break-words">
+                    <div className="col-span-7 test-sm text-emphasis">{t("what_help_needed")}</div>
+                    <div className="col-span-5 test-sm text-default">{t("variable")}</div>
+                    <div className="col-span-7 break-words test-sm text-emphasis">
                       {" "}
                       {`{${t("what_help_needed")
                         .replace(/[^a-zA-Z0-9 ]/g, "")
@@ -1576,17 +1608,17 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
         <Dialog open={isUnsubscribeDialogOpen} onOpenChange={setIsUnsubscribeDialogOpen}>
           <DialogContent type="creation" title={t("unsubscribe_phone_number")}>
             <div className="space-y-4">
-              <p className="text-default text-sm">{t("do_you_still_want_to_unsubscribe")}</p>
+              <p className="text-sm text-default">{t("do_you_still_want_to_unsubscribe")}</p>
               {getActivePhoneNumbers(
                 agentData?.outboundPhoneNumbers?.map((phone) => ({
                   ...phone,
                   subscriptionStatus: phone.subscriptionStatus ?? undefined,
                 }))
               ).length > 0 && (
-                <div className="bg-muted rounded-lg p-3">
-                  <div className="flex items-center gap-2">
-                    <Icon name="phone" className="text-emphasis h-4 w-4" />
-                    <span className="text-emphasis text-sm font-medium">
+                <div className="p-3 rounded-lg bg-muted">
+                  <div className="flex gap-2 items-center">
+                    <Icon name="phone" className="w-4 h-4 text-emphasis" />
+                    <span className="text-sm font-medium text-emphasis">
                       {formatPhoneNumber(
                         getActivePhoneNumbers(
                           agentData?.outboundPhoneNumbers?.map((phone) => ({
@@ -1599,7 +1631,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   </div>
                 </div>
               )}
-              <p className="text-subtle text-sm">{t("the_action_will_disconnect_phone_number")}</p>
+              <p className="text-sm text-subtle">{t("the_action_will_disconnect_phone_number")}</p>
             </div>
             <DialogFooter showDivider>
               <Button type="button" color="secondary" onClick={() => setIsUnsubscribeDialogOpen(false)}>
@@ -1634,7 +1666,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
         <Dialog open={isDeleteStepDialogOpen} onOpenChange={setIsDeleteStepDialogOpen}>
           <DialogContent type="confirmation" title={t("delete_workflow_step")}>
             <div className="space-y-4">
-              <p className="text-default text-sm">{t("are_you_sure_you_want_to_delete_workflow_step")}</p>
+              <p className="text-sm text-default">{t("are_you_sure_you_want_to_delete_workflow_step")}</p>
               {(() => {
                 const relevantPhoneNumbers =
                   agentData?.outboundPhoneNumbers?.filter(
@@ -1644,12 +1676,12 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                 return (
                   relevantPhoneNumbers.length > 0 && (
                     <>
-                      <div className="bg-attention rounded-lg p-3">
-                        <div className="flex items-start gap-2">
+                      <div className="p-3 rounded-lg bg-attention">
+                        <div className="flex gap-2 items-start">
                           <Icon name="info" className="text-attention mt-0.5 h-4 w-4" />
                           <div className="space-y-2">
-                            <p className="text-attention text-sm font-medium">{t("this_action_will_also")}</p>
-                            <ul className="text-attention list-inside list-disc space-y-1 text-sm">
+                            <p className="text-sm font-medium text-attention">{t("this_action_will_also")}</p>
+                            <ul className="space-y-1 text-sm list-disc list-inside text-attention">
                               {relevantPhoneNumbers.some(
                                 (phone) => phone.subscriptionStatus === PhoneNumberSubscriptionStatus.ACTIVE
                               ) && <li>{t("cancel_your_phone_number_subscription")}</li>}
@@ -1659,10 +1691,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                         </div>
                       </div>
                       {relevantPhoneNumbers.map((phone) => (
-                        <div key={phone.phoneNumber} className="bg-muted rounded-lg p-3">
-                          <div className="flex items-center gap-2">
-                            <Icon name="phone" className="text-emphasis h-4 w-4" />
-                            <span className="text-emphasis text-sm font-medium">
+                        <div key={phone.phoneNumber} className="p-3 rounded-lg bg-muted">
+                          <div className="flex gap-2 items-center">
+                            <Icon name="phone" className="w-4 h-4 text-emphasis" />
+                            <span className="text-sm font-medium text-emphasis">
                               {formatPhoneNumber(phone.phoneNumber)}
                             </span>
                             {phone.subscriptionStatus === PhoneNumberSubscriptionStatus.ACTIVE && (
diff --git a/packages/features/ee/workflows/lib/actionHelperFunctions.ts b/packages/features/ee/workflows/lib/actionHelperFunctions.ts
index 47d30fd31fb66d..dc0d1f79f9d429 100644
--- a/packages/features/ee/workflows/lib/actionHelperFunctions.ts
+++ b/packages/features/ee/workflows/lib/actionHelperFunctions.ts
@@ -1,8 +1,7 @@
 import type { TFunction } from "i18next";
 
 import type { TimeFormat } from "@calcom/lib/timeFormat";
-import type { WorkflowTriggerEvents } from "@calcom/prisma/client";
-import { WorkflowActions, WorkflowTemplates } from "@calcom/prisma/enums";
+import { WorkflowActions, WorkflowTemplates, WorkflowTriggerEvents } from "@calcom/prisma/enums";
 
 import {
   whatsappEventCancelledTemplate,
@@ -10,9 +9,11 @@ import {
   whatsappEventRescheduledTemplate,
   whatsappReminderTemplate,
 } from "../lib/reminders/templates/whatsapp";
+import { FORM_TRIGGER_WORKFLOW_EVENTS } from "./constants";
 import emailRatingTemplate from "./reminders/templates/emailRatingTemplate";
 import emailReminderTemplate from "./reminders/templates/emailReminderTemplate";
 import smsReminderTemplate from "./reminders/templates/smsReminderTemplate";
+import type { WorkflowStep } from "./types";
 
 export function shouldScheduleEmailReminder(action: WorkflowActions) {
   return action === WorkflowActions.EMAIL_ATTENDEE || action === WorkflowActions.EMAIL_HOST;
@@ -141,3 +142,11 @@ export function getTemplateBodyForAction({
   const templateFunction = getEmailTemplateFunction(template);
   return templateFunction({ isEditingMode: true, locale, t, action, timeFormat }).emailBody;
 }
+
+export function isFormTrigger(trigger: WorkflowTriggerEvents) {
+  return FORM_TRIGGER_WORKFLOW_EVENTS.includes(trigger);
+}
+
+export function hasCalAIAction(steps: WorkflowStep[]) {
+  return steps.some((step) => isCalAIAction(step.action));
+}
diff --git a/packages/features/ee/workflows/lib/constants.ts b/packages/features/ee/workflows/lib/constants.ts
index 617e21adeb28b1..a9703887b0b3b7 100644
--- a/packages/features/ee/workflows/lib/constants.ts
+++ b/packages/features/ee/workflows/lib/constants.ts
@@ -8,6 +8,8 @@ export const WORKFLOW_TRIGGER_EVENTS = [
   WorkflowTriggerEvents.RESCHEDULE_EVENT,
   WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  WorkflowTriggerEvents.FORM_SUBMITTED,
+  WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
   WorkflowTriggerEvents.BOOKING_REJECTED,
   WorkflowTriggerEvents.BOOKING_REQUESTED,
   WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED,
@@ -94,4 +96,16 @@ export const IMMEDIATE_WORKFLOW_TRIGGER_EVENTS: WorkflowTriggerEvents[] = [
   WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED,
   WorkflowTriggerEvents.BOOKING_REJECTED,
   WorkflowTriggerEvents.BOOKING_REQUESTED,
+  WorkflowTriggerEvents.FORM_SUBMITTED,
+  WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT, // no real immediate workflow but it's scheduled with tasker
 ];
+
+export const FORM_TRIGGER_WORKFLOW_EVENTS: WorkflowTriggerEvents[] = [
+  WorkflowTriggerEvents.FORM_SUBMITTED,
+  WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
+];
+
+export const ALLOWED_FORM_WORKFLOW_ACTIONS = [
+  WorkflowActions.EMAIL_ATTENDEE,
+  WorkflowActions.EMAIL_ADDRESS,
+] as const;
diff --git a/packages/features/ee/workflows/lib/getAllWorkflows.ts b/packages/features/ee/workflows/lib/getAllWorkflows.ts
index 569194255c26fe..6f84733a387947 100644
--- a/packages/features/ee/workflows/lib/getAllWorkflows.ts
+++ b/packages/features/ee/workflows/lib/getAllWorkflows.ts
@@ -1,4 +1,5 @@
 import prisma from "@calcom/prisma";
+import type { WorkflowType } from "@calcom/prisma/client";
 
 import type { Workflow } from "./types";
 
@@ -27,20 +28,31 @@ export const workflowSelect = {
   },
 };
 
-export const getAllWorkflows = async (
-  eventTypeWorkflows: Workflow[],
-  userId?: number | null,
-  teamId?: number | null,
-  orgId?: number | null,
-  workflowsLockedForUser = true
-) => {
-  const allWorkflows = eventTypeWorkflows;
+export const getAllWorkflows = async ({
+  entityWorkflows,
+  userId,
+  teamId,
+  orgId,
+  workflowsLockedForUser = true,
+  type,
+}: {
+  entityWorkflows: Workflow[];
+  userId?: number | null;
+  teamId?: number | null;
+  orgId?: number | null;
+  workflowsLockedForUser?: boolean;
+  type: WorkflowType;
+}) => {
+  const allWorkflows = entityWorkflows;
 
   if (orgId) {
     if (teamId) {
       const orgTeamWorkflowsRel = await prisma.workflowsOnTeams.findMany({
         where: {
           teamId: teamId,
+          workflow: {
+            type,
+          },
         },
         select: {
           workflow: {
@@ -54,6 +66,9 @@ export const getAllWorkflows = async (
     } else if (userId) {
       const orgUserWorkflowsRel = await prisma.workflowsOnTeams.findMany({
         where: {
+          workflow: {
+            type,
+          },
           team: {
             members: {
               some: {
@@ -79,6 +94,7 @@ export const getAllWorkflows = async (
       where: {
         teamId: orgId,
         isActiveOnAll: true,
+        type,
       },
       select: workflowSelect,
     });
@@ -90,6 +106,7 @@ export const getAllWorkflows = async (
       where: {
         teamId,
         isActiveOnAll: true,
+        type,
       },
       select: workflowSelect,
     });
@@ -102,6 +119,7 @@ export const getAllWorkflows = async (
         userId,
         teamId: null,
         isActiveOnAll: true,
+        type,
       },
       select: workflowSelect,
     });
diff --git a/packages/features/ee/workflows/lib/getOptions.ts b/packages/features/ee/workflows/lib/getOptions.ts
index f7cf2856048fd5..e83b1dceb5c8c7 100644
--- a/packages/features/ee/workflows/lib/getOptions.ts
+++ b/packages/features/ee/workflows/lib/getOptions.ts
@@ -8,6 +8,7 @@ import {
   isWhatsappAction,
   isEmailToAttendeeAction,
   isCalAIAction,
+  isFormTrigger,
 } from "./actionHelperFunctions";
 import {
   WHATSAPP_WORKFLOW_TEMPLATES,
@@ -45,22 +46,36 @@ export function getWorkflowTriggerOptions(t: TFunction) {
   });
 }
 
+function convertToTemplateOptions(
+  t: TFunction,
+  hasPaidPlan: boolean,
+  templates: readonly WorkflowTemplates[]
+) {
+  return templates.map((template) => {
+    return {
+      label: t(`${template.toLowerCase()}`),
+      value: template,
+      needsTeamsUpgrade: !hasPaidPlan,
+    } as { label: string; value: any; needsTeamsUpgrade: boolean };
+  });
+}
+
 export function getWorkflowTemplateOptions(
   t: TFunction,
   action: WorkflowActions | undefined,
-  hasPaidPlan: boolean
+  hasPaidPlan: boolean,
+  trigger: WorkflowTriggerEvents
 ) {
+  if (isFormTrigger(trigger)) {
+    return convertToTemplateOptions(t, hasPaidPlan, [WorkflowTemplates.CUSTOM]);
+  }
+
   const TEMPLATES =
     action && isWhatsappAction(action)
       ? WHATSAPP_WORKFLOW_TEMPLATES
       : action && isEmailToAttendeeAction(action)
       ? ATTENDEE_WORKFLOW_TEMPLATES
       : BASIC_WORKFLOW_TEMPLATES;
-  return TEMPLATES.map((template) => {
-    return {
-      label: t(`${template.toLowerCase()}`),
-      value: template,
-      needsTeamsUpgrade: !hasPaidPlan && template == WorkflowTemplates.CUSTOM,
-    };
-  }) as { label: string; value: any; needsTeamsUpgrade: boolean }[];
+
+  return convertToTemplateOptions(t, hasPaidPlan, TEMPLATES);
 }
diff --git a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
index 027535f615da20..791f03fbc38b0c 100644
--- a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts
@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from "uuid";
 
 import dayjs from "@calcom/dayjs";
-import { CAL_AI_AGENT_PHONE_NUMBER_FIELD } from "@calcom/features/bookings/lib/SystemField";
+import { CAL_AI_AGENT_PHONE_NUMBER_FIELD } from "@calcom/lib/bookings/SystemField";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import tasker from "@calcom/features/tasker";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
diff --git a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
index 09664e448f6d9d..cb1e4c9eae1637 100644
--- a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
@@ -8,6 +8,7 @@ import tasker from "@calcom/features/tasker";
 import { WEBSITE_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
+import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import prisma from "@calcom/prisma";
 import type { TimeUnit } from "@calcom/prisma/enums";
 import {
@@ -20,6 +21,7 @@ import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
 
 import { getWorkflowRecipientEmail } from "../getWorkflowReminders";
 import { sendOrScheduleWorkflowEmails } from "./providers/emailProvider";
+import type { FormSubmissionData } from "./reminderScheduler";
 import type { AttendeeInBookingInfo, BookingInfo, timeUnitLowerCase } from "./smsReminderManager";
 import type { VariablesType } from "./templates/customTemplate";
 import customTemplate from "./templates/customTemplate";
@@ -33,8 +35,7 @@ type ScheduleEmailReminderAction = Extract<
   "EMAIL_HOST" | "EMAIL_ATTENDEE" | "EMAIL_ADDRESS"
 >;
 
-export interface ScheduleReminderArgs {
-  evt: BookingInfo;
+export type ScheduleReminderArgs = {
   triggerEvent: WorkflowTriggerEvents;
   timeSpan: {
     time: number | null;
@@ -44,10 +45,15 @@ export interface ScheduleReminderArgs {
   sender?: string | null;
   workflowStepId?: number;
   seatReferenceUid?: string;
-}
+} & (
+  | { evt: BookingInfo; formData?: never }
+  | {
+      evt?: never;
+      formData: FormSubmissionData;
+    }
+);
 
-interface scheduleEmailReminderArgs extends ScheduleReminderArgs {
-  evt: BookingInfo;
+type scheduleEmailReminderArgs = ScheduleReminderArgs & {
   sendTo: string[];
   action: ScheduleEmailReminderAction;
   emailSubject?: string;
@@ -55,9 +61,64 @@ interface scheduleEmailReminderArgs extends ScheduleReminderArgs {
   hideBranding?: boolean;
   includeCalendarEvent?: boolean;
   verifiedAt: Date | null;
-}
+};
+
+type SendEmailReminderParams = {
+  mailData: {
+    subject: string;
+    html: string;
+    replyTo?: string;
+    attachments?: any[];
+    sender?: string | null;
+  };
+  sendTo: string[];
+  triggerEvent: WorkflowTriggerEvents;
+  scheduledDate?: dayjs.Dayjs | null;
+  uid?: string;
+  workflowStepId?: number;
+  seatReferenceUid?: string;
+};
+
+const sendOrScheduleWorkflowEmailWithReminder = async (params: SendEmailReminderParams) => {
+  const { mailData, sendTo, scheduledDate, uid, workflowStepId } = params;
+
+  let reminderUid = undefined;
+  if (scheduledDate) {
+    const reminder = await prisma.workflowReminder.create({
+      data: {
+        bookingUid: uid,
+        workflowStepId,
+        method: WorkflowMethods.EMAIL,
+        scheduledDate: scheduledDate.toDate(),
+        scheduled: true,
+      },
+    });
+    reminderUid = reminder.uuid;
+  }
+
+  await sendOrScheduleWorkflowEmails({
+    ...mailData,
+    to: sendTo,
+    sendAt: scheduledDate?.toDate(),
+    referenceUid: reminderUid ?? undefined,
+  });
+};
 
 export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) => {
+  const { verifiedAt, workflowStepId } = args;
+  if (!verifiedAt) {
+    log.warn(`Workflow step ${workflowStepId} not yet verified`);
+    return;
+  }
+
+  if (args.evt) {
+    await scheduleEmailReminderForEvt(args);
+  } else {
+    await scheduleEmailReminderForForm(args);
+  }
+};
+
+const scheduleEmailReminderForEvt = async (args: scheduleEmailReminderArgs & { evt: BookingInfo }) => {
   const {
     evt,
     triggerEvent,
@@ -72,14 +133,8 @@ export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) =>
     hideBranding,
     includeCalendarEvent,
     action,
-    verifiedAt,
   } = args;
 
-  if (!verifiedAt) {
-    log.warn(`Workflow step ${workflowStepId} not yet verified`);
-    return;
-  }
-
   const { startTime, endTime } = evt;
   const uid = evt.uid as string;
   const timeUnit: timeUnitLowerCase | undefined = timeSpan.timeUnit?.toLocaleLowerCase() as timeUnitLowerCase;
@@ -274,25 +329,67 @@ export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) =>
 
   const mailData = await prepareEmailData();
 
-  let reminderUid = undefined;
-  if (scheduledDate) {
-    const reminder = await prisma.workflowReminder.create({
-      data: {
-        bookingUid: uid,
-        workflowStepId,
-        method: WorkflowMethods.EMAIL,
-        scheduledDate: scheduledDate.toDate(),
-        scheduled: true,
-      },
-    });
-    reminderUid = reminder.uuid;
+  await sendOrScheduleWorkflowEmailWithReminder({
+    mailData,
+    sendTo,
+    triggerEvent,
+    scheduledDate,
+    uid,
+    workflowStepId,
+    seatReferenceUid,
+  });
+};
+
+const scheduleEmailReminderForForm = async (
+  args: scheduleEmailReminderArgs & {
+    formData: FormSubmissionData;
   }
+) => {
+  const {
+    formData,
+    triggerEvent,
+    sender,
+    workflowStepId,
+    sendTo,
+    emailSubject = "",
+    emailBody = "",
+    hideBranding,
+  } = args;
 
-  await sendOrScheduleWorkflowEmails({
-    ...mailData,
-    to: sendTo,
-    sendAt: scheduledDate?.toDate(),
-    referenceUid: reminderUid ?? undefined,
+  const emailContent = {
+    emailSubject,
+    emailBody: `<body style="white-space: pre-wrap;">${emailBody}</body>`,
+  };
+
+  if (emailBody) {
+    const timeFormat = getTimeFormatStringFromUserTimeFormat(formData.user.timeFormat);
+    //todo: add variables
+    const emailSubjectTemplate = customTemplate(emailSubject, {}, formData.user.locale, timeFormat);
+    emailContent.emailSubject = emailSubjectTemplate.text;
+    emailContent.emailBody = customTemplate(
+      emailBody,
+      {},
+      formData.user.locale,
+      timeFormat,
+      hideBranding
+    ).html;
+  }
+
+  // Allows debugging generated email content without waiting for sendgrid to send emails
+  log.debug(`Sending Email for trigger ${triggerEvent}`, JSON.stringify(emailContent));
+
+  const mailData = {
+    subject: emailContent.emailSubject,
+    html: emailContent.emailBody,
+    sender,
+  };
+
+  await sendOrScheduleWorkflowEmailWithReminder({
+    mailData,
+    sendTo,
+    triggerEvent,
+    workflowStepId,
+    scheduledDate: null,
   });
 };
 
diff --git a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
index 9e2f28e401b190..d1f2609127e705 100644
--- a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
+++ b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
@@ -1,3 +1,4 @@
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
 import {
   isAttendeeAction,
   isSMSAction,
@@ -8,6 +9,8 @@ import {
 import { sendOrScheduleWorkflowEmails } from "@calcom/features/ee/workflows/lib/reminders/providers/emailProvider";
 import * as twilio from "@calcom/features/ee/workflows/lib/reminders/providers/twilioProvider";
 import type { Workflow, WorkflowStep } from "@calcom/features/ee/workflows/lib/types";
+import { getSubmitterEmail } from "@calcom/features/tasker/tasks/triggerFormSubmittedNoEvent/formSubmissionValidation";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { checkSMSRateLimit } from "@calcom/lib/checkRateLimitAndThrowError";
 import { SENDER_NAME } from "@calcom/lib/constants";
 import { formatCalEventExtended } from "@calcom/lib/formatCalendarEvent";
@@ -20,10 +23,19 @@ import type { CalendarEvent } from "@calcom/types/Calendar";
 
 import { scheduleAIPhoneCall } from "./aiPhoneCallManager";
 import { scheduleEmailReminder } from "./emailReminderManager";
-import { scheduleSMSReminder } from "./smsReminderManager";
-import type { ScheduleTextReminderAction } from "./smsReminderManager";
+import type { BookingInfo } from "./smsReminderManager";
+import { scheduleSMSReminder, type ScheduleTextReminderAction } from "./smsReminderManager";
 import { scheduleWhatsappReminder } from "./whatsappReminderManager";
 
+export type FormSubmissionData = {
+  responses: FORM_SUBMITTED_WEBHOOK_RESPONSES;
+  user: {
+    email: string;
+    timeFormat: number | null;
+    locale: string;
+  };
+};
+
 export type ExtendedCalendarEvent = Omit<CalendarEvent, "bookerUrl"> & {
   metadata?: { videoCallUrl: string | undefined };
   eventType: {
@@ -36,18 +48,23 @@ export type ExtendedCalendarEvent = Omit<CalendarEvent, "bookerUrl"> & {
   bookerUrl: string;
 };
 
-type ProcessWorkflowStepParams = {
+type ProcessWorkflowStepParams = (
+  | { calendarEvent: ExtendedCalendarEvent; formData?: never }
+  | {
+      calendarEvent?: never;
+      formData: FormSubmissionData;
+    }
+) & {
   smsReminderNumber: string | null;
-  calendarEvent: ExtendedCalendarEvent;
   emailAttendeeSendToOverride?: string;
   hideBranding?: boolean;
   seatReferenceUid?: string;
 };
 
-export interface ScheduleWorkflowRemindersArgs extends ProcessWorkflowStepParams {
+export type ScheduleWorkflowRemindersArgs = ProcessWorkflowStepParams & {
   workflows: Workflow[];
   isDryRun?: boolean;
-}
+};
 
 const processWorkflowStep = async (
   workflow: Workflow,
@@ -58,11 +75,21 @@ const processWorkflowStep = async (
     emailAttendeeSendToOverride,
     hideBranding,
     seatReferenceUid,
+    formData,
   }: ProcessWorkflowStepParams
 ) => {
   if (!step?.verifiedAt) return;
 
-  const evt = formatCalEventExtended(calendarEvent);
+  const evt = calendarEvent ? formatCalEventExtended(calendarEvent) : undefined;
+
+  if (!evt && !formData) return;
+
+  const contextData:
+    | { evt: BookingInfo; formData?: never }
+    | {
+        evt?: never;
+        formData: FormSubmissionData;
+      } = evt ? { evt } : { formData: formData as FormSubmissionData };
 
   if (isSMSOrWhatsappAction(step.action)) {
     await checkSMSRateLimit({
@@ -71,26 +98,36 @@ const processWorkflowStep = async (
     });
   }
 
+  // Common parameters for all scheduling functions
+  const scheduleFunctionParams = {
+    triggerEvent: workflow.trigger,
+    timeSpan: {
+      time: workflow.time,
+      timeUnit: workflow.timeUnit,
+    },
+    workflowStepId: step.id,
+    template: step.template,
+    userId: workflow.userId,
+    teamId: workflow.teamId,
+    seatReferenceUid,
+    verifiedAt: step.verifiedAt,
+  };
+
   if (isSMSAction(step.action)) {
+    if (!evt) {
+      // SMS action not not yet supported for form triggers
+      return;
+    }
     const sendTo = step.action === WorkflowActions.SMS_ATTENDEE ? smsReminderNumber : step.sendTo;
+
     await scheduleSMSReminder({
-      evt,
+      ...scheduleFunctionParams,
       reminderPhone: sendTo,
-      triggerEvent: workflow.trigger,
       action: step.action as ScheduleTextReminderAction,
-      timeSpan: {
-        time: workflow.time,
-        timeUnit: workflow.timeUnit,
-      },
       message: step.reminderBody || "",
-      workflowStepId: step.id,
-      template: step.template,
       sender: step.sender,
-      userId: workflow.userId,
-      teamId: workflow.teamId,
       isVerificationPending: step.numberVerificationPending,
-      seatReferenceUid,
-      verifiedAt: step.verifiedAt,
+      evt,
     });
   } else if (
     step.action === WorkflowActions.EMAIL_ATTENDEE ||
@@ -103,7 +140,12 @@ const processWorkflowStep = async (
       case WorkflowActions.EMAIL_ADDRESS:
         sendTo = [step.sendTo || ""];
         break;
-      case WorkflowActions.EMAIL_HOST:
+      case WorkflowActions.EMAIL_HOST: {
+        if (!evt) {
+          // EMAIL_HOST is not supported for form triggers
+          return;
+        }
+
         sendTo = [evt.organizer?.email || ""];
 
         const schedulingType = evt.eventType.schedulingType;
@@ -113,74 +155,71 @@ const processWorkflowStep = async (
           sendTo = sendTo.concat(evt.team.members.map((member) => member.email));
         }
         break;
+      }
       case WorkflowActions.EMAIL_ATTENDEE:
-        const attendees = !!emailAttendeeSendToOverride
-          ? [emailAttendeeSendToOverride]
-          : evt.attendees?.map((attendee) => attendee.email);
-
-        const limitGuestsDate = new Date("2025-01-13");
-
-        if (workflow.userId) {
-          const user = await prisma.user.findUnique({
-            where: {
-              id: workflow.userId,
-            },
-            select: {
-              createdDate: true,
-            },
-          });
-          if (user?.createdDate && user.createdDate > limitGuestsDate) {
-            sendTo = attendees.slice(0, 1);
+        if (evt) {
+          const attendees = emailAttendeeSendToOverride
+            ? [emailAttendeeSendToOverride]
+            : evt.attendees?.map((attendee) => attendee.email);
+
+          const limitGuestsDate = new Date("2025-01-13");
+
+          if (workflow.userId) {
+            const userRepository = new UserRepository(prisma);
+            const user = await userRepository.findById({ id: workflow.userId });
+            if (user?.createdDate && user.createdDate > limitGuestsDate) {
+              sendTo = attendees.slice(0, 1);
+            } else {
+              sendTo = attendees;
+            }
           } else {
             sendTo = attendees;
           }
-        } else {
-          sendTo = attendees;
         }
 
-        break;
+        if (formData) {
+          const submitterEmail = getSubmitterEmail(formData.responses);
+          if (submitterEmail) {
+            sendTo = [submitterEmail];
+          }
+        }
     }
 
-    await scheduleEmailReminder({
-      evt,
-      triggerEvent: workflow.trigger,
+    const emailParams = {
+      ...scheduleFunctionParams,
       action: step.action,
-      timeSpan: {
-        time: workflow.time,
-        timeUnit: workflow.timeUnit,
-      },
       sendTo,
       emailSubject: step.emailSubject || "",
       emailBody: step.reminderBody || "",
-      template: step.template,
       sender: step.sender || SENDER_NAME,
-      workflowStepId: step.id,
       hideBranding,
-      seatReferenceUid,
       includeCalendarEvent: step.includeCalendarEvent,
+      ...contextData,
       verifiedAt: step.verifiedAt,
-    });
+    } as const;
+
+    await scheduleEmailReminder(emailParams);
   } else if (isWhatsappAction(step.action)) {
+    if (!evt) {
+      // Whatsapp action not not yet supported for form triggers
+      return;
+    }
+
     const sendTo = step.action === WorkflowActions.WHATSAPP_ATTENDEE ? smsReminderNumber : step.sendTo;
+
     await scheduleWhatsappReminder({
-      evt,
+      ...scheduleFunctionParams,
       reminderPhone: sendTo,
-      triggerEvent: workflow.trigger,
       action: step.action as ScheduleTextReminderAction,
-      timeSpan: {
-        time: workflow.time,
-        timeUnit: workflow.timeUnit,
-      },
       message: step.reminderBody || "",
-      workflowStepId: step.id,
-      template: step.template,
-      userId: workflow.userId,
-      teamId: workflow.teamId,
       isVerificationPending: step.numberVerificationPending,
-      seatReferenceUid,
-      verifiedAt: step.verifiedAt,
+      evt,
     });
   } else if (isCalAIAction(step.action)) {
+    if (!evt) {
+      // cal.ai not yet supported for form triggers
+      return;
+    }
     await scheduleAIPhoneCall({
       evt,
       triggerEvent: workflow.trigger,
@@ -206,6 +245,7 @@ const _scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersArgs) =
     hideBranding,
     seatReferenceUid,
     isDryRun = false,
+    formData,
   } = args;
   if (isDryRun || !workflows.length) return;
 
@@ -214,11 +254,11 @@ const _scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersArgs) =
 
     for (const step of workflow.steps) {
       await processWorkflowStep(workflow, step, {
-        calendarEvent: evt,
         emailAttendeeSendToOverride,
         smsReminderNumber,
         hideBranding,
         seatReferenceUid,
+        ...(evt ? { calendarEvent: evt } : { formData }),
       });
     }
   }
diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
index de1542a0c82556..6a037864f4477f 100644
--- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
@@ -76,7 +76,8 @@ export type ScheduleTextReminderAction = Extract<
   WorkflowActions,
   "SMS_ATTENDEE" | "SMS_NUMBER" | "WHATSAPP_ATTENDEE" | "WHATSAPP_NUMBER"
 >;
-export interface ScheduleTextReminderArgs extends ScheduleReminderArgs {
+
+export type ScheduleTextReminderArgs = ScheduleReminderArgs & {
   reminderPhone: string | null;
   message: string;
   action: ScheduleTextReminderAction;
@@ -85,9 +86,8 @@ export interface ScheduleTextReminderArgs extends ScheduleReminderArgs {
   isVerificationPending?: boolean;
   prisma?: PrismaClient;
   verifiedAt: Date | null;
-}
-
-export const scheduleSMSReminder = async (args: ScheduleTextReminderArgs) => {
+};
+export const scheduleSMSReminder = async (args: ScheduleTextReminderArgs & { evt: BookingInfo }) => {
   const {
     evt,
     reminderPhone,
diff --git a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts
index 644056dafa3e0c..ca1f8f72b3e7e1 100644
--- a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts
@@ -16,7 +16,7 @@ import {
   getContentVariablesForTemplate,
 } from "../reminders/templates/whatsapp/ContentSidMapping";
 import { scheduleSmsOrFallbackEmail, sendSmsOrFallbackEmail } from "./messageDispatcher";
-import type { ScheduleTextReminderArgs, timeUnitLowerCase } from "./smsReminderManager";
+import type { BookingInfo, ScheduleTextReminderArgs, timeUnitLowerCase } from "./smsReminderManager";
 import {
   whatsappEventCancelledTemplate,
   whatsappEventCompletedTemplate,
@@ -26,7 +26,7 @@ import {
 
 const log = logger.getSubLogger({ prefix: ["[whatsappReminderManager]"] });
 
-export const scheduleWhatsappReminder = async (args: ScheduleTextReminderArgs) => {
+export const scheduleWhatsappReminder = async (args: ScheduleTextReminderArgs & { evt: BookingInfo }) => {
   const {
     evt,
     reminderPhone,
diff --git a/packages/features/ee/workflows/lib/repository/workflowReminder.ts b/packages/features/ee/workflows/lib/repository/workflowReminder.ts
index e235d7084c2401..6f5d468c9ca4f1 100644
--- a/packages/features/ee/workflows/lib/repository/workflowReminder.ts
+++ b/packages/features/ee/workflows/lib/repository/workflowReminder.ts
@@ -31,4 +31,20 @@ export class WorkflowReminderRepository {
       },
     });
   }
+
+  static async findWorkflowRemindersByStepId(workflowStepId: number) {
+    return await prisma.workflowReminder.findMany({
+      where: { workflowStepId },
+      select: {
+        id: true,
+        referenceId: true,
+        method: true,
+        booking: {
+          select: {
+            eventTypeId: true,
+          },
+        },
+      },
+    });
+  }
 }
diff --git a/packages/features/ee/workflows/lib/service/WorkflowService.test.ts b/packages/features/ee/workflows/lib/service/WorkflowService.test.ts
new file mode 100644
index 00000000000000..04c6a03bd68bdb
--- /dev/null
+++ b/packages/features/ee/workflows/lib/service/WorkflowService.test.ts
@@ -0,0 +1,209 @@
+import { describe, expect, vi, beforeEach } from "vitest";
+
+import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
+import { tasker } from "@calcom/features/tasker";
+import { WorkflowTriggerEvents, WorkflowActions, WorkflowTemplates, TimeUnit } from "@calcom/prisma/enums";
+import { test } from "@calcom/web/test/fixtures/fixtures";
+
+import { WorkflowService } from "./WorkflowService";
+
+vi.mock("@calcom/features/ee/workflows/lib/reminders/reminderScheduler");
+vi.mock("@calcom/features/tasker");
+
+const mockScheduleWorkflowReminders = vi.mocked(scheduleWorkflowReminders);
+const mockTasker = vi.mocked(tasker);
+
+// Mock the getHideBranding function to return false
+vi.mock("@calcom/features/profile/lib/hideBranding", () => ({
+  getHideBranding: vi.fn().mockResolvedValue(false),
+}));
+
+describe("WorkflowService.scheduleFormWorkflows", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const mockForm = {
+    id: "form-123",
+    userId: 101,
+    teamId: null,
+    fields: [
+      { type: "email", identifier: "email" },
+      { type: "phone", identifier: "phone" },
+    ],
+    user: {
+      email: "formowner@example.com",
+      timeFormat: 12,
+      locale: "en",
+    },
+  };
+
+  const mockResponses = {
+    email: {
+      value: "submitter@example.com",
+      response: "submitter@example.com",
+    },
+    phone: {
+      value: "+1234567890",
+      response: "+1234567890",
+    },
+  };
+
+  test("should call scheduleWorkflowReminders for FORM_SUBMITTED triggers with correct phone number", async () => {
+    const workflows = [
+      {
+        id: 1,
+        name: "Form Submitted",
+        userId: 101,
+        teamId: null,
+        trigger: WorkflowTriggerEvents.FORM_SUBMITTED,
+        time: null,
+        timeUnit: null,
+        steps: [
+          {
+            id: 1,
+            action: WorkflowActions.SMS_ATTENDEE,
+            sendTo: null,
+            reminderBody: "Thank you!",
+            emailSubject: "Form Received",
+            template: WorkflowTemplates.CUSTOM,
+            verifiedAt: new Date(),
+            includeCalendarEvent: false,
+            numberVerificationPending: false,
+            numberRequired: false,
+          },
+        ],
+      },
+    ];
+
+    await WorkflowService.scheduleFormWorkflows({
+      workflows,
+      responses: mockResponses,
+      form: mockForm,
+    });
+
+    expect(mockScheduleWorkflowReminders).toHaveBeenCalledWith({
+      smsReminderNumber: "+1234567890",
+      formData: {
+        responses: mockResponses,
+        user: { email: "formowner@example.com", timeFormat: 12, locale: "en" },
+      },
+      hideBranding: false,
+      workflows: [workflows[0]],
+    });
+  });
+
+  test("should create task for FORM_SUBMITTED_NO_EVENT triggers", async () => {
+    const workflows = [
+      {
+        id: 2,
+        name: "Form Follow-up",
+        userId: 101,
+        teamId: null,
+        trigger: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
+        time: 30,
+        timeUnit: TimeUnit.MINUTE,
+        steps: [
+          {
+            id: 2,
+            action: WorkflowActions.EMAIL_ATTENDEE,
+            sendTo: null,
+            reminderBody: "Follow up message",
+            emailSubject: "Follow Up",
+            template: WorkflowTemplates.CUSTOM,
+            verifiedAt: new Date(),
+            includeCalendarEvent: false,
+            numberVerificationPending: false,
+            numberRequired: false,
+            sender: null,
+          },
+        ],
+      },
+    ];
+
+    mockTasker.create.mockResolvedValue({ id: "task-123" });
+
+    await WorkflowService.scheduleFormWorkflows({
+      workflows,
+      responses: mockResponses,
+      responseId: 123,
+      form: mockForm,
+    });
+
+    expect(mockTasker.create).toHaveBeenCalledWith(
+      "triggerFormSubmittedNoEventWorkflow",
+      {
+        responseId: 123,
+        responses: mockResponses,
+        smsReminderNumber: "+1234567890",
+        hideBranding: false,
+        submittedAt: expect.any(Date),
+        form: {
+          id: "form-123",
+          userId: 101,
+          teamId: undefined,
+          user: {
+            email: "formowner@example.com",
+            timeFormat: 12,
+            locale: "en",
+          },
+        },
+        workflow: workflows[0],
+      },
+      { scheduledAt: expect.any(Date) }
+    );
+  });
+
+  test("should handle forms without phone fields by passing null smsReminderNumber", async () => {
+    const formWithoutPhone = {
+      ...mockForm,
+      fields: [
+        { type: "email", identifier: "email" },
+        { type: "text", identifier: "name" },
+      ],
+    };
+
+    const workflows = [
+      {
+        id: 1,
+        name: "Form Submitted",
+        userId: 101,
+        teamId: null,
+        trigger: WorkflowTriggerEvents.FORM_SUBMITTED,
+        time: null,
+        timeUnit: null,
+        steps: [
+          {
+            id: 1,
+            action: WorkflowActions.EMAIL_ATTENDEE,
+            sendTo: null,
+            reminderBody: "Thank you!",
+            emailSubject: "Form Received",
+            template: WorkflowTemplates.CUSTOM,
+            verifiedAt: new Date(),
+            includeCalendarEvent: false,
+            numberVerificationPending: false,
+            numberRequired: false,
+            sender: null,
+          },
+        ],
+      },
+    ];
+
+    await WorkflowService.scheduleFormWorkflows({
+      workflows,
+      responses: mockResponses,
+      form: formWithoutPhone,
+    });
+
+    expect(mockScheduleWorkflowReminders).toHaveBeenCalledWith({
+      smsReminderNumber: null,
+      formData: {
+        responses: mockResponses,
+        user: { email: "formowner@example.com", timeFormat: 12, locale: "en" },
+      },
+      hideBranding: false,
+      workflows: [workflows[0]],
+    });
+  });
+});
diff --git a/packages/features/ee/workflows/lib/service/WorkflowService.ts b/packages/features/ee/workflows/lib/service/WorkflowService.ts
new file mode 100644
index 00000000000000..c57529e9078ea3
--- /dev/null
+++ b/packages/features/ee/workflows/lib/service/WorkflowService.ts
@@ -0,0 +1,234 @@
+import dayjs from "@calcom/dayjs";
+import { getAllWorkflows } from "@calcom/ee/workflows/lib/getAllWorkflows";
+import type { ScheduleWorkflowRemindersArgs } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
+import { scheduleWorkflowReminders } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
+import type { timeUnitLowerCase } from "@calcom/ee/workflows/lib/reminders/smsReminderManager";
+import type { Workflow } from "@calcom/ee/workflows/lib/types";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
+import { getHideBranding } from "@calcom/features/profile/lib/hideBranding";
+import { tasker } from "@calcom/features/tasker";
+import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
+import { prisma } from "@calcom/prisma";
+import { WorkflowTriggerEvents, WorkflowType } from "@calcom/prisma/enums";
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/routing-forms/lib/formSubmissionUtils";
+
+// TODO (Sean): Move most of the logic migrated in 16861 to this service
+export class WorkflowService {
+  static _beforeAfterEventTriggers: WorkflowTriggerEvents[] = [
+    WorkflowTriggerEvents.AFTER_EVENT,
+    WorkflowTriggerEvents.BEFORE_EVENT,
+  ];
+
+  static async getAllWorkflowsFromRoutingForm(routingForm: {
+    id: string;
+    userId: number | null;
+    teamId: number | null;
+  }) {
+    const routingFormWorkflows = await WorkflowRepository.findWorkflowsActiveOnRoutingForm({
+      routingFormId: routingForm.id,
+    });
+
+    const teamId = routingForm.teamId;
+    const userId = routingForm.userId;
+    const orgId = await getOrgIdFromMemberOrTeamId({ memberId: userId, teamId });
+
+    const allWorkflows = await getAllWorkflows({
+      entityWorkflows: routingFormWorkflows,
+      userId,
+      teamId,
+      orgId,
+      workflowsLockedForUser: false,
+      type: WorkflowType.ROUTING_FORM,
+    });
+
+    return allWorkflows;
+  }
+
+  static async deleteWorkflowRemindersOfRemovedTeam(teamId: number) {
+    const teamRepository = new TeamRepository(prisma);
+    const team = await teamRepository.findById({ id: teamId });
+
+    if (team?.parentId) {
+      const activeWorkflowsOnTeam = await WorkflowRepository.findActiveWorkflowsOnTeam({
+        parentTeamId: team.parentId,
+        teamId: team.id,
+      });
+
+      for (const workflow of activeWorkflowsOnTeam) {
+        const workflowSteps = workflow.steps;
+        let remainingActiveOnIds = [];
+
+        if (workflow.isActiveOnAll) {
+          const teamRepository = new TeamRepository(prisma);
+          const allRemainingOrgTeams = await teamRepository.findOrgTeamsExcludingTeam({
+            parentId: team.parentId,
+            excludeTeamId: team.id,
+          });
+          remainingActiveOnIds = allRemainingOrgTeams.map((team) => team.id);
+        } else {
+          remainingActiveOnIds = workflow.activeOnTeams
+            .filter((activeOn) => activeOn.teamId !== team.id)
+            .map((activeOn) => activeOn.teamId);
+        }
+        const remindersToDelete = await WorkflowRepository.getRemindersFromRemovedTeams(
+          [team.id],
+          workflowSteps,
+          remainingActiveOnIds
+        );
+        await WorkflowRepository.deleteAllWorkflowReminders(remindersToDelete);
+      }
+    }
+  }
+
+  static async scheduleFormWorkflows({
+    workflows,
+    responses,
+    form,
+    responseId,
+  }: {
+    responseId: number;
+    workflows: Workflow[];
+    responses: FORM_SUBMITTED_WEBHOOK_RESPONSES;
+    form: {
+      id: string;
+      userId: number;
+      teamId?: number | null;
+      fields?: { type: string; identifier?: string }[];
+      user: {
+        email: string;
+        timeFormat: number | null;
+        locale: string | null;
+      };
+    };
+  }) {
+    if (workflows.length <= 0) return;
+
+    const workflowsToTrigger: Workflow[] = [];
+
+    workflowsToTrigger.push(
+      ...workflows.filter((workflow) => workflow.trigger === WorkflowTriggerEvents.FORM_SUBMITTED)
+    );
+
+    let smsReminderNumber: string | null = null;
+    if (form.fields) {
+      const phoneField = form.fields.find((field) => field.type === "phone");
+      if (phoneField && phoneField.identifier) {
+        const phoneResponse = responses[phoneField.identifier];
+        if (phoneResponse?.response && typeof phoneResponse.response === "string") {
+          smsReminderNumber = phoneResponse.response as string;
+        }
+      }
+    }
+
+    const hideBranding = await getHideBranding({
+      userId: form.userId,
+      teamId: form.teamId ?? undefined,
+    });
+
+    await scheduleWorkflowReminders({
+      smsReminderNumber,
+      formData: {
+        responses,
+        user: { email: form.user.email, timeFormat: form.user.timeFormat, locale: form.user.locale ?? "en" },
+      },
+      hideBranding,
+      workflows: workflowsToTrigger,
+    });
+
+    const workflowsToSchedule: Workflow[] = [];
+
+    workflowsToSchedule.push(
+      ...workflows.filter((workflow) => workflow.trigger === WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT)
+    );
+
+    const promisesFormSubmittedNoEvent = workflowsToSchedule.map((workflow) => {
+      const timeUnit: timeUnitLowerCase = (workflow.timeUnit?.toLowerCase() as timeUnitLowerCase) ?? "minute";
+
+      const scheduledAt = dayjs()
+        .add(workflow.time ?? 15, timeUnit)
+        .toDate();
+
+      return tasker.create(
+        "triggerFormSubmittedNoEventWorkflow",
+        {
+          responseId,
+          responses,
+          smsReminderNumber,
+          hideBranding,
+          form: {
+            id: form.id,
+            userId: form.userId,
+            teamId: form.teamId ?? undefined,
+            user: {
+              email: form.user.email,
+              timeFormat: form.user.timeFormat,
+              locale: form.user.locale ?? "en",
+            },
+          },
+          workflow,
+          submittedAt: new Date(),
+        },
+        { scheduledAt }
+      );
+    });
+    await Promise.all(promisesFormSubmittedNoEvent);
+  }
+
+  static async scheduleWorkflowsForNewBooking({
+    isNormalBookingOrFirstRecurringSlot,
+    isConfirmedByDefault,
+    isRescheduleEvent,
+    workflows,
+    ...args
+  }: ScheduleWorkflowRemindersArgs & {
+    isConfirmedByDefault: boolean;
+    isRescheduleEvent: boolean;
+    isNormalBookingOrFirstRecurringSlot: boolean;
+  }) {
+    if (workflows.length <= 0) return;
+
+    const workflowsToTrigger: Workflow[] = [];
+
+    if (isRescheduleEvent) {
+      workflowsToTrigger.push(
+        ...workflows.filter(
+          (workflow) =>
+            workflow.trigger === WorkflowTriggerEvents.RESCHEDULE_EVENT ||
+            this._beforeAfterEventTriggers.includes(workflow.trigger)
+        )
+      );
+    } else if (!isConfirmedByDefault) {
+      workflowsToTrigger.push(
+        ...workflows.filter((workflow) => workflow.trigger === WorkflowTriggerEvents.BOOKING_REQUESTED)
+      );
+    } else if (isConfirmedByDefault) {
+      workflowsToTrigger.push(
+        ...workflows.filter(
+          (workflow) =>
+            this._beforeAfterEventTriggers.includes(workflow.trigger) ||
+            (isNormalBookingOrFirstRecurringSlot && workflow.trigger === WorkflowTriggerEvents.NEW_EVENT)
+        )
+      );
+    }
+
+    if (workflowsToTrigger.length === 0) return;
+
+    await scheduleWorkflowReminders({
+      ...args,
+      workflows: workflowsToTrigger,
+    });
+  }
+
+  static async scheduleWorkflowsFilteredByTriggerEvent({
+    workflows,
+    triggers,
+    ...args
+  }: ScheduleWorkflowRemindersArgs & { triggers: WorkflowTriggerEvents[] }) {
+    if (workflows.length <= 0) return;
+    await scheduleWorkflowReminders({
+      ...args,
+      workflows: workflows.filter((workflow) => triggers.includes(workflow.trigger)),
+    });
+  }
+}
diff --git a/packages/features/ee/workflows/pages/index.tsx b/packages/features/ee/workflows/pages/index.tsx
index a18ca7a098ee9d..fceaf53303d211 100644
--- a/packages/features/ee/workflows/pages/index.tsx
+++ b/packages/features/ee/workflows/pages/index.tsx
@@ -10,7 +10,7 @@ import Shell, { ShellMain } from "@calcom/features/shell/Shell";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
-import type { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import type { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { trpc } from "@calcom/trpc/react";
 import classNames from "@calcom/ui/classNames";
 import { Avatar } from "@calcom/ui/components/avatar";
diff --git a/packages/features/ee/workflows/pages/workflow.tsx b/packages/features/ee/workflows/pages/workflow.tsx
index 1b6d64fb643639..9293f2411cb017 100644
--- a/packages/features/ee/workflows/pages/workflow.tsx
+++ b/packages/features/ee/workflows/pages/workflow.tsx
@@ -4,13 +4,13 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useSession } from "next-auth/react";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
+import { useForm, useWatch } from "react-hook-form";
 import { Toaster } from "sonner";
 
 import { SENDER_ID } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { HttpError } from "@calcom/lib/http-error";
-import type { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import type { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import type { WorkflowPermissions } from "@calcom/lib/server/repository/workflow-permissions";
 import type { WorkflowStep } from "@calcom/prisma/client";
 import type { TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums";
@@ -31,7 +31,12 @@ import LicenseRequired from "../../common/components/LicenseRequired";
 import { DeleteDialog } from "../components/DeleteDialog";
 import SkeletonLoader from "../components/SkeletonLoaderEdit";
 import WorkflowDetailsPage from "../components/WorkflowDetailsPage";
-import { isSMSAction, isSMSOrWhatsappAction, isCalAIAction } from "../lib/actionHelperFunctions";
+import {
+  isSMSAction,
+  isSMSOrWhatsappAction,
+  isCalAIAction,
+  isFormTrigger,
+} from "../lib/actionHelperFunctions";
 import { formSchema } from "../lib/schema";
 import { getTranslatedText, translateVariablesToEnglish } from "../lib/variableTranslations";
 
@@ -80,6 +85,11 @@ function WorkflowPage({
 
   const utils = trpc.useUtils();
 
+  const watchedTrigger = useWatch({
+    control: form.control,
+    name: "trigger",
+  });
+
   const userQuery = useMeQuery();
   const user = userQuery.data;
 
@@ -119,12 +129,13 @@ function WorkflowPage({
 
   const teamId = workflow?.teamId ?? undefined;
 
-  const { data, isPending: isPendingEventTypes } = trpc.viewer.eventTypes.getTeamAndEventTypeOptions.useQuery(
+  const { data, isPending: isPendingEventTypes } = trpc.viewer.eventTypes.getActiveOnOptions.useQuery(
     { teamId, isOrg },
     { enabled: !isPendingWorkflow }
   );
 
   const teamOptions = data?.teamOptions ?? [];
+  const routingFormOptions = data?.routingFormOptions ?? [];
 
   let allEventTypeOptions = data?.eventTypeOptions ?? [];
   const distinctEventTypes = new Set();
@@ -223,7 +234,11 @@ function WorkflowPage({
       let activeOn;
 
       if (workflowData.isActiveOnAll) {
-        activeOn = isOrg ? teamOptions : allEventTypeOptions;
+        activeOn = isOrg
+          ? teamOptions
+          : isFormTrigger(workflowData.trigger)
+          ? routingFormOptions
+          : allEventTypeOptions;
       } else {
         if (isOrg) {
           activeOn = workflowData.activeOnTeams.flatMap((active) => {
@@ -233,6 +248,14 @@ function WorkflowPage({
             };
           });
           setSelectedOptions(activeOn || []);
+        } else if (isFormTrigger(workflowData.trigger)) {
+          activeOn = workflowData.activeOnRoutingForms?.flatMap((active) => {
+            return {
+              value: String(active.routingForm.id) || "",
+              label: active.routingForm.name || "",
+            };
+          });
+          setSelectedOptions(activeOn || []);
         } else {
           setSelectedOptions(
             workflowData.activeOn?.flatMap((active) => {
@@ -309,7 +332,6 @@ function WorkflowPage({
   });
 
   const validateAndSubmitWorkflow = async (values: FormValues): Promise<void> => {
-    let activeOnIds: number[] = [];
     let isEmpty = false;
     let isVerified = true;
 
@@ -367,18 +389,26 @@ function WorkflowPage({
     });
 
     if (!isEmpty && isVerified) {
-      if (values.activeOn) {
-        activeOnIds = values.activeOn
+      let activeOnEventTypeOrTeamIds: number[] = [];
+      let activeOnRoutingFormIds: string[] = [];
+      if (isOrg || !isFormTrigger(values.trigger)) {
+        activeOnEventTypeOrTeamIds = values.activeOn
           .filter((option) => option.value !== "all")
           .map((option) => {
             return parseInt(option.value, 10);
           });
+      } else {
+        // Form triggers, activeOn contains routing form IDs (strings)
+        activeOnRoutingFormIds = values.activeOn
+          .filter((option) => option.value !== "all")
+          .map((option) => option.value);
       }
 
       await updateMutation.mutateAsync({
         id: workflowId,
         name: values.name,
-        activeOn: activeOnIds,
+        activeOnEventTypeIds: activeOnEventTypeOrTeamIds,
+        activeOnRoutingFormIds,
         steps: values.steps,
         trigger: values.trigger,
         time: values.time || null,
@@ -497,7 +527,7 @@ function WorkflowPage({
             </div>
           </div>
           <div className="bg-default min-h-screen w-full px-2 sm:p-0">
-            <div className="mx-auto my-8 max-w-4xl ">
+            <div className="mx-auto my-8 max-w-4xl">
               {!isError ? (
                 <>
                   {isAllDataLoaded && user ? (
@@ -510,7 +540,13 @@ function WorkflowPage({
                         setSelectedOptions={setSelectedOptions}
                         teamId={workflow ? workflow.teamId || undefined : undefined}
                         isOrg={isOrg}
-                        allOptions={isOrg ? teamOptions : allEventTypeOptions}
+                        allOptions={
+                          isOrg
+                            ? teamOptions
+                            : isFormTrigger(watchedTrigger)
+                            ? routingFormOptions
+                            : allEventTypeOptions
+                        }
                         onSaveWorkflow={handleSaveWorkflow}
                         permissions={permissions}
                       />
diff --git a/packages/lib/server/repository/workflow.test.ts b/packages/features/ee/workflows/repositories/WorkflowRepository.test.ts
similarity index 94%
rename from packages/lib/server/repository/workflow.test.ts
rename to packages/features/ee/workflows/repositories/WorkflowRepository.test.ts
index 1d7ae2af1a1c1c..a7ca7679e655a5 100644
--- a/packages/lib/server/repository/workflow.test.ts
+++ b/packages/features/ee/workflows/repositories/WorkflowRepository.test.ts
@@ -1,9 +1,9 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
+import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";
 
 import { describe, it, expect } from "vitest";
 
-import { WorkflowRepository } from "./workflow";
+import { WorkflowRepository } from "./WorkflowRepository";
 
 describe("WorkflowRepository", () => {
   describe("getVerifiedEmails", () => {
diff --git a/packages/lib/server/repository/workflow.ts b/packages/features/ee/workflows/repositories/WorkflowRepository.ts
similarity index 57%
rename from packages/lib/server/repository/workflow.ts
rename to packages/features/ee/workflows/repositories/WorkflowRepository.ts
index 00f2c9fdf85262..9c199120002917 100644
--- a/packages/lib/server/repository/workflow.ts
+++ b/packages/features/ee/workflows/repositories/WorkflowRepository.ts
@@ -1,26 +1,46 @@
 import { z } from "zod";
 
 import type { WorkflowType } from "@calcom/ee/workflows/components/WorkflowListPage";
+import { FORM_TRIGGER_WORKFLOW_EVENTS } from "@calcom/ee/workflows/lib/constants";
 import { deleteScheduledAIPhoneCall } from "@calcom/ee/workflows/lib/reminders/aiPhoneCallManager";
 import { deleteScheduledEmailReminder } from "@calcom/ee/workflows/lib/reminders/emailReminderManager";
 import { deleteScheduledSMSReminder } from "@calcom/ee/workflows/lib/reminders/smsReminderManager";
 import type { WorkflowStep } from "@calcom/ee/workflows/lib/types";
 import { hasFilter } from "@calcom/features/filters/lib/hasFilter";
 import { HttpError } from "@calcom/lib/http-error";
+import logger from "@calcom/lib/logger";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
-import { MembershipRole } from "@calcom/prisma/enums";
+import {
+  MembershipRole,
+  TimeUnit,
+  WorkflowTriggerEvents,
+  WorkflowType as PrismaWorkflowType,
+} from "@calcom/prisma/enums";
 import { WorkflowMethods } from "@calcom/prisma/enums";
 import type { TFilteredListInputSchema } from "@calcom/trpc/server/routers/viewer/workflows/filteredList.schema";
 import type { TGetVerifiedEmailsInputSchema } from "@calcom/trpc/server/routers/viewer/workflows/getVerifiedEmails.schema";
 import type { TGetVerifiedNumbersInputSchema } from "@calcom/trpc/server/routers/viewer/workflows/getVerifiedNumbers.schema";
 
-import logger from "../../logger";
-
 export const ZGetInputSchema = z.object({
   id: z.number(),
 });
 
+const excludeFormTriggersWhereClause = {
+  trigger: {
+    not: {
+      in: FORM_TRIGGER_WORKFLOW_EVENTS,
+    },
+  },
+};
+
+const getWorkflowType = (trigger: WorkflowTriggerEvents): PrismaWorkflowType => {
+  if (FORM_TRIGGER_WORKFLOW_EVENTS.includes(trigger)) {
+    return PrismaWorkflowType.ROUTING_FORM;
+  }
+  return PrismaWorkflowType.EVENT_TYPE;
+};
+
 export type TGetInputSchema = z.infer<typeof ZGetInputSchema>;
 
 const deleteScheduledWhatsappReminder = deleteScheduledSMSReminder;
@@ -100,6 +120,16 @@ export class WorkflowRepository {
             team: true,
           },
         },
+        activeOnRoutingForms: {
+          select: {
+            routingForm: {
+              select: {
+                id: true,
+                name: true,
+              },
+            },
+          },
+        },
         trigger: true,
         steps: {
           orderBy: {
@@ -261,7 +291,7 @@ export class WorkflowRepository {
     };
 
     if (filtered) {
-      if (!!filters.teamIds) {
+      if (filters.teamIds) {
         where.OR.push({
           team: {
             id: {
@@ -277,7 +307,7 @@ export class WorkflowRepository {
         });
       }
 
-      if (!!filters.userIds) {
+      if (filters.userIds) {
         where.OR.push({
           userId: {
             in: filters.userIds,
@@ -430,7 +460,7 @@ export class WorkflowRepository {
     const reminderMethods: {
       [x: string]: (id: number, referenceId: string | null) => void;
     } = {
-      [WorkflowMethods.EMAIL]: (id, referenceId) => deleteScheduledEmailReminder(id),
+      [WorkflowMethods.EMAIL]: (id) => deleteScheduledEmailReminder(id),
       [WorkflowMethods.SMS]: (id, referenceId) => deleteScheduledSMSReminder(id, referenceId),
       [WorkflowMethods.WHATSAPP]: (id, referenceId) => deleteScheduledWhatsappReminder(id, referenceId),
       [WorkflowMethods.AI_PHONE_CALL]: (id, referenceId) => deleteScheduledAIPhoneCall(id, referenceId),
@@ -453,4 +483,378 @@ export class WorkflowRepository {
       }
     });
   }
+
+  static async findUniqueForUpdate(id: number) {
+    return await prisma.workflow.findUnique({
+      where: { id },
+      select: {
+        id: true,
+        userId: true,
+        isActiveOnAll: true,
+        trigger: true,
+        time: true,
+        timeUnit: true,
+        team: {
+          select: {
+            isOrganization: true,
+          },
+        },
+        teamId: true,
+        user: {
+          select: {
+            teams: true,
+          },
+        },
+        steps: true,
+        activeOn: true,
+        activeOnTeams: true,
+        activeOnRoutingForms: true,
+      },
+    });
+  }
+
+  static async updateWorkflow(
+    id: number,
+    data: {
+      name: string;
+      trigger: WorkflowTriggerEvents;
+      time: number | null;
+      timeUnit: TimeUnit | null;
+      isActiveOnAll?: boolean;
+    }
+  ) {
+    const type = getWorkflowType(data.trigger);
+    return await prisma.workflow.update({
+      where: { id },
+      data: {
+        ...data,
+        type,
+      },
+    });
+  }
+
+  static async findUniqueWithRelations(id: number) {
+    return await prisma.workflow.findUnique({
+      where: { id },
+      include: {
+        activeOn: {
+          select: {
+            eventType: true,
+          },
+        },
+        activeOnTeams: {
+          select: {
+            team: true,
+          },
+        },
+        activeOnRoutingForms: {
+          select: {
+            routingForm: {
+              select: {
+                id: true,
+                name: true,
+              },
+            },
+          },
+        },
+        team: {
+          select: {
+            id: true,
+            slug: true,
+            members: true,
+            name: true,
+            isOrganization: true,
+          },
+        },
+        steps: {
+          orderBy: {
+            stepNumber: "asc",
+          },
+        },
+      },
+    });
+  }
+
+  static async findActiveOrgWorkflows({
+    orgId,
+    userId,
+    teamId,
+    excludeFormTriggers,
+  }: {
+    orgId: number;
+    userId: number;
+    teamId: number;
+    excludeFormTriggers: boolean;
+  }) {
+    return await prisma.workflow.findMany({
+      where: {
+        ...(excludeFormTriggers ? excludeFormTriggersWhereClause : {}),
+        team: {
+          id: orgId,
+          members: {
+            some: {
+              userId,
+              accepted: true,
+            },
+          },
+        },
+        OR: [
+          {
+            isActiveOnAll: true,
+          },
+          {
+            activeOnTeams: {
+              some: {
+                team: {
+                  OR: [
+                    { id: teamId },
+                    {
+                      members: {
+                        some: {
+                          userId,
+                          accepted: true,
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        ],
+      },
+      include: {
+        team: {
+          select: {
+            id: true,
+            slug: true,
+            name: true,
+            members: true,
+          },
+        },
+        activeOnTeams: {
+          select: {
+            team: {
+              select: {
+                id: true,
+                name: true,
+              },
+            },
+          },
+        },
+        steps: true,
+      },
+    });
+  }
+
+  static async findTeamWorkflows({
+    teamId,
+    userId,
+    excludeFormTriggers,
+  }: {
+    teamId: number;
+    userId: number;
+    excludeFormTriggers: boolean;
+  }) {
+    return await prisma.workflow.findMany({
+      where: {
+        ...(excludeFormTriggers ? excludeFormTriggersWhereClause : {}),
+        team: {
+          id: teamId,
+          members: {
+            some: {
+              userId,
+              accepted: true,
+            },
+          },
+        },
+      },
+      include: {
+        team: {
+          select: {
+            id: true,
+            slug: true,
+            name: true,
+            members: true,
+          },
+        },
+        activeOn: {
+          select: {
+            eventType: {
+              select: {
+                id: true,
+                title: true,
+                parentId: true,
+                _count: {
+                  select: {
+                    children: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        steps: true,
+      },
+      orderBy: {
+        id: "asc",
+      },
+    });
+  }
+
+  static async findUserWorkflows({
+    userId,
+    excludeFormTriggers,
+  }: {
+    userId: number;
+    excludeFormTriggers: boolean;
+  }) {
+    return await prisma.workflow.findMany({
+      where: {
+        ...(excludeFormTriggers ? excludeFormTriggersWhereClause : {}),
+        userId,
+      },
+      include: {
+        activeOn: {
+          select: {
+            eventType: {
+              select: {
+                id: true,
+                title: true,
+                parentId: true,
+                _count: {
+                  select: {
+                    children: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        steps: true,
+        team: {
+          select: {
+            id: true,
+            slug: true,
+            name: true,
+            members: true,
+          },
+        },
+      },
+      orderBy: {
+        id: "asc",
+      },
+    });
+  }
+
+  static async findAllWorkflows({
+    userId,
+    excludeFormTriggers,
+  }: {
+    userId: number;
+    excludeFormTriggers: boolean;
+  }) {
+    return await prisma.workflow.findMany({
+      where: {
+        ...(excludeFormTriggers ? excludeFormTriggersWhereClause : {}),
+        OR: [
+          { userId },
+          {
+            team: {
+              members: {
+                some: {
+                  userId,
+                  accepted: true,
+                },
+              },
+            },
+          },
+        ],
+      },
+      include: {
+        activeOn: {
+          select: {
+            eventType: {
+              select: {
+                id: true,
+                title: true,
+                parentId: true,
+                _count: {
+                  select: {
+                    children: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        steps: true,
+        team: {
+          select: {
+            id: true,
+            slug: true,
+            name: true,
+            members: true,
+          },
+        },
+      },
+      orderBy: {
+        id: "asc",
+      },
+    });
+  }
+
+  static async findWorkflowsActiveOnRoutingForm({ routingFormId }: { routingFormId: string }) {
+    return await prisma.workflow.findMany({
+      where: {
+        activeOnRoutingForms: {
+          some: {
+            routingFormId,
+          },
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+        trigger: true,
+        time: true,
+        timeUnit: true,
+        userId: true,
+        teamId: true,
+        steps: true,
+        team: {
+          select: {
+            id: true,
+            name: true,
+            slug: true,
+          },
+        },
+      },
+    });
+  }
+
+  static async findActiveWorkflowsOnTeam({ parentTeamId, teamId }: { parentTeamId: number; teamId: number }) {
+    return await prisma.workflow.findMany({
+      where: {
+        teamId: parentTeamId,
+        OR: [
+          {
+            activeOnTeams: {
+              some: {
+                teamId: teamId,
+              },
+            },
+          },
+          {
+            isActiveOnAll: true,
+          },
+        ],
+      },
+      select: {
+        steps: true,
+        activeOnTeams: true,
+        isActiveOnAll: true,
+      },
+    });
+  }
 }
diff --git a/packages/features/embed/lib/EmbedTabs.tsx b/packages/features/embed/lib/EmbedTabs.tsx
index 6bda5cf3fb573f..147d37cd194dfa 100644
--- a/packages/features/embed/lib/EmbedTabs.tsx
+++ b/packages/features/embed/lib/EmbedTabs.tsx
@@ -2,8 +2,8 @@ import type { MutableRefObject } from "react";
 import { forwardRef } from "react";
 
 import type { BookerLayout } from "@calcom/features/bookings/Booker/types";
+import { useEmbedBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl";
 import { APP_NAME } from "@calcom/lib/constants";
-import { useEmbedBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { TextArea } from "@calcom/ui/components/form";
 
diff --git a/packages/features/embed/lib/hooks/index.tsx b/packages/features/embed/lib/hooks/index.tsx
index 1ac426ed72a8a4..d8a31453625ed0 100644
--- a/packages/features/embed/lib/hooks/index.tsx
+++ b/packages/features/embed/lib/hooks/index.tsx
@@ -1,4 +1,4 @@
-import { useEmbedBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
+import { useEmbedBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
 export const useEmbedTypes = () => {
diff --git a/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx b/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
index 60944219b9f985..2feb8a33fec628 100644
--- a/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
+++ b/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
@@ -2,7 +2,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import type { Props } from "react-select";
 
 import type { SelectClassNames } from "@calcom/features/eventtypes/lib/types";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { UserProfile } from "@calcom/types/UserProfile";
diff --git a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
index cae2fc70af6c45..ad9ba941cd0463 100644
--- a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
+++ b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
@@ -5,7 +5,7 @@ import { z } from "zod";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
 import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
-import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";
+import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
 import type { EventType } from "@calcom/prisma/client";
diff --git a/packages/features/eventtypes/components/CreateEventTypeForm.tsx b/packages/features/eventtypes/components/CreateEventTypeForm.tsx
index 01070f280a1211..c780117e0faefb 100644
--- a/packages/features/eventtypes/components/CreateEventTypeForm.tsx
+++ b/packages/features/eventtypes/components/CreateEventTypeForm.tsx
@@ -4,7 +4,7 @@ import type { UseFormReturn } from "react-hook-form";
 
 import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
 import { MAX_EVENT_DURATION_MINUTES, MIN_EVENT_DURATION_MINUTES } from "@calcom/lib/constants";
-import type { CreateEventTypeFormValues } from "@calcom/lib/hooks/useCreateEventType";
+import type { CreateEventTypeFormValues } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { md } from "@calcom/lib/markdownIt";
 import slugify from "@calcom/lib/slugify";
diff --git a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
index c9d0da8dad7a3c..8d6ee1cb7dead1 100644
--- a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
+++ b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
@@ -6,7 +6,7 @@ import type { EventTypeAppCardComponentProps } from "@calcom/app-store/types";
 import type { EventTypeAppsList } from "@calcom/app-store/utils";
 import useAppsData from "@calcom/features/apps/hooks/useAppsData";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
-import type { FormValues, EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
+import type { FormValues, EventTypeSetupProps, EventTypeApps } from "@calcom/features/eventtypes/lib/types";
 import ServerTrans from "@calcom/lib/components/ServerTrans";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
@@ -18,12 +18,16 @@ import { Section } from "@calcom/ui/components/section";
 export type EventType = Pick<EventTypeSetupProps, "eventType">["eventType"] &
   EventTypeAppCardComponentProps["eventType"];
 
-export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
+export const EventAppsTab = ({
+  eventType,
+  eventTypeApps,
+  isPendingApps,
+}: {
+  eventType: EventType;
+  eventTypeApps?: EventTypeApps;
+  isPendingApps: boolean;
+}) => {
   const { t } = useLocale();
-  const { data: eventTypeApps, isPending } = trpc.viewer.apps.integrations.useQuery({
-    extendsFeature: "EventType",
-    teamId: eventType.team?.id || eventType.parent?.teamId,
-  });
 
   const utils = trpc.useUtils();
 
@@ -126,7 +130,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
               }
             />
           )}
-          {!isPending && !installedApps?.length ? (
+          {!isPendingApps && !installedApps?.length ? (
             <EmptyScreen
               Icon="grid-3x3"
               headline={t("empty_installed_apps_headline")}
@@ -168,7 +172,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
       {/* TODO: Add back after salesforce v3 dev */}
       {!appsDisableProps.disabled && (
         <div className="bg-muted mt-4 rounded-2xl p-4">
-          {!isPending && notInstalledApps?.length ? (
+          {!isPendingApps && notInstalledApps?.length ? (
             <div className="mb-4 flex flex-col">
               <Section.Title>{t("available_apps_lower_case")}</Section.Title>
               <Section.Description>
diff --git a/packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx b/packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
index 03caeb927afaed..6912585ba3cb52 100644
--- a/packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
+++ b/packages/features/eventtypes/components/tabs/limits/MaxActiveBookingsPerBookerController.tsx
@@ -47,7 +47,7 @@ export default function MaxActiveBookingsPerBookerController({
               isChecked && "rounded-b-none"
             )}
             childrenClassName={classNames("lg:ml-0")}
-            title={t("booker_booking_limit")}
+            title={t("booker_upcoming_limit")}
             description={t("booker_booking_limit_description")}
             checked={isChecked}
             onCheckedChange={(active) => {
@@ -76,7 +76,7 @@ export default function MaxActiveBookingsPerBookerController({
               <CheckboxField
                 checked={!!maxActiveBookingPerBookerOfferReschedule}
                 descriptionAsLabel
-                description={t("offer_to_reschedule_last_booking")}
+                description={t("reschedule_last_booking_offer")}
                 disabled={maxActiveBookingsPerBookerLocked.disabled}
                 onChange={(e) => {
                   formMethods.setValue("maxActiveBookingPerBookerOfferReschedule", e.target.checked, {
diff --git a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx b/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
index 0cae9b1b9ad7ea..12591e8ac074a9 100644
--- a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
+++ b/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
@@ -100,14 +100,14 @@ const WorkflowListItem = (props: ItemProps) => {
 
   return (
     <div className="border-subtle w-full overflow-hidden rounded-md border p-6 px-3 md:p-6">
-      <div className="flex items-center ">
+      <div className="flex items-center">
         <div className="bg-subtle mr-4 flex h-10 w-10 items-center justify-center rounded-full text-xs font-medium">
           {getActionIcon(
             workflow.steps,
             isActive ? "h-6 w-6 stroke-[1.5px] text-default" : "h-6 w-6 stroke-[1.5px] text-muted"
           )}
         </div>
-        <div className=" grow">
+        <div className="grow">
           <div
             className={classNames(
               "text-emphasis mb-1 w-full truncate text-base font-medium leading-4 md:max-w-max",
@@ -122,7 +122,7 @@ const WorkflowListItem = (props: ItemProps) => {
           <>
             <div
               className={classNames(
-                " flex w-fit items-center whitespace-nowrap rounded-sm text-sm leading-4",
+                "flex w-fit items-center whitespace-nowrap rounded-sm text-sm leading-4",
                 isActive ? "text-default" : "text-muted"
               )}>
               <span className="mr-1">{t("to")}:</span>
@@ -191,6 +191,7 @@ function EventWorkflowsTab(props: Props) {
   const { data, isPending } = trpc.viewer.workflows.list.useQuery({
     teamId: eventType.team?.id,
     userId: !isChildrenManagedEventType ? eventType.userId || undefined : undefined,
+    includeOnlyEventTypeWorkflows: true,
   });
   const router = useRouter();
   const [sortedWorkflows, setSortedWorkflows] = useState<Array<WorkflowType>>([]);
diff --git a/packages/lib/hooks/useCreateEventType.ts b/packages/features/eventtypes/hooks/useCreateEventType.ts
similarity index 100%
rename from packages/lib/hooks/useCreateEventType.ts
rename to packages/features/eventtypes/hooks/useCreateEventType.ts
diff --git a/packages/features/eventtypes/lib/defaultEvents.ts b/packages/features/eventtypes/lib/defaultEvents.ts
index b50efc84f1b6d3..658c04e6e4e42f 100644
--- a/packages/features/eventtypes/lib/defaultEvents.ts
+++ b/packages/features/eventtypes/lib/defaultEvents.ts
@@ -141,6 +141,7 @@ const commons = {
   restrictionScheduleId: null,
   useBookerTimezone: false,
   profileId: null,
+  profile: null,
   requiresConfirmationWillBlockSlot: false,
   canSendCalVideoTranscriptionEmails: false,
   instantMeetingExpiryTimeOffsetInSeconds: 0,
diff --git a/packages/features/eventtypes/lib/getEventTypeById.ts b/packages/features/eventtypes/lib/getEventTypeById.ts
index 4c92c8b7fbc463..d2e38f4fe309e3 100644
--- a/packages/features/eventtypes/lib/getEventTypeById.ts
+++ b/packages/features/eventtypes/lib/getEventTypeById.ts
@@ -6,14 +6,14 @@ import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-util
 import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
 import { WEBSITE_URL } from "@calcom/lib/constants";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
 import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits";
 import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { SchedulingType, MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/features/eventtypes/lib/getEventTypesByViewer.ts b/packages/features/eventtypes/lib/getEventTypesByViewer.ts
index 40a592ae0f4149..e064e24d34ac8b 100644
--- a/packages/features/eventtypes/lib/getEventTypesByViewer.ts
+++ b/packages/features/eventtypes/lib/getEventTypesByViewer.ts
@@ -5,15 +5,15 @@ import { hasFilter } from "@calcom/features/filters/lib/hasFilter";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/eventtypes/lib/getPublicEvent.ts b/packages/features/eventtypes/lib/getPublicEvent.ts
index eb579ae791de4d..17c516dabe3e31 100644
--- a/packages/features/eventtypes/lib/getPublicEvent.ts
+++ b/packages/features/eventtypes/lib/getPublicEvent.ts
@@ -9,10 +9,10 @@ import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getDefaultEvent, getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import { isRecurringEvent, parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import type { User as UserType } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
diff --git a/packages/lib/server/repository/event.ts b/packages/features/eventtypes/repositories/EventRepository.ts
similarity index 100%
rename from packages/lib/server/repository/event.ts
rename to packages/features/eventtypes/repositories/EventRepository.ts
diff --git a/packages/lib/server/repository/eventTypeRepository.ts b/packages/features/eventtypes/repositories/eventTypeRepository.ts
similarity index 95%
rename from packages/lib/server/repository/eventTypeRepository.ts
rename to packages/features/eventtypes/repositories/eventTypeRepository.ts
index fbc302efc7a3e1..bb6cfebc847462 100644
--- a/packages/lib/server/repository/eventTypeRepository.ts
+++ b/packages/features/eventtypes/repositories/eventTypeRepository.ts
@@ -1,4 +1,10 @@
+import { LookupTarget, ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import type { UserWithLegacySelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
 import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { eventTypeSelect } from "@calcom/lib/server/eventTypeSelect";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { prisma, availabilityUserSelect } from "@calcom/prisma";
 import type { EventType as PrismaEventType } from "@calcom/prisma/client";
@@ -10,13 +16,6 @@ import type { Ensure } from "@calcom/types/utils";
 
 import { TRPCError } from "@trpc/server";
 
-import { safeStringify } from "../../safeStringify";
-import { eventTypeSelect } from "../eventTypeSelect";
-import { MembershipRepository } from "./membership";
-import { LookupTarget, ProfileRepository } from "./profile";
-import type { UserWithLegacySelectedCalendars } from "./user";
-import { withSelectedCalendars } from "./user";
-
 const log = logger.getSubLogger({ prefix: ["repository/eventType"] });
 
 const hashedLinkSelect = {
@@ -1423,6 +1422,59 @@ export class EventTypeRepository {
     });
   }
 
+  async findEventTypesWithoutChildren(eventTypeIds: number[], teamId?: number | null) {
+    return await this.prismaClient.eventType.findMany({
+      where: {
+        id: {
+          in: eventTypeIds,
+        },
+        ...(teamId && { parentId: null }),
+      },
+      select: {
+        id: true,
+        children: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findAllIncludingChildrenByUserId({ userId }: { userId: number | null }) {
+    if (userId === null) {
+      return [];
+    }
+    return await this.prismaClient.eventType.findMany({
+      where: {
+        userId,
+      },
+      select: {
+        id: true,
+        children: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findAllIncludingChildrenByTeamId({ teamId }: { teamId: number }) {
+    return await this.prismaClient.eventType.findMany({
+      where: {
+        teamId,
+      },
+      select: {
+        id: true,
+        children: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+  }
   async getTeamIdByEventTypeId({ id }: { id: number }) {
     return await this.prismaClient.eventType.findFirst({
       where: {
diff --git a/packages/features/flags/components/AssignFeatureSheet.tsx b/packages/features/flags/components/AssignFeatureSheet.tsx
new file mode 100644
index 00000000000000..cae631010d957d
--- /dev/null
+++ b/packages/features/flags/components/AssignFeatureSheet.tsx
@@ -0,0 +1,208 @@
+"use client";
+
+import { useState, useEffect } from "react";
+
+import { useDebounce } from "@calcom/lib/hooks/useDebounce";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc/react";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Checkbox, TextField } from "@calcom/ui/components/form";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetBody,
+  SheetFooter,
+} from "@calcom/ui/components/sheet";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
+
+type Flag = RouterOutputs["viewer"]["features"]["list"][number];
+
+interface AssignFeatureSheetProps {
+  flag: Flag;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function AssignFeatureSheet({ flag, open, onOpenChange }: AssignFeatureSheetProps) {
+  const { t } = useLocale();
+  const utils = trpc.useUtils();
+  const [searchTerm, setSearchTerm] = useState("");
+  const debouncedSearchTerm = useDebounce(searchTerm, 300);
+
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isPending } =
+    trpc.viewer.admin.getTeamsForFeature.useInfiniteQuery(
+      {
+        featureId: flag.slug,
+        limit: 20,
+        searchTerm: debouncedSearchTerm || undefined,
+      },
+      {
+        enabled: open,
+        getNextPageParam: (lastPage) => lastPage.nextCursor,
+      }
+    );
+
+  const teams = data?.pages.flatMap((page) => page.teams) ?? [];
+
+  useEffect(() => {
+    if (!open) {
+      setSearchTerm("");
+    }
+  }, [open]);
+
+  const assignMutation = trpc.viewer.admin.assignFeatureToTeam.useMutation({
+    onSuccess: () => {
+      utils.viewer.admin.getTeamsForFeature.invalidate({ featureId: flag.slug });
+      showToast(t("feature_assigned_successfully"), "success");
+    },
+    onError: (err) => {
+      showToast(err.message, "error");
+    },
+  });
+
+  const unassignMutation = trpc.viewer.admin.unassignFeatureFromTeam.useMutation({
+    onSuccess: () => {
+      utils.viewer.admin.getTeamsForFeature.invalidate({ featureId: flag.slug });
+      showToast(t("feature_unassigned_successfully"), "success");
+    },
+    onError: (err) => {
+      showToast(err.message, "error");
+    },
+  });
+
+  const handleToggleTeam = (teamId: number, currentlyHasFeature: boolean) => {
+    if (currentlyHasFeature) {
+      unassignMutation.mutate({
+        teamId,
+        featureId: flag.slug,
+      });
+    } else {
+      assignMutation.mutate({
+        teamId,
+        featureId: flag.slug,
+      });
+    }
+  };
+
+  const handleClose = () => {
+    onOpenChange(false);
+  };
+
+  const isLoading = assignMutation.isPending || unassignMutation.isPending;
+
+  return (
+    <Sheet open={open} onOpenChange={handleClose}>
+      <SheetContent className="bg-muted">
+        <SheetHeader>
+          <SheetTitle>Assign: {flag.slug}</SheetTitle>
+        </SheetHeader>
+        <SheetBody>
+          <div className="mb-4">
+            <TextField
+              type="text"
+              placeholder={t("search")}
+              value={searchTerm}
+              onChange={(e) => setSearchTerm(e.target.value)}
+            />
+          </div>
+          {isPending ? (
+            <SkeletonContainer>
+              <div className="space-y-3">
+                {[...Array(5)].map((_, i) => (
+                  <SkeletonText key={i} className="h-16 w-full" />
+                ))}
+              </div>
+            </SkeletonContainer>
+          ) : teams && teams.length > 0 ? (
+            <>
+              <div className="space-y-2">
+                {teams.map((team) => (
+                  <button
+                    key={team.id}
+                    type="button"
+                    onClick={() => handleToggleTeam(team.id, team.hasFeature)}
+                    disabled={isLoading}
+                    className="bg-default border-subtle hover:bg-muted flex w-full items-center justify-between rounded-lg border p-4 text-left transition-colors disabled:cursor-not-allowed disabled:opacity-50">
+                    <div className="flex items-center gap-3">
+                      <div className="relative">
+                        {team.isOrganization ? (
+                          <div className="h-8 w-8 overflow-hidden rounded">
+                            {team.logoUrl ? (
+                              <img
+                                src={team.logoUrl}
+                                alt={team.name || ""}
+                                className="h-full w-full object-cover"
+                              />
+                            ) : (
+                              <div className="bg-emphasis text-default flex h-full w-full items-center justify-center text-xs font-semibold">
+                                {team.name?.charAt(0).toUpperCase()}
+                              </div>
+                            )}
+                          </div>
+                        ) : (
+                          <Avatar size="sm" alt={team.name || ""} imageSrc={team.logoUrl} />
+                        )}
+                        {team.parent && team.parentId && (
+                          <div className="border-emphasis absolute -bottom-1 -right-1 h-4 w-4 overflow-hidden rounded border">
+                            {team.parent.logoUrl ? (
+                              <img
+                                src={team.parent.logoUrl}
+                                alt={team.parent.name || ""}
+                                className="h-full w-full object-cover"
+                              />
+                            ) : (
+                              <div className="bg-emphasis text-default flex h-full w-full items-center justify-center text-[8px] font-semibold">
+                                {team.parent.name?.charAt(0).toUpperCase()}
+                              </div>
+                            )}
+                          </div>
+                        )}
+                      </div>
+                      <div>
+                        <p className="text-emphasis text-sm font-medium">{team.name}</p>
+                        {team.slug && <p className="text-subtle text-xs">{team.slug}</p>}
+                        {team.parent && (
+                          <p className="text-subtle text-xs">
+                            {t("organization")}: {team.parent.name}
+                          </p>
+                        )}
+                      </div>
+                    </div>
+                    <Checkbox
+                      checked={team.hasFeature}
+                      disabled={isLoading}
+                      onCheckedChange={() => {}}
+                    />
+                  </button>
+                ))}
+              </div>
+              {hasNextPage && (
+                <div className="mt-4 flex justify-center">
+                  <Button
+                    color="secondary"
+                    onClick={() => fetchNextPage()}
+                    loading={isFetchingNextPage}
+                    disabled={isFetchingNextPage}>
+                    {t("load_more")}
+                  </Button>
+                </div>
+              )}
+            </>
+          ) : (
+            <p className="text-subtle text-center text-sm">{t("no_teams_found")}</p>
+          )}
+        </SheetBody>
+        <SheetFooter>
+          <Button color="secondary" onClick={handleClose}>
+            {t("close")}
+          </Button>
+        </SheetFooter>
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/packages/features/flags/components/FlagAdminList.tsx b/packages/features/flags/components/FlagAdminList.tsx
index ffb90ba32ae507..86339e89dcaccc 100644
--- a/packages/features/flags/components/FlagAdminList.tsx
+++ b/packages/features/flags/components/FlagAdminList.tsx
@@ -1,31 +1,69 @@
+import { useState } from "react";
+
 import { trpc } from "@calcom/trpc/react";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { PanelCard } from "@calcom/ui/components/card";
 import { Switch } from "@calcom/ui/components/form";
 import { ListItem, ListItemText, ListItemTitle } from "@calcom/ui/components/list";
 import { List } from "@calcom/ui/components/list";
 import { showToast } from "@calcom/ui/components/toast";
 
+import { AssignFeatureSheet } from "./AssignFeatureSheet";
+
 export const FlagAdminList = () => {
   const [data] = trpc.viewer.features.list.useSuspenseQuery();
+  const [selectedFlag, setSelectedFlag] = useState<Flag | null>(null);
+  const [sheetOpen, setSheetOpen] = useState(false);
+
+  const groupedFlags = data.reduce((acc, flag) => {
+    const type = flag.type || "OTHER";
+    if (!acc[type]) {
+      acc[type] = [];
+    }
+    acc[type].push(flag);
+    return acc;
+  }, {} as Record<string, typeof data>);
+
+  const sortedTypes = Object.keys(groupedFlags).sort();
+
+  const handleAssignClick = (flag: Flag) => {
+    setSelectedFlag(flag);
+    setSheetOpen(true);
+  };
+
   return (
-    <List roundContainer noBorderTreatment>
-      {data.map((flag) => (
-        <ListItem key={flag.slug} rounded={false}>
-          <div className="flex flex-1 flex-col">
-            <ListItemTitle component="h3">
-              {flag.slug}
-              &nbsp;&nbsp;
-              <Badge variant="green">{flag.type?.replace("_", " ")}</Badge>
-            </ListItemTitle>
-            <ListItemText component="p">{flag.description}</ListItemText>
-          </div>
-          <div className="flex py-2">
-            <FlagToggle flag={flag} />
-          </div>
-        </ListItem>
-      ))}
-    </List>
+    <>
+      <div className="space-y-4">
+        {sortedTypes.map((type) => (
+          <PanelCard key={type} title={type.replace(/_/g, " ")} collapsible defaultCollapsed={false}>
+            <List roundContainer noBorderTreatment>
+              {groupedFlags[type].map((flag: Flag, index: number) => (
+                <ListItem key={flag.slug} rounded={index === 0 || index === groupedFlags[type].length - 1}>
+                  <div className="flex flex-1 flex-col">
+                    <ListItemTitle component="h3">{flag.slug}</ListItemTitle>
+                    <ListItemText component="p">{flag.description}</ListItemText>
+                  </div>
+                  <div className="flex items-center gap-2 py-2">
+                    <FlagToggle flag={flag} />
+                    <Button
+                      color="secondary"
+                      size="sm"
+                      variant="icon"
+                      onClick={() => handleAssignClick(flag)}
+                      StartIcon="users"></Button>
+                  </div>
+                </ListItem>
+              ))}
+            </List>
+          </PanelCard>
+        ))}
+      </div>
+      {selectedFlag && (
+        <AssignFeatureSheet flag={selectedFlag} open={sheetOpen} onOpenChange={setSheetOpen} />
+      )}
+    </>
   );
 };
 
diff --git a/packages/features/flags/config.ts b/packages/features/flags/config.ts
index 81baf16ca5b98c..79582d7ac58e7e 100644
--- a/packages/features/flags/config.ts
+++ b/packages/features/flags/config.ts
@@ -28,6 +28,7 @@ export type AppFlags = {
   "tiered-support-chat": boolean;
   "calendar-subscription-cache": boolean;
   "calendar-subscription-sync": boolean;
+  "onboarding-v3": boolean;
   "booker-botid": boolean;
 };
 
diff --git a/packages/features/flags/features.repository.ts b/packages/features/flags/features.repository.ts
index 3781766f6558bd..c4baefb7760f57 100644
--- a/packages/features/flags/features.repository.ts
+++ b/packages/features/flags/features.repository.ts
@@ -190,6 +190,38 @@ export class FeaturesRepository implements IFeaturesRepository {
     }
   }
 
+  /**
+   * Enables a feature for a specific team.
+   * @param teamId - The ID of the team to enable the feature for
+   * @param featureId - The feature identifier to enable
+   * @param assignedBy - The user or what assigned the feature
+   * @returns Promise<void>
+   * @throws Error if the feature enabling fails
+   */
+  async enableFeatureForTeam(teamId: number, featureId: keyof AppFlags, assignedBy: string): Promise<void> {
+    try {
+      await this.prismaClient.teamFeatures.upsert({
+        where: {
+          teamId_featureId: {
+            teamId,
+            featureId,
+          },
+        },
+        create: {
+          teamId,
+          featureId,
+          assignedBy,
+        },
+        update: {},
+      });
+      // Clear cache when features are modified
+      this.clearCache();
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+  }
+
   /**
    * Checks if a team or any of its ancestors has access to a specific feature.
    * Uses a recursive CTE raw SQL query for performance.
diff --git a/packages/features/flags/hooks/index.ts b/packages/features/flags/hooks/index.ts
index b8c311a33fc81e..05ce9e61ab892f 100644
--- a/packages/features/flags/hooks/index.ts
+++ b/packages/features/flags/hooks/index.ts
@@ -27,6 +27,7 @@ const initialData: AppFlags = {
   "tiered-support-chat": false,
   "calendar-subscription-cache": false,
   "calendar-subscription-sync": false,
+  "onboarding-v3": false,
   "booker-botid": false,
 };
 
diff --git a/packages/features/form-builder/FormBuilder.tsx b/packages/features/form-builder/FormBuilder.tsx
index 039dfe31e00642..0bf7f725e374ac 100644
--- a/packages/features/form-builder/FormBuilder.tsx
+++ b/packages/features/form-builder/FormBuilder.tsx
@@ -949,6 +949,7 @@ function VariantFields({
     <>
       {supportsVariantToggle ? (
         <Switch
+          classNames={{ container: "mt-1" }}
           checked={!isDefaultVariant}
           label={variantToggleLabel}
           data-testid="variant-toggle"
diff --git a/packages/features/form-builder/schema.ts b/packages/features/form-builder/schema.ts
index fb4e881524f106..9f248075df0305 100644
--- a/packages/features/form-builder/schema.ts
+++ b/packages/features/form-builder/schema.ts
@@ -257,20 +257,3 @@ export const fieldTypesSchemaMap: Partial<
     },
   },
 };
-
-/**
- * DB Read schema has no field type based validation because user might change the type of a field from Type1 to Type2 after some data has been collected with Type1.
- * Parsing that type1 data with type2 schema will fail.
- * So, we just validate that the response conforms to one of the field types' schema.
- */
-export const dbReadResponseSchema = z.union([
-  z.string(),
-  z.boolean(),
-  z.string().array(),
-  z.object({
-    optionValue: z.string(),
-    value: z.string(),
-  }),
-  // For variantsConfig case
-  z.record(z.string()),
-]);
diff --git a/packages/features/handleMarkNoShow.ts b/packages/features/handleMarkNoShow.ts
index 44f541f9519747..b33cd78b683aea 100644
--- a/packages/features/handleMarkNoShow.ts
+++ b/packages/features/handleMarkNoShow.ts
@@ -1,15 +1,15 @@
 import { type TFunction } from "i18next";
 
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import { workflowSelect } from "@calcom/features/ee/workflows/lib/getAllWorkflows";
 import type { ExtendedCalendarEvent } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
 import { WebhookService } from "@calcom/features/webhooks/lib/WebhookService";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import { prisma } from "@calcom/prisma";
 import { WebhookTriggerEvents, WorkflowTriggerEvents } from "@calcom/prisma/enums";
diff --git a/packages/lib/server/repository/hashedLinkRepository.ts b/packages/features/hashedLink/repositories/hashedLinkRepository.ts
similarity index 100%
rename from packages/lib/server/repository/hashedLinkRepository.ts
rename to packages/features/hashedLink/repositories/hashedLinkRepository.ts
diff --git a/packages/lib/server/service/hashedLinkService.ts b/packages/features/hashedLink/services/hashedLinkService.ts
similarity index 96%
rename from packages/lib/server/service/hashedLinkService.ts
rename to packages/features/hashedLink/services/hashedLinkService.ts
index bbe4d29b7ca7dd..9d7fb178ed8b8d 100644
--- a/packages/lib/server/service/hashedLinkService.ts
+++ b/packages/features/hashedLink/services/hashedLinkService.ts
@@ -1,9 +1,11 @@
+import {
+  HashedLinkRepository,
+  type HashedLinkInputType,
+} from "@calcom/features/hashedLink/repositories/hashedLinkRepository";
+import { MembershipService } from "@calcom/features/membership/services/membershipService";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { validateHashedLinkData } from "@calcom/lib/hashedLinksUtils";
 
-import { HashedLinkRepository, type HashedLinkInputType } from "../repository/hashedLinkRepository";
-import { MembershipService } from "./membershipService";
-
 type NormalizedLink = {
   link: string;
   expiresAt: Date | null;
diff --git a/packages/features/insights/components/routing/RoutedToPerPeriod.tsx b/packages/features/insights/components/routing/RoutedToPerPeriod.tsx
index 044e1c7197ee98..fe0eb9511ad21c 100644
--- a/packages/features/insights/components/routing/RoutedToPerPeriod.tsx
+++ b/packages/features/insights/components/routing/RoutedToPerPeriod.tsx
@@ -85,10 +85,10 @@ function FormCard({ selectedPeriod, onPeriodChange, searchQuery, onSearchChange,
   const { t } = useLocale();
 
   return (
-    <div className="border-subtle w-full rounded-md border">
+    <div className="w-full rounded-md">
       <div className="flex flex-col">
         <div className="p-4">
-          <div className="mb-4 flex items-center justify-between">
+          <div className="mb-4 flex items-center justify-between gap-2">
             <ToggleGroup
               options={[
                 { label: t("per_day"), value: "perDay" },
@@ -99,8 +99,8 @@ function FormCard({ selectedPeriod, onPeriodChange, searchQuery, onSearchChange,
               value={selectedPeriod}
               onValueChange={(value) => value && onPeriodChange(value as "perDay" | "perWeek" | "perMonth")}
             />
-            <div className="flex gap-2">
-              <div className="w-64">
+            <div className="flex items-center gap-2">
+              <div className="max-w-64">
                 <Input
                   type="text"
                   placeholder={t("search")}
@@ -293,7 +293,7 @@ export function RoutedToPerPeriod() {
                 <TableHeader className="bg-subtle sticky top-0 z-10">
                   <TableRow>
                     <TableHead className="bg-subtle sticky left-0 z-30 w-[200px]">{t("user")}</TableHead>
-                    {uniquePeriods.map((period, index) => {
+                    {uniquePeriods.map((period) => {
                       const date = period;
                       const today = new Date();
 
@@ -313,10 +313,10 @@ export function RoutedToPerPeriod() {
                   </TableRow>
                 </TableHeader>
                 <TableBody className="relative">
-                  {processedData.map((row, index) => {
+                  {processedData.map((row) => {
                     return (
                       <TableRow key={row.id} className="divide-muted divide-x">
-                        <TableCell className="bg-default w-[200px]">
+                        <TableCell className="w-[200px]">
                           <HoverCard>
                             <HoverCardTrigger asChild>
                               <div className="flex cursor-pointer items-center gap-2">
diff --git a/packages/features/insights/server/routing-events.ts b/packages/features/insights/server/routing-events.ts
index aa56f0ef00043c..35725af575c990 100644
--- a/packages/features/insights/server/routing-events.ts
+++ b/packages/features/insights/server/routing-events.ts
@@ -9,8 +9,8 @@ import {
 } from "@calcom/app-store/routing-forms/lib/FieldTypes";
 import { zodFields as routingFormFieldsSchema } from "@calcom/app-store/routing-forms/zod";
 import dayjs from "@calcom/dayjs";
+import type { InsightsRoutingBaseService } from "@calcom/features/insights/services/InsightsRoutingBaseService";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import type { InsightsRoutingBaseService } from "@calcom/lib/server/service/InsightsRoutingBaseService";
 import { readonlyPrisma as prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
diff --git a/packages/lib/server/service/InsightsBookingBaseService.ts b/packages/features/insights/services/InsightsBookingBaseService.ts
similarity index 99%
rename from packages/lib/server/service/InsightsBookingBaseService.ts
rename to packages/features/insights/services/InsightsBookingBaseService.ts
index 183f9af07adfb8..6272aa0c940365 100644
--- a/packages/lib/server/service/InsightsBookingBaseService.ts
+++ b/packages/features/insights/services/InsightsBookingBaseService.ts
@@ -4,7 +4,6 @@ import { z } from "zod";
 import dayjs from "@calcom/dayjs";
 import { makeSqlCondition } from "@calcom/features/data-table/lib/server";
 import { ZColumnFilter } from "@calcom/features/data-table/lib/types";
-import { ColumnFilterType } from "@calcom/features/data-table/lib/types";
 import { type ColumnFilter } from "@calcom/features/data-table/lib/types";
 import {
   isSingleSelectFilterValue,
@@ -13,19 +12,15 @@ import {
   isNumberFilterValue,
   isDateRangeFilterValue,
 } from "@calcom/features/data-table/lib/utils";
-import {
-  extractDateRangeFromColumnFilters,
-  replaceDateRangeColumnFilter,
-} from "@calcom/features/insights/lib/bookingUtils";
+import { extractDateRangeFromColumnFilters } from "@calcom/features/insights/lib/bookingUtils";
 import type { DateRange } from "@calcom/features/insights/server/insightsDateUtils";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { MembershipRepository } from "../repository/membership";
-import { TeamRepository } from "../repository/team";
-
 // Utility function to build user hash map with avatar URL fallback
 export const buildHashMapForUsers = <
   T extends { avatarUrl: string | null; id: number; username: string | null; [key: string]: unknown }
diff --git a/packages/lib/server/service/InsightsBookingDIService.ts b/packages/features/insights/services/InsightsBookingDIService.ts
similarity index 100%
rename from packages/lib/server/service/InsightsBookingDIService.ts
rename to packages/features/insights/services/InsightsBookingDIService.ts
diff --git a/packages/lib/server/service/__tests__/InsightsBookingService.integration-test.ts b/packages/features/insights/services/InsightsBookingService.integration-test.ts
similarity index 99%
rename from packages/lib/server/service/__tests__/InsightsBookingService.integration-test.ts
rename to packages/features/insights/services/InsightsBookingService.integration-test.ts
index e1059a47e16fb7..c0d045660161b9 100644
--- a/packages/lib/server/service/__tests__/InsightsBookingService.integration-test.ts
+++ b/packages/features/insights/services/InsightsBookingService.integration-test.ts
@@ -9,7 +9,7 @@ import { BookingStatus, MembershipRole } from "@calcom/prisma/enums";
 import {
   InsightsBookingBaseService as InsightsBookingService,
   type InsightsBookingServicePublicOptions,
-} from "../InsightsBookingBaseService";
+} from "./InsightsBookingBaseService";
 
 const NOTHING_CONDITION = Prisma.sql`1=0`;
 
diff --git a/packages/lib/server/service/InsightsRoutingBaseService.ts b/packages/features/insights/services/InsightsRoutingBaseService.ts
similarity index 99%
rename from packages/lib/server/service/InsightsRoutingBaseService.ts
rename to packages/features/insights/services/InsightsRoutingBaseService.ts
index fa46d0b5887dc1..7c19cfb7881206 100644
--- a/packages/lib/server/service/InsightsRoutingBaseService.ts
+++ b/packages/features/insights/services/InsightsRoutingBaseService.ts
@@ -12,13 +12,12 @@ import {
 } from "@calcom/features/data-table/lib/utils";
 import type { DateRange } from "@calcom/features/insights/server/insightsDateUtils";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import type { BookingStatus } from "@calcom/prisma/enums";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { TeamRepository } from "../repository/team";
-
 export const insightsRoutingServiceOptionsSchema = z.discriminatedUnion("scope", [
   z.object({
     scope: z.literal("user"),
diff --git a/packages/lib/server/service/InsightsRoutingDIService.ts b/packages/features/insights/services/InsightsRoutingDIService.ts
similarity index 100%
rename from packages/lib/server/service/InsightsRoutingDIService.ts
rename to packages/features/insights/services/InsightsRoutingDIService.ts
diff --git a/packages/lib/server/service/__tests__/InsightsRoutingService.integration-test.ts b/packages/features/insights/services/InsightsRoutingService.integration-test.ts
similarity index 99%
rename from packages/lib/server/service/__tests__/InsightsRoutingService.integration-test.ts
rename to packages/features/insights/services/InsightsRoutingService.integration-test.ts
index a1f320307d8090..a00ecade30b990 100644
--- a/packages/lib/server/service/__tests__/InsightsRoutingService.integration-test.ts
+++ b/packages/features/insights/services/InsightsRoutingService.integration-test.ts
@@ -11,7 +11,7 @@ import { BookingStatus, MembershipRole } from "@calcom/prisma/enums";
 import {
   InsightsRoutingBaseService as InsightsRoutingService,
   type InsightsRoutingServicePublicOptions,
-} from "../../service/InsightsRoutingBaseService";
+} from "./InsightsRoutingBaseService";
 
 // SQL condition constants for testing
 const NOTHING_CONDITION = Prisma.sql`1=0`;
diff --git a/packages/features/instant-meeting/handleInstantMeeting.test.ts b/packages/features/instant-meeting/handleInstantMeeting.test.ts
index 74909bd02b0b1c..b51669aa2b5627 100644
--- a/packages/features/instant-meeting/handleInstantMeeting.test.ts
+++ b/packages/features/instant-meeting/handleInstantMeeting.test.ts
@@ -14,13 +14,14 @@ import {
 import type { NextApiRequest } from "next";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
+import { getInstantBookingCreateService } from "@calcom/features/bookings/di/InstantBookingCreateService.container";
 import { BookingStatus } from "@calcom/prisma/enums";
 
 vi.mock("@calcom/features/notifications/sendNotification", () => ({
   sendNotification: vi.fn(),
 }));
 
-vi.mock("@calcom/app-store/videoClient", () => ({
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => ({
   createInstantMeetingWithCalVideo: vi.fn().mockResolvedValue({
     type: "daily_video",
     id: "MOCK_INSTANT_MEETING_ID",
@@ -35,7 +36,7 @@ describe("handleInstantMeeting", () => {
   });
   describe("team event instant meeting", () => {
     it("should successfully create instant meeting for team event", async () => {
-      const handler = (await import("./handleInstantMeeting")).default;
+      const instantBookingCreateService = getInstantBookingCreateService();
       const organizer = getOrganizer({
         name: "Organizer",
         email: "organizer@example.com",
@@ -109,7 +110,9 @@ describe("handleInstantMeeting", () => {
         url: "/api/instant-meeting",
       } as NextApiRequest;
 
-      const result = await handler(mockRequest);
+      const result = await instantBookingCreateService.createBooking({
+        bookingData: mockRequest.body,
+      });
 
       expect(result.message).toBe("Success");
       expect(result.bookingId).toBeDefined();
@@ -132,7 +135,7 @@ describe("handleInstantMeeting", () => {
     });
 
     it("should throw error for non-team event types", async () => {
-      const handler = (await import("./handleInstantMeeting")).default;
+      const instantBookingCreateService = getInstantBookingCreateService();
       const organizer = getOrganizer({
         name: "Organizer",
         email: "organizer@example.com",
@@ -188,9 +191,11 @@ describe("handleInstantMeeting", () => {
         url: "/api/instant-meeting",
       } as NextApiRequest;
 
-      await expect(handler(mockRequest)).rejects.toThrow(
-        "Only Team Event Types are supported for Instant Meeting"
-      );
+      await expect(
+        instantBookingCreateService.createBooking({
+          bookingData: mockRequest.body,
+        })
+      ).rejects.toThrow("Only Team Event Types are supported for Instant Meeting");
     });
   });
 });
diff --git a/packages/features/instant-meeting/handleInstantMeeting.ts b/packages/features/instant-meeting/handleInstantMeeting.ts
index 557216612d2a1a..787d38252c3343 100644
--- a/packages/features/instant-meeting/handleInstantMeeting.ts
+++ b/packages/features/instant-meeting/handleInstantMeeting.ts
@@ -1,12 +1,11 @@
 import { randomBytes } from "crypto";
-import type { NextApiRequest } from "next";
 import short from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
 
 import dayjs from "@calcom/dayjs";
 import type {
   CreateInstantBookingData,
-  CreateInstantBookingResponse,
+  InstantBookingCreateResult,
 } from "@calcom/features/bookings/lib/dto/types";
 import getBookingDataSchema from "@calcom/features/bookings/lib/getBookingDataSchema";
 import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
@@ -14,6 +13,7 @@ import { getBookingData } from "@calcom/features/bookings/lib/handleNewBooking/g
 import { getCustomInputsResponses } from "@calcom/features/bookings/lib/handleNewBooking/getCustomInputsResponses";
 import { getEventTypesFromDB } from "@calcom/features/bookings/lib/handleNewBooking/getEventTypesFromDB";
 import type { IBookingCreateService } from "@calcom/features/bookings/lib/interfaces/IBookingCreateService";
+import { createInstantMeetingWithCalVideo } from "@calcom/features/conferencing/lib/videoClient";
 import { getFullName } from "@calcom/features/form-builder/utils";
 import { sendNotification } from "@calcom/features/notifications/sendNotification";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
@@ -22,7 +22,6 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { createInstantMeetingWithCalVideo } from "@calcom/app-store/videoClient";
 import prisma from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums";
@@ -156,7 +155,7 @@ const triggerBrowserNotifications = async (args: {
   await Promise.allSettled(promises);
 };
 
-async function _handler(bookingData: CreateInstantBookingData) {
+async function handler(bookingData: CreateInstantBookingData) {
   let eventType = await getEventTypesFromDB(bookingData.eventTypeId);
   const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId;
   eventType = {
@@ -330,21 +329,14 @@ async function _handler(bookingData: CreateInstantBookingData) {
     bookingUid: newBooking.uid,
     expires: instantMeetingToken.expires,
     userId: newBooking.userId,
-  } satisfies CreateInstantBookingResponse;
+  } satisfies InstantBookingCreateResult;
 }
 
 /**
  * Instant booking service that handles instant/immediate bookings
  */
 export class InstantBookingCreateService implements IBookingCreateService {
-  async createBooking(input: {
-    bookingData: CreateInstantBookingData;
-  }): Promise<CreateInstantBookingResponse> {
-    return _handler(input.bookingData);
+  async createBooking(input: { bookingData: CreateInstantBookingData }): Promise<InstantBookingCreateResult> {
+    return handler(input.bookingData);
   }
 }
-
-// TODO: Remove it in a follow-up PR
-export default async function handler(req: NextApiRequest) {
-  return _handler(req.body);
-}
diff --git a/packages/lib/server/repository/membership.ts b/packages/features/membership/repositories/MembershipRepository.ts
similarity index 91%
rename from packages/lib/server/repository/membership.ts
rename to packages/features/membership/repositories/MembershipRepository.ts
index aad4979c6016d6..b016ea5bec2190 100644
--- a/packages/lib/server/repository/membership.ts
+++ b/packages/features/membership/repositories/MembershipRepository.ts
@@ -1,15 +1,14 @@
+import { LookupTarget, ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { eventTypeSelect } from "@calcom/lib/server/eventTypeSelect";
 import { availabilityUserSelect, prisma, type PrismaTransaction } from "@calcom/prisma";
 import type { Prisma, Membership, PrismaClient } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
 
-import logger from "../../logger";
-import { safeStringify } from "../../safeStringify";
-import { eventTypeSelect } from "../eventTypeSelect";
-import { LookupTarget, ProfileRepository } from "./profile";
-import { withSelectedCalendars } from "./user";
-
-const log = logger.getSubLogger({ prefix: ["repository/membership"] });
+const log = logger.getSubLogger({ prefix: ["features/membership/repositories/MembershipRepository"] });
 type IMembership = {
   teamId: number;
   userId: number;
@@ -374,35 +373,6 @@ export class MembershipRepository {
     return membershipsWithSelectedCalendars;
   }
 
-  static async findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: number; teamId: number }) {
-    const memberships = await prisma.membership.findMany({
-      where: {
-        teamId: {
-          in: [orgId, teamId],
-        },
-      },
-    });
-
-    type Membership = (typeof memberships)[number];
-
-    const { teamMemberships, orgMemberships } = memberships.reduce(
-      (acc, membership) => {
-        if (membership.teamId === teamId) {
-          acc.teamMemberships.push(membership);
-        } else if (membership.teamId === orgId) {
-          acc.orgMemberships.push(membership);
-        }
-        return acc;
-      },
-      { teamMemberships: [] as Membership[], orgMemberships: [] as Membership[] }
-    );
-
-    return {
-      teamMemberships,
-      orgMemberships,
-    };
-  }
-
   static async getAdminOrOwnerMembership(userId: number, teamId: number) {
     return prisma.membership.findFirst({
       where: {
diff --git a/packages/lib/server/service/membershipService.ts b/packages/features/membership/services/membershipService.ts
similarity index 90%
rename from packages/lib/server/service/membershipService.ts
rename to packages/features/membership/services/membershipService.ts
index 99a24ca64dc095..20ecd6a5d3f7d9 100644
--- a/packages/lib/server/service/membershipService.ts
+++ b/packages/features/membership/services/membershipService.ts
@@ -1,7 +1,6 @@
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { MembershipRepository } from "../repository/membership";
-
 export type MembershipCheckResult = {
   isMember: boolean;
   isAdmin: boolean;
diff --git a/packages/features/notifications/sendNotification.ts b/packages/features/notifications/sendNotification.ts
index ab04353e1bb98a..8c382df0ac2904 100644
--- a/packages/features/notifications/sendNotification.ts
+++ b/packages/features/notifications/sendNotification.ts
@@ -1,12 +1,26 @@
+import { Logger } from "@nestjs/common";
 import webpush from "web-push";
 
+const logger = new Logger("WebPush");
+let isVapidConfigured = false;
+
 const vapidKeys = {
   publicKey: process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY || "",
   privateKey: process.env.VAPID_PRIVATE_KEY || "",
 };
 
-// The mail to email address should be the one at which push service providers can reach you. It can also be a URL.
-webpush.setVapidDetails("mailto:support@cal.com", vapidKeys.publicKey, vapidKeys.privateKey);
+if (vapidKeys.publicKey && vapidKeys.privateKey) {
+  try {
+    // The mail to email address should be the one at which push service providers can reach you. It can also be a URL.
+    webpush.setVapidDetails("mailto:support@cal.com", vapidKeys.publicKey, vapidKeys.privateKey);
+    logger.log("VAPID keys loaded. Web push enabled.");
+    isVapidConfigured = true;
+  } catch (err) {
+    logger.error("Failed to initialize web push", err);
+  }
+} else {
+  logger.warn("Missing VAPID keys. Web push notifications are disabled.");
+}
 
 type Subscription = {
   endpoint: string;
@@ -35,6 +49,10 @@ export const sendNotification = async ({
   requireInteraction?: boolean;
   type?: string;
 }) => {
+  if (!isVapidConfigured) {
+    logger.error("Cannot send notification. VAPID keys not configured.");
+    return;
+  }
   try {
     const payload = JSON.stringify({
       title,
@@ -50,6 +68,6 @@ export const sendNotification = async ({
     });
     await webpush.sendNotification(subscription, payload);
   } catch (error) {
-    console.error("Error sending notification", error);
+    logger.error("Error sending notification", error);
   }
 };
diff --git a/packages/features/pbac/README.md b/packages/features/pbac/README.md
index a34e1b8968c471..557ea1680eaa45 100644
--- a/packages/features/pbac/README.md
+++ b/packages/features/pbac/README.md
@@ -1,423 +1,459 @@
-# Permission-Based Access Control (PBAC) System
+# Permission-Based Access Control (PBAC)
 
 ## Overview
-The PBAC system provides fine-grained access control for Cal.com using a combination of CRUD-based permissions and custom actions, while maintaining backward compatibility with the existing role system.
 
-## Implementation
+The PBAC system provides fine-grained access control for Cal.com using a combination of CRUD-based permissions and custom actions. It's designed to be flexible, performant, and maintain backward compatibility with the existing role system through fallback mechanisms.
 
-### Permission Store
-The system uses a centralized Zustand store with optimized data structures for fast permission lookups:
+## Default Roles
 
-```typescript
-interface TeamPermissions {
-  roleId: string;
-  permissions: Set<PermissionString>; // O(1) lookup
-}
+The system comes with three pre-configured default roles that form the foundation of the permission system:
 
-interface PermissionStore {
-  teamPermissions: Map<number, TeamPermissions>; // O(1) lookup
-  setTeamPermissions: (permissions: Record<number, { roleId: string; permissions: PermissionString[] }>) => void;
-  hasPermission: (teamId: number, permission: PermissionString) => boolean;
-  hasPermissions: (teamId: number, permissions: PermissionString[]) => boolean;
-}
-```
+### 1. Owner Role (`owner_role`)
 
-### Context Provider
-The system uses a React context provider that fetches all permissions once at the root level:
+- **Full Access**: Has access to all resources via wildcard permission (`*.*`)
+- **Automatically assigned** to team/organization creators
+- **Cannot be modified or deleted**
+- **Permissions**: `*.*` grants access to all actions on all resources
 
-```tsx
-<PermissionProvider>
-  <App />
-</PermissionProvider>
-```
+### 2. Admin Role (`admin_role`)
 
-The provider automatically:
-- Fetches permissions for all teams the user has access to
-- Caches the results (5-minute stale time)
-- Updates the central store
-- Provides loading states
+- **Extensive management permissions** across most resources
+- **Can manage** team settings, members, bookings, and more
+- **Permissions include**:
+  - **Event Types**: Full CRUD (`eventType.*`)
+  - **Roles**: Full CRUD (`role.*`)
+  - **Team Management**: `team.create`, `team.read`, `team.update`, `team.invite`, `team.remove`, `team.changeMemberRole`
+  - **Organization**: `organization.read`, `organization.update`, `organization.listMembers`, `organization.invite`, `organization.remove`, `organization.manageBilling`, `organization.changeMemberRole`
+  - **Bookings**: `booking.read`, `booking.update`, `booking.readTeamBookings`, `booking.readOrgBookings`, `booking.readRecordings`
+  - **Insights**: `insights.read`
+  - **Workflows**: Full CRUD (`workflow.*`)
+  - **Routing Forms**: Full CRUD (`routingForm.*`)
+  - **Webhooks**: Full CRUD (`webhook.*`)
+  - **Availability**: `availability.read`, `availability.update`
 
-### Permission Hooks
-Two main hooks are provided for checking permissions:
+### 3. Member Role (`member_role`)
 
-```typescript
-// Check single permission
-const { hasPermission, isLoading } = usePermission(teamId, "team.update");
+- **Basic read access** to resources
+- **Default role** for new team members
+- **Permissions include**:
+  - **Event Types**: `eventType.read`
+  - **Team**: `team.read`
+  - **Roles**: `role.read`
+  - **Organization**: `organization.read`, `organization.listMembers`
+  - **Bookings**: `booking.read`, `booking.update` (for their own bookings)
+  - **Workflows**: `workflow.read`
+  - **Routing Forms**: `routingForm.read`
+  - **Availability**: `availability.read`, `availability.update` (for their own availability)
 
-// Check multiple permissions
-const { hasPermissions, isLoading } = usePermissions(teamId, ["team.update", "team.invite"]);
-```
+## How to Check Permissions
 
-## Permission Format
-Permissions follow two formats:
-1. CRUD Permissions: `${resource}.${action}`
-2. Custom Actions: `custom:${resource}.${action}`
+PBAC is currently behind a feature flag, so we use utility functions that automatically handle the fallback logic for you.
+
+### Server-Side Permission Checks (React Server Components)
+
+The recommended approach is to check permissions in RSC before rendering the page:
 
 ```typescript
-// CRUD Permission Examples
-"eventType.create"
-"booking.read"
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+// In a Server Component or API route
+async function MyServerComponent({ teamId, userId }: { teamId: number; userId: number }) {
+  const permissionService = new PermissionCheckService();
+
+  // Check a single permission
+  const canUpdateTeam = await permissionService.checkPermission({
+    userId,
+    teamId,
+    permission: "team.update",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  // Check multiple permissions (user must have ALL)
+  const canManageMembers = await permissionService.checkPermissions({
+    userId,
+    teamId,
+    permissions: ["team.invite", "team.remove"],
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!canUpdateTeam) {
+    return <div>Not authorized</div>;
+  }
 
-// Custom Action Examples
-"custom:team.invite"
-"custom:booking.readRecordings"
+  return <div>Team Settings</div>;
+}
 ```
 
-## Role Types
-1. **Default Roles** (MembershipRole)
-   - OWNER: Full access (`*.*`)
-   - ADMIN: Extensive management permissions
-   - MEMBER: Basic read permissions
+**Fallback Roles**: If PBAC is not enabled for the team, the system will check if the user has one of the specified `fallbackRoles` instead.
 
-2. **Custom Roles**
-   - Team-specific roles with granular permissions
-   - Can be assigned alongside default roles
+### Client-Side Permission Checks (React Components)
 
-## Permission Structure
+For client components or when you're deep in the component tree, use the TRPC router:
 
-### CRUD Actions
 ```typescript
-export enum CrudAction {
-  Create = 'create',
-  Read = 'read',
-  Update = 'update',
-  Delete = 'delete',
+import { trpc } from "@calcom/trpc/react";
+
+function TeamSettingsButton({ teamId }: { teamId: number }) {
+  // Check a single permission
+  const { data: hasPermission, isLoading } = trpc.viewer.pbac.checkPermission.useQuery({
+    teamId,
+    permission: "team.update",
+  });
+
+  // Check multiple permissions
+  const { data: hasPermissions } = trpc.viewer.pbac.checkPermissions.useQuery({
+    teamId,
+    permissions: ["team.update", "team.invite"],
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+  if (!hasPermission) return null;
+
+  return <button>Update Team Settings</button>;
 }
 ```
 
-### Custom Actions
+**Important**: These TRPC calls are automatically cached by React Query on the client, so you can call them multiple times throughout your component tree without worrying about redundant network requests (as long as the props are the same).
+
+### Getting All Permissions for a Resource
+
+If you need to check multiple permissions for a resource efficiently:
+
 ```typescript
-export enum CustomAction {
-  Invite = 'invite',      // Invite members to team/org
-  Remove = 'remove',      // Remove members from team/org
-  Override = 'override',  // Override availability
-  ReadRecordings = 'readRecordings', // Access booking recordings
-  ManageBilling = 'manageBilling',   // Manage org billing
-}
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
+
+const permissionService = new PermissionCheckService();
+
+// Get all permissions for a specific resource
+const permissions = await permissionService.getResourcePermissions({
+  userId,
+  teamId,
+  resource: Resource.EventType,
+});
+
+// permissions = ["eventType.create", "eventType.read", "eventType.update", "eventType.delete"]
 ```
 
+**Warning**: This approach does NOT account for fallback roles. Only use this in places where you know PBAC is enabled and has been rolled out.
+
+## Permission Format
+
+Permissions follow the format: `resource.action`
+
 ### Resources
+
+Available resources are defined in the `Resource` enum:
+
+- `eventType` - Event types
+- `team` - Team settings
+- `organization` - Organization settings
+- `booking` - Bookings
+- `insights` - Analytics and insights
+- `role` - Custom roles
+- `routingForm` - Routing forms
+- `workflow` - Workflows
+- `webhook` - Webhooks
+- `availability` - Availability schedules
+- `ooo` - Out of office entries
+- `watchlist` - Watchlist/blocklist entries
+- `organization.attributes` - Organization attributes
+
+### Actions
+
+#### CRUD Actions
+
+Standard create, read, update, delete operations:
+
+- `create` - Create new resources
+- `read` - View resources
+- `update` - Modify resources
+- `delete` - Remove resources
+- `*` - All CRUD actions (wildcard)
+
+#### Custom Actions
+
+Special actions that don't fit the CRUD model:
+
+- `invite` - Invite members to team/org
+- `remove` - Remove members from team/org
+- `changeMemberRole` - Change member roles
+- `listMembers` - View team/org members
+- `listMembersPrivate` - View private team/org members
+- `manageBilling` - Manage organization billing
+- `readTeamBookings` - View team bookings
+- `readOrgBookings` - View organization bookings
+- `readRecordings` - Access booking recordings
+- `impersonate` - Impersonate team/org members
+
+## Team vs Organization Permissions
+
+The permission system has intelligent fallback logic for teams within organizations:
+
+1. **Team-Level Check First**: When checking permissions for a team resource, the system first checks if the user has the required permission through their **team membership**.
+
+2. **Organization-Level Fallback**: If the user doesn't have team-level permissions:
+   - The system checks if the team belongs to an organization
+   - If yes, it checks the user's **organization membership** permissions
+   - Organization permissions can grant access to team resources
+
+3. **Example Flow**:
+   ```typescript
+   // User is trying to access "eventType.read" on Team 123
+   // Team 123 is part of Organization 456
+
+   // 1. Check: Does user have "eventType.read" on Team 123?
+   //    � No specific team permission
+
+   // 2. Check: Does user have "eventType.read" on Organization 456?
+   //    � Yes! User has org-level permission
+   //    � Access granted
+   ```
+
+This allows organization admins to manage resources across all teams without needing explicit permissions on each team.
+
+## Adding a New Permission
+
+When you need to add a permission that doesn't exist in the registry, follow these steps:
+
+### Step 1: Add to the Permission Registry
+
+Update the `PERMISSION_REGISTRY` in `packages/features/pbac/domain/types/permission-registry.ts`:
+
 ```typescript
-export enum Resource {
-  EventType = 'eventType',
-  Booking = 'booking',
-  Team = 'team',
-  Organization = 'organization',
-  Insights = 'insights',
-  Availability = 'availability',
-  Workflow = 'workflow',
-  RoutingForm = 'routingForm',
-}
+export const PERMISSION_REGISTRY: PermissionRegistry = {
+  // ... existing resources
+
+  [Resource.Booking]: {
+    _resource: {
+      i18nKey: "pbac_resource_booking",
+    },
+    // ... existing actions
+
+    // Add your new custom action
+    [CustomAction.Export]: {
+      description: "Export booking data",
+      category: "booking",
+      i18nKey: "pbac_action_export",
+      descriptionI18nKey: "pbac_desc_export_bookings",
+      dependsOn: ["booking.read"], // Optional: specify dependencies
+    },
+  },
+};
 ```
 
-## Usage Guide
+**Key Fields**:
 
-### 1. Setup Provider
-```tsx
-// app/layout.tsx or similar
-import { PermissionProvider } from "@calcom/features/pbac/context/PermissionProvider";
+- `description`: Human-readable description
+- `category`: Grouping category for UI
+- `i18nKey`: Translation key for action name
+- `descriptionI18nKey`: Translation key for description
+- `scope`: Optional array of `[Scope.Team]` or `[Scope.Organization]` to limit where permission appears
+- `dependsOn`: Optional array of permissions that must be enabled when this permission is enabled
+- `visibleWhen`: Optional visibility conditions (e.g., based on team privacy)
 
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <PermissionProvider>
-      {children}
-    </PermissionProvider>
-  );
-}
+### Step 2: Create a Database Migration
+
+Create a custom migration to add the permission to existing roles:
+
+```bash
+npx prisma migrate dev --create-only --name pbac_add_booking_export_permissions
 ```
 
-### 2. Use in Components
-```tsx
-import { usePermission, usePermissions } from "@calcom/features/pbac/hooks/usePermission";
+### Step 3: Write the Migration SQL
 
-function TeamSettings({ teamId }: { teamId: number }) {
-  // Single permission check
-  const { hasPermission, isLoading } = usePermission(teamId, "team.update");
-  
-  // Multiple permissions check
-  const { hasPermissions } = usePermissions(teamId, [
-    "team.update",
-    "team.invite"
-  ]);
+Open the new migration file in `packages/prisma/migrations/[timestamp]_pbac_add_booking_export_permissions/migration.sql`:
 
-  if (isLoading) return <div>Loading...</div>;
+```sql
+-- Add the new "booking.export" permission to admin and owner roles
 
-  return (
-    <div>
-      {hasPermission && <button>Update Team</button>}
-      {hasPermissions && <button>Update and Invite</button>}
-    </div>
-  );
-}
+-- Owner role automatically gets it via wildcard (*.*) - no action needed!
+
+-- Add to admin role
+INSERT INTO "RolePermission" (id, "roleId", resource, action, "createdAt")
+VALUES
+  (gen_random_uuid(), 'admin_role', 'booking', 'export', NOW())
+ON CONFLICT DO NOTHING;
+
+-- Optionally add to member role if needed
+INSERT INTO "RolePermission" (id, "roleId", resource, action, "createdAt")
+VALUES
+  (gen_random_uuid(), 'member_role', 'booking', 'export', NOW())
+ON CONFLICT DO NOTHING;
 ```
 
-### 3. Performance Considerations
-- Permission checks are O(1) using Map and Set data structures
-- Permissions are fetched once and cached for 5 minutes
-- No redundant API calls for permission checks
-- Automatic updates when permissions change via store
+**Important Notes**:
+
+- **Owner Role**: Has `*.*` wildcard permission, so it automatically gets access to all new permissions. No migration needed!
+- **Admin/Member Roles**: Must be explicitly granted new permissions through migrations
+- Use `ON CONFLICT DO NOTHING` to make migrations idempotent
+- Use `gen_random_uuid()` for IDs
+
+### Step 4: Run the Migration
+
+```bash
+npx prisma migrate dev
+```
+
+### Step 5: Use Your New Permission
+
+```typescript
+// Server-side
+const canExport = await permissionService.checkPermission({
+  userId,
+  teamId,
+  permission: "booking.export",
+  fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+});
+
+// Client-side
+const { data: canExport } = trpc.viewer.pbac.checkPermission.useQuery({
+  teamId,
+  permission: "booking.export",
+});
+```
+
+## Practical Examples
+
+### Example 1: Event Manager Role
 
-## Common Permission Combinations
+A role for users who should manage events but not team settings:
 
-### Event Manager Role
 ```typescript
-const permissions = [
-  // CRUD Permissions
+const eventManagerPermissions = [
+  // Event Types
   "eventType.create",
   "eventType.read",
   "eventType.update",
   "eventType.delete",
-  
-  // Custom Actions
-  "custom:booking.readRecordings",
-  "custom:availability.override"
+
+  // Bookings
+  "booking.read",
+  "booking.update",
+  "booking.readTeamBookings",
+
+  // Workflows
+  "workflow.create",
+  "workflow.read",
+  "workflow.update",
+  "workflow.delete",
+
+  // Basic team access
+  "team.read",
 ];
 ```
 
-### Analytics Role
+### Example 2: Analytics Viewer Role
+
+A role for users who should only view analytics:
+
 ```typescript
-const permissions = [
-  // CRUD Permissions
+const analyticsViewerPermissions = [
   "insights.read",
   "booking.read",
+  "booking.readTeamBookings",
   "eventType.read",
-  
-  // Custom Actions
-  "custom:organization.manageBilling"
+  "team.read",
 ];
 ```
 
-### Team Admin Role
+### Example 3: Billing Manager Role
+
+A role for users who manage billing but not content:
+
 ```typescript
-const permissions = [
-  // CRUD Permissions
-  "team.create",
+const billingManagerPermissions = [
+  "organization.read",
+  "organization.manageBilling",
   "team.read",
-  "team.update",
-  
-  // Custom Actions
-  "custom:team.invite",
-  "custom:team.remove",
-  "custom:availability.override"
+  "organization.listMembers",
 ];
 ```
 
-## Database Schema
-```prisma
-model Role {
-  id          String   @id @default(cuid())
-  name        String
-  teamId      Int?
-  permissions RolePermission[]
-}
+### Example 4: Checking Permissions in a Complex Feature
 
-model RolePermission {
-  id       String @id @default(cuid())
-  roleId   String
-  resource String
-  action   String
-  isCustom Boolean @default(false)  // Indicates if this is a custom action
-  role     Role   @relation(fields: [roleId], references: [id])
-}
-```
-
-## Example Use Cases
-
-### 1. Event Type Management
 ```typescript
-// Full event type management
-[
-  "eventType.create",
-  "eventType.read",
-  "eventType.update",
-  "eventType.delete"
-]
+// Check if user can perform multiple operations
+async function canUserManageEvent(userId: number, teamId: number) {
+  const permissionService = new PermissionCheckService();
+
+  // Get all event type permissions at once
+  const permissions = await permissionService.getResourcePermissions({
+    userId,
+    teamId,
+    resource: Resource.EventType,
+  });
 
-// Read-only access
-["eventType.read"]
-```
+  const permissionMap = PermissionMapper.toActionMap(permissions, Resource.EventType);
 
-### 2. Team Management with Custom Actions
-```typescript
-[
-  "team.read",
-  "team.update",
-  "custom:team.invite",
-  "custom:team.remove"
-]
-```
-
-### 3. Booking Management with Recordings
-```typescript
-[
-  "booking.read",
-  "booking.update",
-  "custom:booking.readRecordings"
-]
+  return {
+    canCreate: permissionMap[CrudAction.Create] ?? false,
+    canRead: permissionMap[CrudAction.Read] ?? false,
+    canUpdate: permissionMap[CrudAction.Update] ?? false,
+    canDelete: permissionMap[CrudAction.Delete] ?? false,
+  };
+}
 ```
 
-## Usage
+### Example 5: Conditional UI Rendering
 
-### Server-Side (React Server Components)
 ```typescript
-import { cookies, headers } from "next/headers";
-import { checkUserPermissionInTeam } from "@calcom/features/pbac/lib/server/checkPermissions";
-
-// In a Server Component
-export default async function TeamSettings({ params }: { params: { teamId: string } }) {
-  const session = buildLegacyRequest(await headers(), await cookies())
+import { trpc } from "@calcom/trpc/react";
 
-  if(!session?.user?.id){
-    return null
-  }
+function TeamManagementPanel({ teamId }: { teamId: number }) {
+  const { data: canInvite } = trpc.viewer.pbac.checkPermission.useQuery({
+    teamId,
+    permission: "team.invite",
+  });
 
-  const hasPermission = await checkUserPermissionInTeam({
-    userId: session.user.id,
-    teamId: parseInt(params.teamId),
-    permission: "team.update",
+  const { data: canRemove } = trpc.viewer.pbac.checkPermission.useQuery({
+    teamId,
+    permission: "team.remove",
   });
 
-  if (!hasPermission) {
-    return <div>Not authorized</div>;
-  }
+  const { data: canChangeRoles } = trpc.viewer.pbac.checkPermission.useQuery({
+    teamId,
+    permission: "team.changeMemberRole",
+  });
 
-  return <div>Team Settings</div>;
+  return (
+    <div>
+      {canInvite && <InviteMemberButton teamId={teamId} />}
+      {canRemove && <RemoveMemberButton teamId={teamId} />}
+      {canChangeRoles && <ChangeRoleDropdown teamId={teamId} />}
+    </div>
+  );
 }
-
-// Check multiple permissions
-const hasPermissions = await checkMultiplePermissionsInTeam({
-  userId: session.user.id,
-  teamId: teamId,
-  permissions: ["team.update", "team.invite"],
-});
 ```
 
-### Client-Side (React Components)
-```typescript
-import { usePermission, usePermissions } from "@calcom/features/pbac/hooks/usePermission";
+## Best Practices
 
-// In a React Component
-function TeamSettingsButton({ teamId }: { teamId: number }) {
-  // Single permission check
-  const { hasPermission, isLoading } = usePermission(teamId, "team.update");
-  
-  if (isLoading) return <div>Loading...</div>;
-  if (!hasPermission) return null;
-  
-  return <button>Update Team Settings</button>;
-}
+1. **Always use fallback roles** when checking permissions to maintain backward compatibility
+2. **Check permissions in RSC** when possible for better performance and security
+3. **Use `getResourcePermissions()`** when you need to check many permissions for the same resource
+4. **Don't repeat permission checks** - TRPC caching handles this for you on the client
+5. **Be specific with permissions** - Use fine-grained permissions rather than broad wildcards for custom roles
+6. **Document custom permissions** - Add clear descriptions and i18n keys for better UX
+7. **Test permission fallbacks** - Ensure your code works both with and without PBAC enabled
 
-// Multiple permissions check
-function TeamAdminPanel({ teamId }: { teamId: number }) {
-  const { hasPermissions, isLoading } = usePermissions(teamId, [
-    "team.update",
-    "team.invite"
-  ]);
-  
-  if (isLoading) return <div>Loading...</div>;
-  if (!hasPermissions) return <div>Insufficient permissions</div>;
-  
-  return <div>Admin Panel</div>;
-}
-```
+## Troubleshooting
 
-### Available Permissions
-
-Permissions follow the format `resource.action` where:
-- `resource` is the entity being accessed (e.g., team, eventType, booking)
-- `action` is the operation being performed (e.g., create, read, update, delete)
-
-Common permissions include:
-- `team.create` - Create teams
-- `team.update` - Update team settings
-- `team.invite` - Invite team members
-- `team.remove` - Remove team members
-- `eventType.create` - Create event types
-- `eventType.update` - Update event types
-- `booking.read` - Read booking details
-
-For a complete list of permissions, see [PERMISSIONS.md](./PERMISSIONS.md).
-
-### Caching
-
-The client-side hooks automatically cache permission results for 5 minutes to reduce API calls. The cache can be invalidated by calling the TRPC mutation to update permissions. 
-
-## Default Roles and Permissions
-
-The system comes with three pre-configured default roles:
-
-### 1. Owner Role (owner_role)
-- Has full access to all resources via wildcard permission (`*.*`)
-- Automatically assigned to team/organization creators
-- Cannot be modified or deleted
-- Permissions:
-  ```typescript
-  "*.*" // Grants access to all actions on all resources
-  ```
-
-### 2. Admin Role (admin_role)
-- Has extensive management permissions
-- Can manage team settings and members
-- Permissions:
-  ```typescript
-  // Booking permissions
-  "booking.*"              // All booking operations
-  "booking.readTeamBookings"
-  "booking.readOrgBookings"
-  
-  // Event Type permissions
-  "eventType.*"           // All event type operations
-  
-  // Team management
-  "team.invite"
-  "team.remove"
-  "team.changeMemberRole"
-  
-  // Organization permissions
-  "organization.listMembers"
-  "organization.read"
-  "organization.update"
-  
-  // Other resource permissions
-  "apiKey.*"             // All API key operations
-  "routingForm.*"        // All routing form operations
-  "workflow.*"           // All workflow operations
-  "insights.read"        // Read access to insights
-  ```
-
-### 3. Member Role (member_role)
-- Basic read access to resources
-- Default role for new team members
-- Permissions:
-  ```typescript
-  "booking.read"
-  "eventType.read"
-  "team.read"
-  "organization.read"
-  "routingForm.read"
-  ```
-
-### Using Default Roles
-
-You can reference these roles programmatically using the constants provided in `@calcom/features/pbac/lib/constants`:
+### Permission checks always return false
 
-```typescript
-import { DEFAULT_ROLES } from "@calcom/features/pbac/lib/constants";
+- Verify the team has the PBAC feature flag enabled
+- Check that the user has a membership in the team or parent organization
+- Ensure the permission string format is correct (`resource.action`)
+- Verify the permission exists in the `PERMISSION_REGISTRY`
 
-// Reference roles
-const ownerRoleId = DEFAULT_ROLES.OWNER;   // 'owner_role'
-const adminRoleId = DEFAULT_ROLES.ADMIN;    // 'admin_role'
-const memberRoleId = DEFAULT_ROLES.MEMBER;  // 'member_role'
-```
+### Custom role not showing in UI
 
-### Role Assignment
+- Check that you've run the database migration
+- Verify the role has a `teamId` associated with it
+- Ensure the user has `role.read` permission
 
-1. Default roles are automatically assigned during:
-   - Team creation (creator gets OWNER role)
-   - Member invitation (gets MEMBER role by default)
-   - Role changes through team management UI
+### Organization permissions not working for team resources
 
-2. Roles can be changed by team owners and admins through:
-   - Team member management interface
-   - Organization member management interface
-   - API endpoints (with proper permissions)
+- Verify the team has a `parentId` (organization)
+- Check that the user is a member of the parent organization
+- Ensure the permission is not scoped to only `[Scope.Team]` in the registry
diff --git a/packages/features/pbac/domain/types/permission-registry.ts b/packages/features/pbac/domain/types/permission-registry.ts
index d4e61e2ce32db0..b54b70e3f7ca0c 100644
--- a/packages/features/pbac/domain/types/permission-registry.ts
+++ b/packages/features/pbac/domain/types/permission-registry.ts
@@ -12,6 +12,7 @@ export enum Resource {
   Webhook = "webhook",
   Availability = "availability",
   OutOfOffice = "ooo",
+  Watchlist = "watchlist",
 }
 
 export enum CrudAction {
@@ -120,7 +121,7 @@ export const isValidPermissionString = (val: unknown): val is PermissionString =
  * @returns A new object without the _resource property
  */
 export const filterResourceConfig = (config: ResourceConfig): Omit<ResourceConfig, "_resource"> => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   const { _resource, ...rest } = config;
   return rest;
 };
@@ -147,7 +148,8 @@ export const getPermissionsForScope = (scope: Scope, isPrivate?: boolean): Permi
       const scopeMatches = !permissionDetails.scope || permissionDetails.scope.includes(scope);
 
       // Check privacy visibility (only if isPrivate is provided)
-      const privacyMatches = teamPrivacy === undefined ||
+      const privacyMatches =
+        teamPrivacy === undefined ||
         !permissionDetails.visibleWhen?.teamPrivacy ||
         permissionDetails.visibleWhen.teamPrivacy === "both" ||
         permissionDetails.visibleWhen.teamPrivacy === teamPrivacy;
@@ -672,4 +674,40 @@ export const PERMISSION_REGISTRY: PermissionRegistry = {
       dependsOn: ["ooo.read"],
     },
   },
+  [Resource.Watchlist]: {
+    _resource: {
+      i18nKey: "pbac_resource_blocklist",
+    },
+    [CrudAction.Create]: {
+      description: "Create watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_create",
+      descriptionI18nKey: "pbac_desc_create_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+    [CrudAction.Read]: {
+      description: "View watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_read",
+      descriptionI18nKey: "pbac_desc_view_watchlist_entries",
+      scope: [Scope.Organization],
+    },
+    [CrudAction.Update]: {
+      description: "Update watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_update",
+      descriptionI18nKey: "pbac_desc_update_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+    [CrudAction.Delete]: {
+      description: "Delete watchlist entries",
+      category: "watchlist",
+      i18nKey: "pbac_action_delete",
+      descriptionI18nKey: "pbac_desc_delete_watchlist_entries",
+      scope: [Scope.Organization],
+      dependsOn: ["watchlist.read"],
+    },
+  },
 };
diff --git a/packages/features/pbac/infrastructure/repositories/PermissionRepository.ts b/packages/features/pbac/infrastructure/repositories/PermissionRepository.ts
index 2231cab2c9e886..90cb48eb5b19b1 100644
--- a/packages/features/pbac/infrastructure/repositories/PermissionRepository.ts
+++ b/packages/features/pbac/infrastructure/repositories/PermissionRepository.ts
@@ -132,35 +132,29 @@ export class PermissionRepository implements IPermissionRepository {
       const { resource, action } = parsePermissionString(p);
       return { resource, action };
     });
-    const resourceActions = permissionPairs.map((p) => [p.resource, p.action]);
-    const resources = permissionPairs.map((p) => p.resource);
-    const actions = permissionPairs.map((p) => p.action);
 
-    const matchingPermissions = await this.client.$queryRaw<[{ count: bigint }]>`
-      WITH permission_checks AS (
-        -- Universal permission (*,*)
-        SELECT 1 as match FROM "RolePermission"
-        WHERE "roleId" = ${roleId} AND "resource" = '*' AND "action" = '*'
-
-        UNION ALL
-
-        -- Wildcard resource with specific actions
-        SELECT 1 as match FROM "RolePermission"
-        WHERE "roleId" = ${roleId} AND "resource" = '*' AND "action" = ANY(${actions})
-
-        UNION ALL
+    // Convert permission pairs to JSONB for proper serialization
+    const permissionPairsJson = JSON.stringify(permissionPairs);
 
-        -- Specific resources with wildcard action
-        SELECT 1 as match FROM "RolePermission"
-        WHERE "roleId" = ${roleId} AND "action" = '*' AND "resource" = ANY(${resources})
-
-        UNION ALL
-
-        -- Exact resource-action pairs
-        SELECT 1 as match FROM "RolePermission"
-        WHERE "roleId" = ${roleId} AND ("resource", "action") = ANY(${resourceActions})
+    // Check if each requested permission is satisfied by at least one role permission
+    const matchingPermissions = await this.client.$queryRaw<[{ count: bigint }]>`
+      SELECT COUNT(*) as count
+      FROM jsonb_array_elements(${permissionPairsJson}::jsonb) AS required_perm
+      WHERE EXISTS (
+        SELECT 1
+        FROM "RolePermission" rp
+        WHERE rp."roleId" = ${roleId}
+          AND (
+            -- Universal permission (*,*)
+            (rp."resource" = '*' AND rp."action" = '*') OR
+            -- Wildcard resource with specific action
+            (rp."resource" = '*' AND rp."action" = required_perm->>'action') OR
+            -- Specific resource with wildcard action
+            (rp."resource" = required_perm->>'resource' AND rp."action" = '*') OR
+            -- Exact resource-action pair
+            (rp."resource" = required_perm->>'resource' AND rp."action" = required_perm->>'action')
+          )
       )
-      SELECT COUNT(*) as count FROM permission_checks
     `;
 
     return Number(matchingPermissions[0].count) >= permissions.length;
diff --git a/packages/features/pbac/infrastructure/repositories/__tests__/PermissionRepository.integration-test.ts b/packages/features/pbac/infrastructure/repositories/__tests__/PermissionRepository.integration-test.ts
new file mode 100644
index 00000000000000..503b4dafed1ab9
--- /dev/null
+++ b/packages/features/pbac/infrastructure/repositories/__tests__/PermissionRepository.integration-test.ts
@@ -0,0 +1,324 @@
+import { describe, it, expect, beforeEach, afterEach, beforeAll, afterAll } from "vitest";
+
+import { prisma } from "@calcom/prisma";
+
+import type { PermissionString } from "../../../domain/types/permission-registry";
+import { PermissionRepository } from "../PermissionRepository";
+
+describe("PermissionRepository - Integration Tests", () => {
+  let repository: PermissionRepository;
+  let testRoleId: string;
+  let testUserId: number;
+  let testTeamId: number;
+
+  beforeAll(async () => {
+    repository = new PermissionRepository(prisma);
+  });
+
+  beforeEach(async () => {
+    // Create test user
+    const testUser = await prisma.user.create({
+      data: {
+        email: `test-${Date.now()}@example.com`,
+        username: `testuser-${Date.now()}`,
+      },
+    });
+    testUserId = testUser.id;
+
+    // Create test team
+    const testTeam = await prisma.team.create({
+      data: {
+        name: `Test Team ${Date.now()}`,
+        slug: `test-team-${Date.now()}`,
+      },
+    });
+    testTeamId = testTeam.id;
+
+    // Create test role
+    const testRole = await prisma.role.create({
+      data: {
+        name: `Test Role ${Date.now()}`,
+        teamId: testTeamId,
+      },
+    });
+    testRoleId = testRole.id;
+  });
+
+  afterEach(async () => {
+    // Clean up test data
+    await prisma.rolePermission.deleteMany({
+      where: { roleId: testRoleId },
+    });
+    await prisma.membership.deleteMany({
+      where: { userId: testUserId },
+    });
+    await prisma.role.deleteMany({
+      where: { id: testRoleId },
+    });
+    await prisma.team.deleteMany({
+      where: { id: testTeamId },
+    });
+    await prisma.user.deleteMany({
+      where: { id: testUserId },
+    });
+  });
+
+
+  describe("checkRolePermissions", () => {
+    it("should successfully check single permission without serialization error", async () => {
+      // Create a role permission
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "role",
+          action: "create",
+        },
+      });
+
+      const permissions: PermissionString[] = ["role.create"];
+      const result = await repository.checkRolePermissions(testRoleId, permissions);
+
+      expect(result).toBe(true);
+    });
+
+    it("should successfully check multiple permissions without serialization error", async () => {
+      // Create multiple role permissions
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "role", action: "create" },
+          { roleId: testRoleId, resource: "role", action: "read" },
+          { roleId: testRoleId, resource: "eventType", action: "update" },
+        ],
+      });
+
+      const permissions: PermissionString[] = ["role.create", "role.read", "eventType.update"];
+      const result = await repository.checkRolePermissions(testRoleId, permissions);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle exact resource-action pair matching", async () => {
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "team",
+          action: "invite",
+        },
+      });
+
+      const result = await repository.checkRolePermissions(testRoleId, ["team.invite"]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle wildcard resource (*) with specific action", async () => {
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "*",
+          action: "read",
+        },
+      });
+
+      // Should match any resource with read action
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.read",
+        "team.read",
+        "role.read",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle specific resource with wildcard action (*)", async () => {
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "eventType",
+          action: "*",
+        },
+      });
+
+      // Should match eventType with any action
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.create",
+        "eventType.read",
+        "eventType.update",
+        "eventType.delete",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle universal wildcard (*.*)", async () => {
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "*",
+          action: "*",
+        },
+      });
+
+      // Should match any permission
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.create",
+        "team.delete",
+        "role.update",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should return false when not all permissions are matched", async () => {
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "role", action: "create" },
+          { roleId: testRoleId, resource: "role", action: "read" },
+        ],
+      });
+
+      // Missing eventType.update permission
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "role.create",
+        "role.read",
+        "eventType.update",
+      ]);
+
+      expect(result).toBe(false);
+    });
+
+    it("should return false for empty permissions array", async () => {
+      const result = await repository.checkRolePermissions(testRoleId, []);
+
+      expect(result).toBe(false);
+    });
+
+    it("should handle complex permission combinations", async () => {
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "*", action: "read" }, // wildcard resource
+          { roleId: testRoleId, resource: "eventType", action: "*" }, // wildcard action
+          { roleId: testRoleId, resource: "team", action: "invite" }, // exact match
+        ],
+      });
+
+      // All should match:
+      // - role.read matches wildcard resource
+      // - eventType.create matches wildcard action for eventType
+      // - team.invite matches exact pair
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "role.read",
+        "eventType.create",
+        "team.invite",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle permission pairs with same resource but different actions", async () => {
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "eventType", action: "create" },
+          { roleId: testRoleId, resource: "eventType", action: "update" },
+          { roleId: testRoleId, resource: "eventType", action: "delete" },
+        ],
+      });
+
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.create",
+        "eventType.update",
+        "eventType.delete",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should handle permission pairs with same action but different resources", async () => {
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "eventType", action: "create" },
+          { roleId: testRoleId, resource: "team", action: "create" },
+          { roleId: testRoleId, resource: "role", action: "create" },
+        ],
+      });
+
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.create",
+        "team.create",
+        "role.create",
+      ]);
+
+      expect(result).toBe(true);
+    });
+
+    it("should correctly count matching permissions", async () => {
+      await prisma.rolePermission.createMany({
+        data: [
+          { roleId: testRoleId, resource: "eventType", action: "create" },
+          { roleId: testRoleId, resource: "eventType", action: "read" },
+        ],
+      });
+
+      // Only 2 out of 3 permissions match
+      const result = await repository.checkRolePermissions(testRoleId, [
+        "eventType.create",
+        "eventType.read",
+        "eventType.update", // This one doesn't match
+      ]);
+
+      expect(result).toBe(false);
+    });
+
+    it("should handle role with no permissions", async () => {
+      const result = await repository.checkRolePermissions(testRoleId, ["eventType.create"]);
+
+      expect(result).toBe(false);
+    });
+
+    it("should handle non-existent role", async () => {
+      const result = await repository.checkRolePermissions("non-existent-role-id", ["eventType.create"]);
+
+      expect(result).toBe(false);
+    });
+
+    it("should reproduce the exact error scenario from the bug report", async () => {
+      // Create the exact permission from the error report
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "role",
+          action: "create",
+        },
+      });
+
+      // This is the exact call that was failing
+      const permissions: PermissionString[] = ["role.create"];
+      const result = await repository.checkRolePermissions(testRoleId, permissions);
+
+      // Should not throw serialization error and should return true
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("checkRolePermission (single)", () => {
+    it("should check single permission correctly", async () => {
+      await prisma.rolePermission.create({
+        data: {
+          roleId: testRoleId,
+          resource: "role",
+          action: "create",
+        },
+      });
+
+      const result = await repository.checkRolePermission(testRoleId, "role.create");
+
+      expect(result).toBe(true);
+    });
+
+    it("should return false for non-existent permission", async () => {
+      const result = await repository.checkRolePermission(testRoleId, "role.create");
+
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/packages/lib/entityPermissionUtils.server.ts b/packages/features/pbac/lib/entityPermissionUtils.server.ts
similarity index 100%
rename from packages/lib/entityPermissionUtils.server.ts
rename to packages/features/pbac/lib/entityPermissionUtils.server.ts
diff --git a/packages/features/pbac/services/__tests__/permission-check.service.test.ts b/packages/features/pbac/services/__tests__/permission-check.service.test.ts
index 9e9fe4bb731268..79a503f1c4133a 100644
--- a/packages/features/pbac/services/__tests__/permission-check.service.test.ts
+++ b/packages/features/pbac/services/__tests__/permission-check.service.test.ts
@@ -3,7 +3,7 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";
 import { vi, type Mock, describe, it, expect, beforeEach } from "vitest";
 
 import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import type { MembershipRole } from "@calcom/prisma/enums";
 
 import type { IPermissionRepository } from "../../domain/repositories/IPermissionRepository";
@@ -14,7 +14,7 @@ import type { PermissionService } from "../permission.service";
 
 vi.mock("../../infrastructure/repositories/PermissionRepository");
 vi.mock("@calcom/features/flags/features.repository");
-vi.mock("@calcom/lib/server/repository/membership");
+vi.mock("@calcom/features/membership/repositories/MembershipRepository");
 vi.mock("../permission.service");
 
 vi.mock("@calcom/prisma", () => ({
diff --git a/packages/features/pbac/services/permission-check.service.ts b/packages/features/pbac/services/permission-check.service.ts
index 2a09b5d3566411..56398690bfb437 100644
--- a/packages/features/pbac/services/permission-check.service.ts
+++ b/packages/features/pbac/services/permission-check.service.ts
@@ -1,6 +1,6 @@
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import logger from "@calcom/lib/logger";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import prisma from "@calcom/prisma";
 import type { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/packages/lib/server/checkRegularUsername.ts b/packages/features/profile/lib/checkRegularUsername.ts
similarity index 84%
rename from packages/lib/server/checkRegularUsername.ts
rename to packages/features/profile/lib/checkRegularUsername.ts
index 964c8c43bfb718..ff72e62aed626c 100644
--- a/packages/lib/server/checkRegularUsername.ts
+++ b/packages/features/profile/lib/checkRegularUsername.ts
@@ -1,8 +1,7 @@
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { isUsernameReservedDueToMigration } from "@calcom/lib/server/username";
 import slugify from "@calcom/lib/slugify";
 
-import { ProfileRepository } from "./repository/profile";
-import { isUsernameReservedDueToMigration } from "./username";
-
 export async function checkRegularUsername(_username: string, currentOrgDomain?: string | null) {
   const isCheckingUsernameInGlobalNamespace = !currentOrgDomain;
   const username = slugify(_username);
diff --git a/packages/lib/server/checkUsername.ts b/packages/features/profile/lib/checkUsername.ts
similarity index 83%
rename from packages/lib/server/checkUsername.ts
rename to packages/features/profile/lib/checkUsername.ts
index 1d57927f1e2fd2..0ab21d278ee748 100644
--- a/packages/lib/server/checkUsername.ts
+++ b/packages/features/profile/lib/checkUsername.ts
@@ -1,7 +1,7 @@
 import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
+import { usernameCheck as checkPremiumUsername } from "@calcom/lib/server/username";
 
 import { checkRegularUsername } from "./checkRegularUsername";
-import { usernameCheck as checkPremiumUsername } from "./username";
 
 // TODO: Replace `lib/checkPremiumUsername` with `usernameCheck` and then import checkPremiumUsername directly here.
 // We want to remove dependency on website for signup stuff as signup is now part of app.
diff --git a/packages/lib/createAProfileForAnExistingUser.ts b/packages/features/profile/lib/createAProfileForAnExistingUser.ts
similarity index 84%
rename from packages/lib/createAProfileForAnExistingUser.ts
rename to packages/features/profile/lib/createAProfileForAnExistingUser.ts
index a84eeb437cd95a..860e675fcc49c0 100644
--- a/packages/lib/createAProfileForAnExistingUser.ts
+++ b/packages/features/profile/lib/createAProfileForAnExistingUser.ts
@@ -1,14 +1,13 @@
 import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";
 import { RedirectType } from "@calcom/prisma/enums";
 
-import { getOrgUsernameFromEmail } from "../features/auth/signup/utils/getOrgUsernameFromEmail";
-import logger from "./logger";
-import { safeStringify } from "./safeStringify";
-
 const log = logger.getSubLogger({ prefix: ["lib", "createAProfileForAnExistingUser"] });
 export const createAProfileForAnExistingUser = async ({
   user,
diff --git a/packages/features/profile/lib/getBranding.test.ts b/packages/features/profile/lib/getBranding.test.ts
new file mode 100644
index 00000000000000..d904888ac5309f
--- /dev/null
+++ b/packages/features/profile/lib/getBranding.test.ts
@@ -0,0 +1,193 @@
+import { describe, expect, it } from "vitest";
+
+import { getBrandingForEventType, getBrandingForUser, getBrandingForTeam } from "./getBranding";
+
+describe("getBranding", () => {
+  describe("getBrandingForEventType", () => {
+    describe("team events", () => {
+      it("should use parent org branding when available", () => {
+        const eventType = {
+          team: {
+            name: "Team A",
+            brandColor: "#AAAAAA",
+            darkBrandColor: "#BBBBBB",
+            theme: "light",
+            parent: {
+              brandColor: "#111111",
+              darkBrandColor: "#222222",
+              theme: "dark",
+            },
+          },
+          users: [],
+        };
+
+        const result = getBrandingForEventType({ eventType });
+
+        expect(result).toEqual({
+          theme: "dark",
+          brandColor: "#111111",
+          darkBrandColor: "#222222",
+        });
+      });
+
+      it("should fallback to team branding when no parent", () => {
+        const eventType = {
+          team: {
+            name: "Team A",
+            brandColor: "#AAAAAA",
+            darkBrandColor: "#BBBBBB",
+            theme: "light",
+            parent: null,
+          },
+          users: [],
+        };
+
+        const result = getBrandingForEventType({ eventType });
+
+        expect(result).toEqual({
+          theme: "light",
+          brandColor: "#AAAAAA",
+          darkBrandColor: "#BBBBBB",
+        });
+      });
+    });
+
+    describe("personal events", () => {
+      it("should use organization branding when available", () => {
+        const eventType = {
+          team: null,
+          profile: {
+            organization: {
+              brandColor: "#111111",
+              darkBrandColor: "#222222",
+              theme: "dark",
+            },
+          },
+          users: [
+            {
+              theme: "light",
+              brandColor: "#AAAAAA",
+              darkBrandColor: "#BBBBBB",
+            },
+          ],
+        };
+
+        const result = getBrandingForEventType({ eventType });
+
+        expect(result).toEqual({
+          theme: "dark",
+          brandColor: "#111111",
+          darkBrandColor: "#222222",
+        });
+      });
+
+      it("should fallback to user branding when no organization", () => {
+        const eventType = {
+          team: null,
+          profile: {
+            organization: null,
+          },
+          users: [
+            {
+              theme: "light",
+              brandColor: "#AAAAAA",
+              darkBrandColor: "#BBBBBB",
+            },
+          ],
+        };
+
+        const result = getBrandingForEventType({ eventType });
+
+        expect(result).toEqual({
+          theme: "light",
+          brandColor: "#AAAAAA",
+          darkBrandColor: "#BBBBBB",
+        });
+      });
+    });
+  });
+
+  describe("getBrandingForUser", () => {
+    it("should use organization branding when available", () => {
+      const user = {
+        theme: "light",
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+        profile: {
+          organization: {
+            brandColor: "#111111",
+            darkBrandColor: "#222222",
+            theme: "dark",
+          },
+        },
+      };
+
+      const result = getBrandingForUser({ user });
+
+      expect(result).toEqual({
+        theme: "dark",
+        brandColor: "#111111",
+        darkBrandColor: "#222222",
+      });
+    });
+
+    it("should fallback to user branding when no organization", () => {
+      const user = {
+        theme: "light",
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+        profile: {
+          organization: null,
+        },
+      };
+
+      const result = getBrandingForUser({ user });
+
+      expect(result).toEqual({
+        theme: "light",
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+      });
+    });
+  });
+
+  describe("getBrandingForTeam", () => {
+    it("should use parent org branding when available", () => {
+      const team = {
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+        theme: "light",
+        parent: {
+          brandColor: "#111111",
+          darkBrandColor: "#222222",
+          theme: "dark",
+        },
+      };
+
+      const result = getBrandingForTeam({ team });
+
+      expect(result).toEqual({
+        theme: "dark",
+        brandColor: "#111111",
+        darkBrandColor: "#222222",
+      });
+    });
+
+    it("should fallback to team branding when no parent", () => {
+      const team = {
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+        theme: "light",
+        parent: null,
+      };
+
+      const result = getBrandingForTeam({ team });
+
+      expect(result).toEqual({
+        theme: "light",
+        brandColor: "#AAAAAA",
+        darkBrandColor: "#BBBBBB",
+      });
+    });
+  });
+});
diff --git a/packages/features/profile/lib/getBranding.ts b/packages/features/profile/lib/getBranding.ts
new file mode 100644
index 00000000000000..f8f0ca322544e5
--- /dev/null
+++ b/packages/features/profile/lib/getBranding.ts
@@ -0,0 +1,98 @@
+type EventTypeWithBranding = {
+  team?: {
+    name?: string;
+    brandColor?: string | null;
+    darkBrandColor?: string | null;
+    theme?: string | null;
+    parent?: {
+      brandColor?: string | null;
+      darkBrandColor?: string | null;
+      theme?: string | null;
+    } | null;
+  } | null;
+  profile?: {
+    organization?: {
+      brandColor?: string | null;
+      darkBrandColor?: string | null;
+      theme?: string | null;
+    } | null;
+  } | null;
+  users: Array<{
+    theme?: string | null;
+    brandColor?: string | null;
+    darkBrandColor?: string | null;
+  }>;
+};
+
+type UserWithBranding = {
+  theme?: string | null;
+  brandColor?: string | null;
+  darkBrandColor?: string | null;
+  profile: {
+    organization?: {
+      brandColor?: string | null;
+      darkBrandColor?: string | null;
+      theme?: string | null;
+    } | null;
+  };
+};
+
+type TeamWithBranding = {
+  brandColor?: string | null;
+  darkBrandColor?: string | null;
+  theme?: string | null;
+  parent?: {
+    brandColor?: string | null;
+    darkBrandColor?: string | null;
+    theme?: string | null;
+  } | null;
+};
+
+type BrandingResult = {
+  theme: string | null;
+  brandColor: string | null;
+  darkBrandColor: string | null;
+};
+
+export function getBrandingForEventType(params: { eventType: EventTypeWithBranding }): BrandingResult {
+  const { eventType } = params;
+
+  if (eventType.team) {
+    const brandColorData =
+      eventType.team.parent?.brandColor || eventType.team.parent?.darkBrandColor
+        ? eventType.team.parent
+        : eventType.team;
+    return {
+      theme: eventType.team.parent?.theme ?? eventType.team.theme ?? null,
+      brandColor: brandColorData.brandColor ?? null,
+      darkBrandColor: brandColorData.darkBrandColor ?? null,
+    };
+  }
+
+  const branding = eventType.profile?.organization ?? eventType.users[0];
+  return {
+    theme: branding?.theme ?? null,
+    brandColor: branding?.brandColor ?? null,
+    darkBrandColor: branding?.darkBrandColor ?? null,
+  };
+}
+
+export function getBrandingForUser(params: { user: UserWithBranding }): BrandingResult {
+  const { user } = params;
+  const branding = user.profile.organization ?? user;
+  return {
+    theme: branding.theme ?? null,
+    brandColor: branding.brandColor ?? null,
+    darkBrandColor: branding.darkBrandColor ?? null,
+  };
+}
+
+export function getBrandingForTeam(params: { team: TeamWithBranding }): BrandingResult {
+  const { team } = params;
+  const brandColorData = team.parent?.brandColor || team.parent?.darkBrandColor ? team.parent : team;
+  return {
+    theme: team.parent?.theme ?? team.theme ?? null,
+    brandColor: brandColorData.brandColor ?? null,
+    darkBrandColor: brandColorData.darkBrandColor ?? null,
+  };
+}
diff --git a/packages/lib/hideBranding.ts b/packages/features/profile/lib/hideBranding.ts
similarity index 71%
rename from packages/lib/hideBranding.ts
rename to packages/features/profile/lib/hideBranding.ts
index 745d087ee5cacc..e82c2ecf4d8169 100644
--- a/packages/lib/hideBranding.ts
+++ b/packages/features/profile/lib/hideBranding.ts
@@ -1,7 +1,12 @@
-import logger from "./logger";
-import { ProfileRepository } from "./server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import logger from "@calcom/lib/logger";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { prisma } from "@calcom/prisma";
 
 const log = logger.getSubLogger({ name: "hideBranding" });
+const teamRepository = new TeamRepository(prisma);
+const userRepository = new UserRepository(prisma);
 type Team = {
   hideBranding: boolean | null;
   parent: {
@@ -39,6 +44,41 @@ function resolveHideBranding(options: {
   return options.entityHideBranding ?? false;
 }
 
+/**
+ * Get hideBranding value for a user or team by their IDs
+ */
+export async function getHideBranding({
+  userId,
+  teamId,
+}: {
+  userId?: number;
+  teamId?: number;
+}): Promise<boolean> {
+  if (teamId) {
+    // Get team data with parent organization
+    const team = await teamRepository.findTeamWithParentHideBranding({ teamId });
+
+    if (!team) return false;
+
+    return resolveHideBranding({
+      entityHideBranding: team.hideBranding,
+      organizationHideBranding: team.parent?.hideBranding ?? null,
+    });
+  } else if (userId) {
+    // Get user data with profile and organization
+    const user = await userRepository.findUserWithHideBranding({ userId });
+
+    if (!user) return false;
+
+    return resolveHideBranding({
+      entityHideBranding: user.hideBranding,
+      organizationHideBranding: user.profiles?.[0]?.organization?.hideBranding,
+    });
+  }
+
+  return false;
+}
+
 /**
  * Determines if branding should be hidden for an event that could be a team event or user event
  */
diff --git a/packages/lib/server/repository/profile.ts b/packages/features/profile/repositories/ProfileRepository.ts
similarity index 96%
rename from packages/lib/server/repository/profile.ts
rename to packages/features/profile/repositories/ProfileRepository.ts
index 461326a2027092..4d3b6f2607af81 100644
--- a/packages/lib/server/repository/profile.ts
+++ b/packages/features/profile/repositories/ProfileRepository.ts
@@ -3,7 +3,9 @@ import { v4 as uuidv4 } from "uuid";
 import { whereClauseForOrgWithSlugOrRequestedSlug } from "@calcom/ee/organizations/lib/orgDomains";
 import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
 import { DATABASE_CHUNK_SIZE } from "@calcom/lib/constants";
+import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
+import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";
 import prisma from "@calcom/prisma";
 import type { User as PrismaUser } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
@@ -11,9 +13,6 @@ import type { Team } from "@calcom/prisma/client";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import type { UpId, UserAsPersonalProfile, UserProfile } from "@calcom/types/UserProfile";
 
-import logger from "../../logger";
-import { getParsedTeam } from "./teamUtils";
-
 const userSelect = {
   name: true,
   avatarUrl: true,
@@ -51,6 +50,9 @@ const organizationSelect = {
   bannerUrl: true,
   isPlatform: true,
   hideBranding: true,
+  brandColor: true,
+  darkBrandColor: true,
+  theme: true,
 };
 const organizationWithSettingsSelect = {
   ...organizationSelect,
@@ -59,6 +61,17 @@ const organizationWithSettingsSelect = {
   },
 };
 
+const profileSelect = {
+  id: true,
+  uid: true,
+  userId: true,
+  organizationId: true,
+  username: true,
+  createdAt: true,
+  updatedAt: true,
+};
+
+
 export enum LookupTarget {
   User,
   Profile,
@@ -486,6 +499,9 @@ export class ProfileRepository {
             isPrivate: true,
             isPlatform: true,
             hideBranding: true,
+            brandColor: true,
+            darkBrandColor: true,
+            theme: true,
             organizationSettings: {
               select: {
                 lockEventTypeCreationForUsers: true,
@@ -628,6 +644,15 @@ export class ProfileRepository {
     return profiles;
   }
 
+  static async findFirstForUserId({ userId }: { userId: number }) {
+    return prisma.profile.findFirst({
+      where: {
+        userId: userId,
+      },
+      select: profileSelect,
+    });
+  }
+
   static async findManyForOrg({ organizationId }: { organizationId: number }) {
     return await prisma.profile.findMany({
       where: {
diff --git a/packages/features/routing-forms/lib/getRoutedUrl.test.ts b/packages/features/routing-forms/lib/getRoutedUrl.test.ts
index 5c6bcb23cca95d..25b0bf4d5b1dff 100644
--- a/packages/features/routing-forms/lib/getRoutedUrl.test.ts
+++ b/packages/features/routing-forms/lib/getRoutedUrl.test.ts
@@ -14,7 +14,7 @@ import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomain
 import { isAuthorizedToViewFormOnOrgDomain } from "@calcom/features/routing-forms/lib/isAuthorizedToViewForm";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import { PrismaRoutingFormRepository } from "@calcom/lib/server/repository/PrismaRoutingFormRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 
 import { getRoutedUrl } from "./getRoutedUrl";
 import { getUrlSearchParamsToForward } from "./getUrlSearchParamsToForward";
@@ -24,7 +24,7 @@ vi.mock("./getUrlSearchParamsToForward");
 vi.mock("@calcom/lib/checkRateLimitAndThrowError");
 vi.mock("@calcom/app-store/routing-forms/lib/handleResponse");
 vi.mock("@calcom/lib/server/repository/PrismaRoutingFormRepository");
-vi.mock("@calcom/lib/server/repository/user", () => {
+vi.mock("@calcom/features/users/repositories/UserRepository", () => {
   return {
     UserRepository: vi.fn().mockImplementation(() => ({
       enrichUserWithItsProfile: vi.fn(),
diff --git a/packages/features/routing-forms/lib/getRoutedUrl.ts b/packages/features/routing-forms/lib/getRoutedUrl.ts
index a357011f750dc6..cb58c40f847d0e 100644
--- a/packages/features/routing-forms/lib/getRoutedUrl.ts
+++ b/packages/features/routing-forms/lib/getRoutedUrl.ts
@@ -21,7 +21,7 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import { PrismaRoutingFormRepository } from "@calcom/lib/server/repository/PrismaRoutingFormRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { TRPCError } from "@trpc/server";
 
diff --git a/packages/features/schedules/components/DateOverrideInputDialog.tsx b/packages/features/schedules/components/DateOverrideInputDialog.tsx
index b4d0e31f92b326..84d9035729ed0e 100644
--- a/packages/features/schedules/components/DateOverrideInputDialog.tsx
+++ b/packages/features/schedules/components/DateOverrideInputDialog.tsx
@@ -26,6 +26,7 @@ const DateOverrideForm = ({
   onChange,
   userTimeFormat,
   weekStart,
+  isDryRun = false,
 }: {
   workingHours?: WorkingHours[];
   onChange: (newValue: TimeRange[]) => void;
@@ -34,6 +35,7 @@ const DateOverrideForm = ({
   onClose?: () => void;
   userTimeFormat: number | null;
   weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+  isDryRun?: boolean;
 }) => {
   const [browsingDate, setBrowsingDate] = useState<Dayjs>();
   const { t, i18n, isLocaleReady } = useLocale();
@@ -109,6 +111,11 @@ const DateOverrideForm = ({
 
         if (selectedDates.length === 0) return;
 
+        if (isDryRun) {
+          setSelectedDates([]);
+          return;
+        }
+
         if (datesUnavailable) {
           selectedDates.map((date) => {
             datesInRanges.push({
@@ -116,6 +123,7 @@ const DateOverrideForm = ({
               end: date.utc(true).startOf("day").toDate(),
             });
           });
+          onChange(datesInRanges);
         } else {
           selectedDates.map((date) => {
             values.range.map((item) => {
@@ -129,9 +137,9 @@ const DateOverrideForm = ({
               });
             });
           });
+          onChange(datesInRanges);
         }
 
-        onChange(datesInRanges);
         setSelectedDates([]);
       }}
       className="p-6 sm:flex sm:p-0 xl:flex-row">
@@ -215,6 +223,7 @@ const DateOverrideInputDialog = ({
   userTimeFormat: number | null;
   weekStart?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
   className?: string;
+  isDryRun?: boolean;
 }) => {
   const [open, setOpen] = useState(false);
   return (
diff --git a/packages/features/schedules/components/DateOverrideList.tsx b/packages/features/schedules/components/DateOverrideList.tsx
index 9f0c8b2fbcd70f..a81a899d2a62c2 100644
--- a/packages/features/schedules/components/DateOverrideList.tsx
+++ b/packages/features/schedules/components/DateOverrideList.tsx
@@ -27,6 +27,7 @@ const DateOverrideList = ({
   fields,
   weekStart = 0,
   handleAvailabilityUpdate = noop,
+  isDryRun = false,
 }: {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   replace: any;
@@ -38,6 +39,7 @@ const DateOverrideList = ({
   travelSchedules?: RouterOutputs["viewer"]["travelSchedules"]["get"];
   weekStart?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
   handleAvailabilityUpdate?: VoidFunction;
+  isDryRun?: boolean;
 }) => {
   const { t, i18n } = useLocale();
   const isPlatform = useIsPlatform();
@@ -109,10 +111,12 @@ const DateOverrideList = ({
               }))}
               weekStart={weekStart}
               onChange={(ranges) => {
-                // update has very weird side-effects with sorting.
-                replace([...fields.filter((currentItem) => currentItem.id !== item.id), { ranges }]);
-                delete unsortedFieldArrayMap[item.id];
-                handleAvailabilityUpdate();
+                if (!isDryRun) {
+                  // update has very weird side-effects with sorting.
+                  replace([...fields.filter((currentItem) => currentItem.id !== item.id), { ranges }]);
+                  delete unsortedFieldArrayMap[item.id];
+                  handleAvailabilityUpdate();
+                }
               }}
               Trigger={
                 <DialogTrigger asChild>
@@ -145,7 +149,9 @@ const DateOverrideList = ({
                 StartIcon="trash-2"
                 onClick={() => {
                   replace([...fields.filter((currentItem) => currentItem.id !== item.id)]);
-                  handleAvailabilityUpdate();
+                  if (!isDryRun) {
+                    handleAvailabilityUpdate();
+                  }
                 }}
               />
             </Tooltip>
diff --git a/packages/features/schedules/components/ScheduleListItem.tsx b/packages/features/schedules/components/ScheduleListItem.tsx
index 1f869e0d8dc728..d8e6cafd0d5c21 100644
--- a/packages/features/schedules/components/ScheduleListItem.tsx
+++ b/packages/features/schedules/components/ScheduleListItem.tsx
@@ -26,6 +26,7 @@ export function ScheduleListItem({
   updateDefault,
   isDeletable,
   duplicateFunction,
+  redirectUrl,
 }: {
   schedule: RouterOutputs["viewer"]["availability"]["list"]["schedules"][number];
   deleteFunction: ({ scheduleId }: { scheduleId: number }) => void;
@@ -37,6 +38,7 @@ export function ScheduleListItem({
   isDeletable: boolean;
   updateDefault: ({ scheduleId, isDefault }: { scheduleId: number; isDefault: boolean }) => void;
   duplicateFunction: ({ scheduleId }: { scheduleId: number }) => void;
+  redirectUrl: string;
 }) {
   const { t, i18n } = useLocale();
 
@@ -44,10 +46,7 @@ export function ScheduleListItem({
     <li key={schedule.id}>
       <div className="hover:bg-muted flex items-center justify-between px-3 py-5 transition sm:px-4">
         <div className="group flex w-full items-center justify-between ">
-          <Link
-            href={`/availability/${schedule.id}`}
-            className="flex-grow truncate text-sm"
-            title={schedule.name}>
+          <Link href={redirectUrl} className="flex-grow truncate text-sm" title={schedule.name}>
             <div className="space-x-2 rtl:space-x-reverse">
               <span className="text-emphasis truncate font-medium">{schedule.name}</span>
               {schedule.isDefault && (
diff --git a/packages/lib/date-ranges.test.ts b/packages/features/schedules/lib/date-ranges.test.ts
similarity index 100%
rename from packages/lib/date-ranges.test.ts
rename to packages/features/schedules/lib/date-ranges.test.ts
diff --git a/packages/lib/date-ranges.ts b/packages/features/schedules/lib/date-ranges.ts
similarity index 100%
rename from packages/lib/date-ranges.ts
rename to packages/features/schedules/lib/date-ranges.ts
diff --git a/packages/lib/slots.test.ts b/packages/features/schedules/lib/slots.test.ts
similarity index 99%
rename from packages/lib/slots.test.ts
rename to packages/features/schedules/lib/slots.test.ts
index 1a1f1527a38874..35a32a6a1c48cb 100644
--- a/packages/lib/slots.test.ts
+++ b/packages/features/schedules/lib/slots.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it, beforeAll, vi } from "vitest";
 
 import dayjs from "@calcom/dayjs";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 
-import type { DateRange } from "./date-ranges";
 import getSlots from "./slots";
 
 let dateRangesNextDay: DateRange[];
diff --git a/packages/lib/slots.ts b/packages/features/schedules/lib/slots.ts
similarity index 95%
rename from packages/lib/slots.ts
rename to packages/features/schedules/lib/slots.ts
index fdd95575698026..00cc3a9402d9ec 100644
--- a/packages/lib/slots.ts
+++ b/packages/features/schedules/lib/slots.ts
@@ -5,11 +5,10 @@ import type {
   IOutOfOfficeData,
   IToUser,
 } from "@calcom/features/availability/lib/getUserAvailability";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
+import { getTimeZone } from "@calcom/lib/dayjs";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 
-import type { DateRange } from "./date-ranges";
-import { getTimeZone } from "./dayjs";
-
 export type GetSlots = {
   inviteeDate: Dayjs;
   frequency: number;
@@ -137,6 +136,11 @@ function buildSlotsWithDateRanges({
     // This prevents issues with half-hour offset timezones like Asia/Kolkata (GMT+5:30)
     slotStartTime = slotStartTime.tz(timeZone);
 
+    // Convert to target timezone BEFORE checking if rounding is needed
+    // This ensures we check minute alignment in the local timezone, not UTC
+    // This prevents issues with half-hour offset timezones like Asia/Kolkata (GMT+5:30)
+    slotStartTime = slotStartTime.tz(timeZone);
+
     if (slotStartTime.minute() % interval !== 0) {
       slotStartTime = getCorrectedSlotStartTime({
         showOptimizedSlots,
diff --git a/packages/features/shell/SideBar.tsx b/packages/features/shell/SideBar.tsx
index 46eb75661d58ae..98fefdcedf345f 100644
--- a/packages/features/shell/SideBar.tsx
+++ b/packages/features/shell/SideBar.tsx
@@ -6,7 +6,7 @@ import { usePathname } from "next/navigation";
 
 import { IS_VISUAL_REGRESSION_TESTING, ENABLE_PROFILE_SWITCHER } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { UserPermissionRole } from "@calcom/prisma/enums";
 import classNames from "@calcom/ui/classNames";
diff --git a/packages/features/tasker/tasker.ts b/packages/features/tasker/tasker.ts
index 8d145eeacbf5ce..4808c17cfdf39a 100644
--- a/packages/features/tasker/tasker.ts
+++ b/packages/features/tasker/tasker.ts
@@ -14,6 +14,9 @@ type TaskPayloads = {
   triggerFormSubmittedNoEventWebhook: z.infer<
     typeof import("./tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook").ZTriggerFormSubmittedNoEventWebhookPayloadSchema
   >;
+  triggerFormSubmittedNoEventWorkflow: z.infer<
+    typeof import("./tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow").ZTriggerFormSubmittedNoEventWorkflowPayloadSchema
+  >;
   translateEventTypeData: z.infer<
     typeof import("./tasks/translateEventTypeData").ZTranslateEventDataPayloadSchema
   >;
diff --git a/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts b/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts
index 17864c78ce3393..410e7576a763cd 100644
--- a/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts
+++ b/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts
@@ -1,6 +1,6 @@
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 
 import AnalyticsManager from "./analyticsManager";
 import { sendAnalyticsEventSchema } from "./schema";
diff --git a/packages/features/tasker/tasks/index.ts b/packages/features/tasker/tasks/index.ts
index 2bff98c396c138..640caa3deedf1d 100644
--- a/packages/features/tasker/tasks/index.ts
+++ b/packages/features/tasker/tasks/index.ts
@@ -18,6 +18,10 @@ const tasks: Record<TaskTypes, () => Promise<TaskHandler>> = {
     import("./triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook").then(
       (module) => module.triggerFormSubmittedNoEventWebhook
     ),
+  triggerFormSubmittedNoEventWorkflow: () =>
+    import("./triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow").then(
+      (module) => module.triggerFormSubmittedNoEventWorkflow
+    ),
   sendSms: () => Promise.resolve(() => Promise.reject(new Error("Not implemented"))),
   translateEventTypeData: () =>
     import("./translateEventTypeData").then((module) => module.translateEventTypeData),
diff --git a/packages/features/tasker/tasks/scanWorkflowBody.test.ts b/packages/features/tasker/tasks/scanWorkflowBody.test.ts
index d3ea6699e89399..2456dd5d0201a1 100644
--- a/packages/features/tasker/tasks/scanWorkflowBody.test.ts
+++ b/packages/features/tasker/tasks/scanWorkflowBody.test.ts
@@ -2,13 +2,13 @@ import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
 
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
-import { lockUser, LockReason } from "@calcom/lib/autoLock";
+import { lockUser, LockReason } from "@calcom/features/ee/api-keys/lib/autoLock";
 import { scheduleWorkflowNotifications } from "@calcom/trpc/server/routers/viewer/workflows/util";
 
 import { scanWorkflowBody, iffyScanBody } from "./scanWorkflowBody";
 
-vi.mock("@calcom/lib/autoLock", async (importActual) => {
-  const actual = await importActual<typeof import("@calcom/lib/autoLock")>();
+vi.mock("@calcom/features/ee/api-keys/lib/autoLock", async (importActual) => {
+  const actual = await importActual<typeof import("@calcom/features/ee/api-keys/lib/autoLock")>();
   return {
     ...actual, // Keep all original exports
     lockUser: vi.fn(), // Override just the lockUser function
diff --git a/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/formSubmissionValidation.ts b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/formSubmissionValidation.ts
new file mode 100644
index 00000000000000..82098271e4fbd3
--- /dev/null
+++ b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/formSubmissionValidation.ts
@@ -0,0 +1,96 @@
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
+import prisma from "@calcom/prisma";
+
+export interface ValidationOptions {
+  responseId: number;
+  formId: string;
+  responses: any;
+  submittedAt?: Date;
+}
+
+export interface ValidationResult {
+  skip: boolean;
+  reason?: string;
+}
+
+/**
+ * Check if trigger should be skipped due to booking creation or duplicate submission
+ */
+export async function shouldTriggerFormSubmittedNoEvent(options: ValidationOptions) {
+  const { formId, responseId, responses, submittedAt } = options;
+
+  const bookingRepository = new BookingRepository(prisma);
+
+  // Check if a booking was created from this form response
+  const bookingFromResponse = await bookingRepository.findFirstBookingFromResponse({ responseId });
+
+  if (bookingFromResponse) return false;
+
+  // Check for duplicate form submissions
+  const hasDuplicate = await hasDuplicateSubmission({ formId, responseId, responses, submittedAt });
+  if (hasDuplicate) {
+    return false;
+  }
+
+  return true;
+}
+
+export function getSubmitterEmail(responses: any) {
+  const submitterEmail = Object.values(responses).find(
+    (response): response is { value: string; label: string } => {
+      const value =
+        typeof response === "object" && response && "value" in response ? response.value : response;
+      return typeof value === "string" && value.includes("@");
+    }
+  )?.value;
+  return submitterEmail;
+}
+
+/**
+ * Check for duplicate form submissions within the last 60 minutes
+ */
+async function hasDuplicateSubmission({
+  formId,
+  responses,
+  responseId,
+  submittedAt,
+}: {
+  formId: string;
+  responses: any;
+  responseId: number;
+  submittedAt?: Date;
+}): Promise<boolean> {
+  const submitterEmail = getSubmitterEmail(responses);
+
+  if (!submitterEmail) return false;
+
+  const date = submittedAt ?? new Date();
+  const formResponseRepository = new RoutingFormResponseRepository(prisma);
+
+  const sixtyMinutesAgo = new Date(date.getTime() - 60 * 60 * 1000);
+
+  const recentResponses = await formResponseRepository.findAllResponsesWithBooking({
+    formId,
+    responseId,
+    createdAfter: sixtyMinutesAgo,
+    createdBefore: new Date(),
+  });
+
+  // Check if there's a duplicate email in recent responses
+  return recentResponses.some((response) => {
+    if (!response.response || typeof response.response !== "object") return false;
+
+    return Object.values(response.response as Record<string, { value: string; label: string }>).some(
+      (field) => {
+        return (
+          typeof field === "object" &&
+          field &&
+          "value" in field &&
+          typeof field.value === "string" &&
+          field.value.toLowerCase() === submitterEmail.toLowerCase()
+        );
+      }
+    );
+  });
+}
diff --git a/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook.ts b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook.ts
index d93d3b09efe85f..e41a34f7623339 100644
--- a/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook.ts
+++ b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWebhook.ts
@@ -5,6 +5,8 @@ import incompleteBookingActionFunctions from "@calcom/app-store/routing-forms/li
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
 import prisma from "@calcom/prisma";
 
+import { getSubmitterEmail, shouldTriggerFormSubmittedNoEvent } from "./formSubmissionValidation";
+
 export type ResponseData = {
   responseId: number;
   responses: FORM_SUBMITTED_WEBHOOK_RESPONSES;
@@ -40,59 +42,14 @@ export const ZTriggerFormSubmittedNoEventWebhookPayloadSchema = z.object({
 export async function triggerFormSubmittedNoEventWebhook(payload: string): Promise<void> {
   const { webhook, responseId, form, redirect, responses } =
     ZTriggerFormSubmittedNoEventWebhookPayloadSchema.parse(JSON.parse(payload));
-  const bookingFromResponse = await prisma.booking.findFirst({
-    where: {
-      routedFromRoutingFormReponse: {
-        id: responseId,
-      },
-    },
-  });
-
-  if (bookingFromResponse) {
-    return;
-  }
 
-  const sixtyMinutesAgo = new Date(Date.now() - 60 * 60 * 1000);
-  const recentResponses =
-    (await prisma.app_RoutingForms_FormResponse.findMany({
-      where: {
-        formId: form.id,
-        createdAt: {
-          gte: sixtyMinutesAgo,
-          lt: new Date(),
-        },
-        routedToBookingUid: {
-          not: null,
-        },
-        NOT: {
-          id: responseId,
-        },
-      },
-    })) ?? [];
-
-  const emailValue = Object.values(responses).find(
-    (response): response is { value: string; label: string } => {
-      const value =
-        typeof response === "object" && response && "value" in response ? response.value : response;
-      return typeof value === "string" && value.includes("@");
-    }
-  )?.value;
-  // Check for duplicate email in recent responses
-  const hasDuplicate =
-    emailValue &&
-    recentResponses.some((response) => {
-      return Object.values(response.response as Record<string, { value: string; label: string }>).some(
-        (field) => {
-          if (!response.response || typeof response.response !== "object") return false;
-
-          return typeof field.value === "string" && field.value.toLowerCase() === emailValue.toLowerCase();
-        }
-      );
-    });
+  const shouldTrigger = await shouldTriggerFormSubmittedNoEvent({
+    formId: form.id,
+    responses,
+    responseId,
+  });
 
-  if (hasDuplicate) {
-    return;
-  }
+  if (!shouldTrigger) return;
 
   await sendGenericWebhookPayload({
     secretKey: webhook.secret,
@@ -125,6 +82,7 @@ export async function triggerFormSubmittedNoEventWebhook(payload: string): Promi
       // Get action function
       const bookingActionFunction = incompleteBookingActionFunctions[actionType];
 
+      const emailValue = getSubmitterEmail(responses);
       if (emailValue) {
         await bookingActionFunction(incompleteBookingAction, emailValue);
       }
diff --git a/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.test.ts b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.test.ts
new file mode 100644
index 00000000000000..d4777a6d55e460
--- /dev/null
+++ b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.test.ts
@@ -0,0 +1,177 @@
+import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";
+
+import { describe, expect, it, beforeEach, vi } from "vitest";
+import type { z } from "zod";
+
+import { scheduleWorkflowReminders } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
+import type { ZTriggerFormSubmittedNoEventWorkflowPayloadSchema } from "@calcom/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow";
+import { triggerFormSubmittedNoEventWorkflow } from "@calcom/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow";
+import { WorkflowTriggerEvents, WorkflowActions, WorkflowTemplates, TimeUnit } from "@calcom/prisma/enums";
+
+import { shouldTriggerFormSubmittedNoEvent } from "./formSubmissionValidation";
+
+// Mock the scheduleWorkflowReminders function
+vi.mock("@calcom/ee/workflows/lib/reminders/reminderScheduler", () => ({
+  scheduleWorkflowReminders: vi.fn(() => Promise.resolve()),
+}));
+
+// Mock the form submission validation
+vi.mock("./formSubmissionValidation", () => ({
+  shouldTriggerFormSubmittedNoEvent: vi.fn(() => Promise.resolve(true)),
+}));
+
+// Mock the logger
+vi.mock("@calcom/lib/logger", () => ({
+  default: {
+    getSubLogger: vi.fn(() => ({ error: vi.fn() })),
+    error: vi.fn(),
+  },
+}));
+
+const mockScheduleWorkflowReminders = vi.mocked(scheduleWorkflowReminders);
+const mockShouldTriggerFormSubmittedNoEvent = vi.mocked(shouldTriggerFormSubmittedNoEvent);
+
+type WorkflowPayload = z.infer<typeof ZTriggerFormSubmittedNoEventWorkflowPayloadSchema>;
+
+function expectFormSubmittedNoEventWorkflowToBeCalled(payload: WorkflowPayload) {
+  expect(mockScheduleWorkflowReminders).toHaveBeenCalledWith(
+    expect.objectContaining({
+      workflows: [payload.workflow],
+      formData: {
+        responses: payload.responses,
+        user: {
+          email: payload.form.user.email,
+          timeFormat: payload.form.user.timeFormat,
+          locale: payload.form.user.locale ?? "en",
+        },
+      },
+      hideBranding: payload.hideBranding,
+      smsReminderNumber: payload.smsReminderNumber,
+    })
+  );
+}
+
+describe("Form submitted, no event booked workflow trigger", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // Mock the form response queries to return empty arrays by default
+    prismaMock.app_RoutingForms_FormResponse.findMany.mockResolvedValue([]);
+  });
+
+  it(`should trigger workflow when form was submitted but no booking was made`, async () => {
+    const payload: WorkflowPayload = {
+      responseId: 1,
+      form: {
+        id: "1234",
+        userId: 1,
+        teamId: null,
+        fields: [{ type: "text", identifier: "Test field 1" }],
+        user: {
+          email: "test@example.com",
+          timeFormat: 12,
+          locale: "en",
+        },
+      },
+      responses: {
+        "Test field 1": {
+          value: "Test input 1",
+          response: "Test input 1",
+        },
+      },
+      hideBranding: false,
+      smsReminderNumber: null,
+      submittedAt: new Date("2024-01-01T10:00:00Z"),
+      workflow: {
+        id: 1,
+        name: "Test Workflow 1",
+        teamId: null,
+        trigger: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
+        time: 15,
+        timeUnit: TimeUnit.MINUTE,
+        userId: 1,
+        steps: [
+          {
+            id: 1,
+            action: WorkflowActions.EMAIL_ATTENDEE,
+            sendTo: null,
+            template: WorkflowTemplates.CUSTOM,
+            reminderBody: "Follow up on your form submission",
+            emailSubject: "Follow Up",
+            sender: null,
+            includeCalendarEvent: false,
+            numberVerificationPending: false,
+            numberRequired: false,
+            verifiedAt: null,
+          },
+        ],
+      },
+    };
+    const payloadString = JSON.stringify(payload);
+
+    // Mock that no booking exists
+    prismaMock.booking.findFirst.mockResolvedValue(null);
+
+    await triggerFormSubmittedNoEventWorkflow(payloadString);
+
+    expectFormSubmittedNoEventWorkflowToBeCalled(payload);
+  });
+
+  it(`should not trigger workflow when form was submitted and also booking was made after`, async () => {
+    const payload: WorkflowPayload = {
+      responseId: 2,
+      form: {
+        id: "6789",
+        userId: 2,
+        teamId: null,
+        fields: [{ type: "text", identifier: "Test field 2" }],
+        user: {
+          email: "test2@example.com",
+          timeFormat: 24,
+          locale: "en",
+        },
+      },
+      responses: {
+        "Test field 2": {
+          value: "Test input 2",
+          response: "Test input 2",
+        },
+      },
+      hideBranding: false,
+      smsReminderNumber: null,
+      submittedAt: new Date("2024-01-01T11:00:00Z"),
+      workflow: {
+        id: 2,
+        name: "Test Workflow 2",
+        teamId: null,
+        trigger: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
+        time: 30,
+        timeUnit: TimeUnit.MINUTE,
+        userId: 2,
+        steps: [
+          {
+            id: 2,
+            action: WorkflowActions.SMS_ATTENDEE,
+            sendTo: null,
+            template: WorkflowTemplates.CUSTOM,
+            reminderBody: "SMS follow up",
+            emailSubject: null,
+            sender: null,
+            includeCalendarEvent: false,
+            numberVerificationPending: false,
+            numberRequired: false,
+            verifiedAt: null,
+          },
+        ],
+      },
+    };
+    const payloadString = JSON.stringify(payload);
+
+    // Mock that validation should not trigger (booking exists)
+    mockShouldTriggerFormSubmittedNoEvent.mockResolvedValue(false);
+
+    await triggerFormSubmittedNoEventWorkflow(payloadString);
+
+    // Should not call scheduleWorkflowReminders when validation fails
+    expect(mockScheduleWorkflowReminders).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.ts b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.ts
new file mode 100644
index 00000000000000..2608ccc8b891e3
--- /dev/null
+++ b/packages/features/tasker/tasks/triggerFormSubmittedNoEvent/triggerFormSubmittedNoEventWorkflow.ts
@@ -0,0 +1,58 @@
+import { z } from "zod";
+
+import { scheduleWorkflowReminders } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
+import type { Workflow } from "@calcom/ee/workflows/lib/types";
+import logger from "@calcom/lib/logger";
+import { ZWorkflow } from "@calcom/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema";
+
+import { shouldTriggerFormSubmittedNoEvent } from "./formSubmissionValidation";
+
+const log = logger.getSubLogger({ prefix: ["[tasker] triggerFormSubmittedNoEventWorkflow"] });
+
+export const ZTriggerFormSubmittedNoEventWorkflowPayloadSchema = z.object({
+  responseId: z.number(),
+  responses: z.any(),
+  form: z.object({
+    id: z.string(),
+    userId: z.number(),
+    teamId: z.number().nullable().optional(),
+    fields: z.array(z.object({ type: z.string(), identifier: z.string().optional() })).optional(),
+    user: z.object({
+      email: z.string(),
+      timeFormat: z.number().nullable(),
+      locale: z.string().nullable(),
+    }),
+  }),
+  hideBranding: z.boolean(),
+  smsReminderNumber: z.string().nullable(),
+  workflow: ZWorkflow,
+  submittedAt: z.coerce.date(),
+});
+
+export async function triggerFormSubmittedNoEventWorkflow(payload: string): Promise<void> {
+  const { responseId, form, responses, smsReminderNumber, hideBranding, workflow, submittedAt } =
+    ZTriggerFormSubmittedNoEventWorkflowPayloadSchema.parse(JSON.parse(payload));
+
+  const shouldTrigger = await shouldTriggerFormSubmittedNoEvent({
+    formId: form.id,
+    responseId,
+    responses,
+    submittedAt,
+  });
+
+  if (!shouldTrigger) return;
+
+  try {
+    await scheduleWorkflowReminders({
+      smsReminderNumber,
+      formData: {
+        responses,
+        user: { email: form.user.email, timeFormat: form.user.timeFormat, locale: form.user.locale ?? "en" },
+      },
+      hideBranding,
+      workflows: [workflow as Workflow],
+    });
+  } catch (error) {
+    log.error("Error while triggering form submitted no event workflows", JSON.stringify({ error }));
+  }
+}
diff --git a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
index 31dc02d01d7341..75a12ce69e9014 100644
--- a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
+++ b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
@@ -10,7 +10,7 @@ import { DataTableProvider } from "@calcom/features/data-table/DataTableProvider
 import { DataTable, DataTableToolbar } from "@calcom/features/data-table/components";
 import { useDataTable } from "@calcom/features/data-table/hooks";
 import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import type { DateRange } from "@calcom/lib/date-ranges";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
 import type { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/features/timezone-buddy/components/TimeDial.tsx b/packages/features/timezone-buddy/components/TimeDial.tsx
index b8810522e9f3a2..e9f26d10734fdc 100644
--- a/packages/features/timezone-buddy/components/TimeDial.tsx
+++ b/packages/features/timezone-buddy/components/TimeDial.tsx
@@ -4,7 +4,7 @@ import { useStore } from "zustand";
 
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
-import type { DateRange } from "@calcom/lib/date-ranges";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
 import classNames from "@calcom/ui/classNames";
 
 import { DAY_CELL_WIDTH } from "../constants";
diff --git a/packages/features/troubleshooter/components/LargeCalendar.tsx b/packages/features/troubleshooter/components/LargeCalendar.tsx
index 28ba9f2935e66a..6ffd5ea060943f 100644
--- a/packages/features/troubleshooter/components/LargeCalendar.tsx
+++ b/packages/features/troubleshooter/components/LargeCalendar.tsx
@@ -122,6 +122,7 @@ export const LargeCalendar = ({ extraDays }: { extraDays: number }) => {
         gridCellsPerHour={60 / (event?.duration || 15)}
         hoverEventDuration={30}
         hideHeader
+        timezone={timezone}
       />
     </div>
   );
diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/packages/features/users/components/UserTable/UserListTable.tsx
index 4460d1c7c4a81e..b6356e06c5b123 100644
--- a/packages/features/users/components/UserTable/UserListTable.tsx
+++ b/packages/features/users/components/UserTable/UserListTable.tsx
@@ -22,12 +22,12 @@ import {
 } from "@calcom/features/data-table";
 import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
-import { WEBAPP_URL } from "@calcom/lib/constants";
 import {
-  downloadAsCsv,
   generateCsvRawForMembersTable,
   generateHeaderFromReactTable,
-} from "@calcom/lib/csvUtils";
+} from "@calcom/features/users/lib/UserListTableUtils";
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { downloadAsCsv } from "@calcom/lib/csvUtils";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
diff --git a/packages/features/users/lib/UserListTableUtils.ts b/packages/features/users/lib/UserListTableUtils.ts
new file mode 100644
index 00000000000000..3fed627466b0ea
--- /dev/null
+++ b/packages/features/users/lib/UserListTableUtils.ts
@@ -0,0 +1,93 @@
+import type { Table } from "@tanstack/react-table";
+
+import type { UserTableUser } from "@calcom/features/users/components/UserTable/types";
+import { sanitizeValue } from "@calcom/lib/csvUtils";
+
+export const generateHeaderFromReactTable = (table: Table<UserTableUser>): string[] | null => {
+  const headerGroups = table.getHeaderGroups();
+  if (!headerGroups.length) {
+    return null;
+  }
+
+  const { headers } = headerGroups[0];
+  const HEADER_IDS_TO_EXCLUDE = ["select", "actions"]; // these columns only make sense in web page
+  const filteredHeaders = headers.filter((header) => !HEADER_IDS_TO_EXCLUDE.includes(header.id));
+  const headerNames = filteredHeaders.map((header) => {
+    const h = header.column.columnDef.header;
+    if (typeof h === "string") {
+      return sanitizeValue(h);
+    }
+    if (typeof h === "function") {
+      return sanitizeValue(h(header.getContext()));
+    }
+    return "Unknown";
+  });
+
+  // Add "Link" column (member's public page)
+  const MEMBERS_COLUMN = "Members";
+  const LINK_COLUMN = "Link";
+  const memberIndex = headerNames.findIndex((name) => name === MEMBERS_COLUMN);
+  if (memberIndex > -1) {
+    headerNames.splice(memberIndex + 1, 0, LINK_COLUMN);
+  }
+
+  return headerNames;
+};
+
+export const generateCsvRawForMembersTable = (
+  headers: string[],
+  rows: UserTableUser[],
+  ATTRIBUTE_IDS: string[],
+  orgDomain: string
+): string => {
+  if (!headers.length) {
+    throw new Error("The header is empty.");
+  }
+
+  const REQUIRED_HEADERS = ["Members", "Link", "Role", "Teams"] as const;
+  // Validate required headers are present and in correct order
+  const firstFourHeaders = headers.slice(0, REQUIRED_HEADERS.length);
+  if (!REQUIRED_HEADERS.every((header, index) => header === firstFourHeaders[index])) {
+    throw new Error(
+      `Invalid headers structure. Expected headers to start with: ${JSON.stringify(REQUIRED_HEADERS)}`
+    );
+  }
+
+  // Body formation
+  const csvRows = rows.map((row) => {
+    const { email, role, teams, username, attributes } = row;
+
+    // Create a map of attributeId to array of values
+    const attributeMap = (attributes ?? []).reduce((acc, attr) => {
+      if (!acc[attr.attributeId]) {
+        acc[attr.attributeId] = [];
+      }
+      acc[attr.attributeId].push({
+        value: attr.value,
+        weight: attr.weight ?? undefined,
+      });
+      return acc;
+    }, {} as Record<string, { value: string; weight: number | undefined }[]>);
+
+    const requiredColumns = [
+      email, // Members column
+      `${orgDomain}/${username}`, // Link column
+      role, // Role column
+      sanitizeValue(teams.map((team) => team.name).join(",")), // Teams column
+    ];
+
+    // Add attribute columns
+    const attributeColumns = ATTRIBUTE_IDS.map((attrId) => {
+      const attributes = attributeMap[attrId];
+      if (!attributes?.length) return "";
+
+      return sanitizeValue(
+        attributes.map((attr) => (attr.weight ? `${attr.value} (${attr.weight}%)` : attr.value)).join(",")
+      );
+    });
+
+    return [...requiredColumns, ...attributeColumns];
+  });
+
+  return [headers.join(","), ...csvRows.map((row) => row.join(","))].join("\n");
+};
diff --git a/packages/features/users/lib/userDeletionService.ts b/packages/features/users/lib/deleteUser.ts
similarity index 100%
rename from packages/features/users/lib/userDeletionService.ts
rename to packages/features/users/lib/deleteUser.ts
diff --git a/packages/lib/server/repository/user.test.ts b/packages/features/users/repositories/UserRepository.test.ts
similarity index 96%
rename from packages/lib/server/repository/user.test.ts
rename to packages/features/users/repositories/UserRepository.test.ts
index 87c19764ce1459..fbe2b30fcaf5da 100644
--- a/packages/lib/server/repository/user.test.ts
+++ b/packages/features/users/repositories/UserRepository.test.ts
@@ -3,10 +3,9 @@ import prismock from "../../../../tests/libs/__mocks__/prisma";
 
 import { describe, test, vi, expect, beforeEach } from "vitest";
 
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { CreationSource } from "@calcom/prisma/enums";
 
-import { UserRepository } from "./user";
-
 vi.mock("@calcom/lib/server/i18n", () => {
   return {
     getTranslation: async (locale: string, namespace: string) => {
diff --git a/packages/lib/server/repository/user.ts b/packages/features/users/repositories/UserRepository.ts
similarity index 87%
rename from packages/lib/server/repository/user.ts
rename to packages/features/users/repositories/UserRepository.ts
index 852d89c70c33dd..8333d236ad2b81 100644
--- a/packages/lib/server/repository/user.ts
+++ b/packages/features/users/repositories/UserRepository.ts
@@ -1,26 +1,25 @@
 import type { z } from "zod";
 
 import { whereClauseForOrgWithSlugOrRequestedSlug } from "@calcom/ee/organizations/lib/orgDomains";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
 import { buildNonDelegationCredentials } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
+import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";
+import { withSelectedCalendars } from "@calcom/lib/server/withSelectedCalendars";
 import type { PrismaClient } from "@calcom/prisma";
 import { availabilityUserSelect } from "@calcom/prisma";
-import type { User as UserType } from "@calcom/prisma/client";
-import type { Prisma } from "@calcom/prisma/client";
+import type { User as UserType, DestinationCalendar, SelectedCalendar } from "@calcom/prisma/client";
+import { Prisma } from "@calcom/prisma/client";
 import type { CreationSource } from "@calcom/prisma/enums";
 import { MembershipRole, BookingStatus } from "@calcom/prisma/enums";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import type { UpId, UserProfile } from "@calcom/types/UserProfile";
 
-import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "../../availability";
-import { withSelectedCalendars } from "../withSelectedCalendars";
-import { ProfileRepository } from "./profile";
-import { getParsedTeam } from "./teamUtils";
-
-export type { UserWithLegacySelectedCalendars } from "../withSelectedCalendars";
+export type { UserWithLegacySelectedCalendars } from "@calcom/lib/server/withSelectedCalendars";
 export { withSelectedCalendars };
 export type UserAdminTeams = number[];
 
@@ -50,18 +49,19 @@ export type SessionUser = {
   darkBrandColor: string | null;
   movedToProfileId: number | null;
   completedOnboarding: boolean;
-  destinationCalendar: any;
+  destinationCalendar: DestinationCalendar | null;
   locale: string;
   timeFormat: number | null;
   trialEndsAt: Date | null;
-  metadata: any;
+  metadata: z.infer<typeof userMetadata>;
   role: string;
   allowDynamicBooking: boolean;
   allowSEOIndexing: boolean;
   receiveMonthlyDigestEmail: boolean;
-  profiles: any[];
-  allSelectedCalendars: any[];
-  userLevelSelectedCalendars: any[];
+  requiresBookerEmailVerification: boolean;
+  profiles: UserProfile[];
+  allSelectedCalendars: SelectedCalendar[];
+  userLevelSelectedCalendars: SelectedCalendar[];
 };
 
 const log = logger.getSubLogger({ prefix: ["[repository/user]"] });
@@ -109,6 +109,7 @@ const userSelect = {
   allowDynamicBooking: true,
   allowSEOIndexing: true,
   receiveMonthlyDigestEmail: true,
+  requiresBookerEmailVerification: true,
   verified: true,
   disableImpersonation: true,
   locked: true,
@@ -275,6 +276,84 @@ export class UserRepository {
     });
     return user;
   }
+  async findByEmailWithEmailVerificationSetting({ email }: { email: string }) {
+    const user = await this.prismaClient.user.findFirst({
+      where: {
+        OR: [
+          {
+            email: email.toLowerCase(),
+            emailVerified: { not: null },
+          },
+          {
+            secondaryEmails: {
+              some: {
+                email: email.toLowerCase(),
+                emailVerified: { not: null },
+              },
+            },
+          },
+        ],
+      },
+      select: {
+        id: true,
+        email: true,
+        requiresBookerEmailVerification: true,
+      },
+    });
+    return user;
+  }
+
+  async findManyByEmailsWithEmailVerificationSettings({ emails }: { emails: string[] }) {
+    const normalizedEmails = emails.map((e) => e.toLowerCase());
+
+    if (!normalizedEmails.length) return [];
+    const users = await this.findVerifiedUsersByEmailsRaw(normalizedEmails);
+
+    if (!users.length) return [];
+    return users.map((u) => ({
+      email: u.email,
+      matchedEmail: u.matchedEmail,
+      requiresBookerEmailVerification: u.requiresBookerEmailVerification,
+    }));
+  }
+
+  private async findVerifiedUsersByEmailsRaw(emails: string[]) {
+    const emailListSql = Prisma.join(emails.map((e) => Prisma.sql`${e}`));
+    return this.prismaClient.$queryRaw<
+      Array<{
+        id: number;
+        email: string;
+        matchedEmail: string;
+        requiresBookerEmailVerification: boolean;
+      }>
+    >(Prisma.sql`
+      SELECT
+        u."id",
+        u."email",
+        u."email" AS "matchedEmail",
+        u."requiresBookerEmailVerification"
+      FROM
+        "public"."users" AS u
+      WHERE
+        u."email" IN (${emailListSql})
+        AND u."emailVerified" IS NOT NULL
+        AND u."locked" = FALSE
+      UNION
+      SELECT
+        u."id",
+        u."email",
+        t0."email" AS "matchedEmail",
+        u."requiresBookerEmailVerification"
+      FROM
+        "public"."users" AS u
+      INNER JOIN "public"."SecondaryEmail" AS t0
+        ON t0."userId" = u."id"
+      WHERE
+        t0."email" IN (${emailListSql})
+        AND t0."emailVerified" IS NOT NULL
+        AND u."locked" = FALSE
+    `);
+  }
 
   async findByEmailAndIncludeProfilesAndPassword({ email }: { email: string }) {
     const user = await this.prismaClient.user.findUnique({
@@ -423,7 +502,6 @@ export class UserRepository {
     T extends {
       id: number;
       username: string | null;
-      [key: string]: any;
     }
   >({
     user,
@@ -771,6 +849,19 @@ export class UserRepository {
     });
     return !!isAdminOrOwnerOfTeam;
   }
+
+  async getUserOrganizationAndTeams({ userId }: { userId: number }) {
+    return await this.prismaClient.user.findUnique({
+      where: { id: userId },
+      select: {
+        organizationId: true,
+        teams: {
+          where: { accepted: true },
+          select: { teamId: true },
+        },
+      },
+    });
+  }
   async getTimeZoneAndDefaultScheduleId({ userId }: { userId: number }) {
     return await this.prismaClient.user.findUnique({
       where: {
@@ -911,6 +1002,7 @@ export class UserRepository {
         allowDynamicBooking: true,
         allowSEOIndexing: true,
         receiveMonthlyDigestEmail: true,
+        requiresBookerEmailVerification: true,
         profiles: true,
       },
     });
@@ -1030,6 +1122,19 @@ export class UserRepository {
     });
   }
 
+  async findUsersByIds(userIds: number[]) {
+    return this.prismaClient.user.findMany({
+      where: {
+        id: { in: userIds },
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+      },
+    });
+  }
+
   async findUsersWithLastBooking({ userIds, eventTypeId }: { userIds: number[]; eventTypeId: number }) {
     return this.prismaClient.user.findMany({
       where: {
@@ -1068,4 +1173,22 @@ export class UserRepository {
       },
     });
   }
+
+  async findUserWithHideBranding({ userId }: { userId: number }) {
+    return this.prismaClient.user.findUnique({
+      where: { id: userId },
+      select: {
+        hideBranding: true,
+        profiles: {
+          select: {
+            organization: {
+              select: {
+                hideBranding: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
 }
diff --git a/packages/lib/server/service/userCreationService.test.ts b/packages/features/users/services/userCreationService.test.ts
similarity index 68%
rename from packages/lib/server/service/userCreationService.test.ts
rename to packages/features/users/services/userCreationService.test.ts
index 9f32c9c3e8550c..1eb30850069a12 100644
--- a/packages/lib/server/service/userCreationService.test.ts
+++ b/packages/features/users/services/userCreationService.test.ts
@@ -1,12 +1,9 @@
-import prismock from "../../../../tests/libs/__mocks__/prisma";
-
 import { describe, test, expect, vi, beforeEach } from "vitest";
 
 import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 import { hashPassword } from "@calcom/lib/auth/hashPassword";
 import { CreationSource } from "@calcom/prisma/enums";
 
-import { UserRepository } from "../repository/user";
 import { UserCreationService } from "./userCreationService";
 
 vi.mock("@calcom/lib/server/i18n", () => {
@@ -24,16 +21,18 @@ vi.mock("@calcom/lib/auth/hashPassword", () => ({
   hashPassword: vi.fn().mockResolvedValue("hashed-password"),
 }));
 
-vi.mock("../repository/user", () => {
+const mockUserRepository = {
+  create: vi.fn(),
+};
+
+vi.mock("@calcom/features/users/repositories/UserRepository", () => {
   return {
-    UserRepository: vi.fn().mockImplementation(() => ({
-      create: vi.fn(),
-    })),
+    UserRepository: vi.fn().mockImplementation(() => mockUserRepository),
   };
 });
 
-vi.mock("@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller", (async) => ({
-  checkIfEmailIsBlockedInWatchlistController: vi.fn(() => false),
+vi.mock("@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller", () => ({
+  checkIfEmailIsBlockedInWatchlistController: vi.fn().mockResolvedValue(false),
 }));
 
 const mockUserData = {
@@ -46,7 +45,6 @@ vi.stubEnv("CALCOM_LICENSE_KEY", undefined);
 
 describe("UserCreationService", () => {
   beforeEach(() => {
-    prismock;
     vi.clearAllMocks();
   });
 
@@ -55,17 +53,9 @@ describe("UserCreationService", () => {
       username: "test",
       locked: false,
       organizationId: null,
-    } as any);
-
-    const mockUserRepository = vi.mocked(UserRepository);
-    if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
-      mockUserRepository.mockImplementation(
-        () =>
-          ({
-            create: mockCreate,
-          } as any)
-      );
-    }
+    });
+
+    mockUserRepository.create = mockCreate;
 
     const user = await UserCreationService.createUser({ data: mockUserData });
 
@@ -87,17 +77,9 @@ describe("UserCreationService", () => {
       username: "test",
       locked: true,
       organizationId: null,
-    } as any);
-
-    const mockUserRepository = vi.mocked(UserRepository);
-    if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
-      mockUserRepository.mockImplementation(
-        () =>
-          ({
-            create: mockCreate,
-          } as any)
-      );
-    }
+    });
+
+    mockUserRepository.create = mockCreate;
 
     const user = await UserCreationService.createUser({ data: mockUserData });
 
@@ -118,17 +100,9 @@ describe("UserCreationService", () => {
       username: "test",
       locked: false,
       organizationId: null,
-    } as any);
-
-    const mockUserRepository = vi.mocked(UserRepository);
-    if (mockUserRepository && typeof mockUserRepository.mockImplementation === "function") {
-      mockUserRepository.mockImplementation(
-        () =>
-          ({
-            create: mockCreate,
-          } as any)
-      );
-    }
+    });
+
+    mockUserRepository.create = mockCreate;
 
     const user = await UserCreationService.createUser({
       data: { ...mockUserData, password: mockPassword },
diff --git a/packages/lib/server/service/userCreationService.ts b/packages/features/users/services/userCreationService.ts
similarity index 81%
rename from packages/lib/server/service/userCreationService.ts
rename to packages/features/users/services/userCreationService.ts
index 20d6ecd071ddb4..59ac593e199a19 100644
--- a/packages/lib/server/service/userCreationService.ts
+++ b/packages/features/users/services/userCreationService.ts
@@ -1,12 +1,12 @@
+import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";
 import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 import { hashPassword } from "@calcom/lib/auth/hashPassword";
 import logger from "@calcom/lib/logger";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";
 import type { CreationSource, UserPermissionRole, IdentityProvider } from "@calcom/prisma/enums";
 
-import slugify from "../../slugify";
-import { UserRepository } from "../repository/user";
-
 interface CreateUserInput {
   email: string;
   username: string;
@@ -34,7 +34,11 @@ export class UserCreationService {
   static async createUser({ data }: { data: CreateUserInput }) {
     const { email, password, username } = data;
 
-    const shouldLockByDefault = await checkIfEmailIsBlockedInWatchlistController(email);
+    const shouldLockByDefault = await checkIfEmailIsBlockedInWatchlistController({
+      email,
+      organizationId: data.organizationId ?? undefined,
+      span: sentrySpan,
+    });
 
     const hashedPassword = password ? await hashPassword(password) : null;
 
@@ -49,7 +53,7 @@ export class UserCreationService {
 
     log.info(`Created user: ${user.id} with locked status of ${user.locked}`);
 
-    const { locked, ...restUser } = user;
+    const { locked: _locked, ...restUser } = user;
 
     return restUser;
   }
diff --git a/packages/features/watchlist/lib/dto/index.ts b/packages/features/watchlist/lib/dto/index.ts
new file mode 100644
index 00000000000000..9c912ae4f5284f
--- /dev/null
+++ b/packages/features/watchlist/lib/dto/index.ts
@@ -0,0 +1,22 @@
+// Export all DTO types
+export type {
+  WatchlistEntryDTO,
+  CreateWatchlistEntryDTO,
+  UpdateWatchlistEntryDTO,
+  WatchlistListResponseDTO,
+  WatchlistSearchDTO,
+  BlockingCheckResultDTO,
+  UsersBlockedCheckResponseDTO,
+  WatchlistErrorDTO,
+  BulkWatchlistOperationDTO,
+  BulkWatchlistResultDTO,
+} from "./types";
+
+// Export all mappers
+export {
+  mapWatchlistToDTO,
+  mapWatchlistListToDTO,
+  mapBlockingResultToDTO,
+  sanitizeWatchlistEntryDTO,
+  sanitizeWatchlistValue,
+} from "./mappers";
diff --git a/packages/features/watchlist/lib/dto/mappers.ts b/packages/features/watchlist/lib/dto/mappers.ts
new file mode 100644
index 00000000000000..d4ca47bcef8199
--- /dev/null
+++ b/packages/features/watchlist/lib/dto/mappers.ts
@@ -0,0 +1,119 @@
+import type { User } from "@calcom/prisma/client";
+import { WatchlistType } from "@calcom/prisma/enums";
+
+import type { Watchlist } from "../types";
+import { normalizeEmail, normalizeDomain, normalizeUsername } from "../utils/normalization";
+import type { WatchlistEntryDTO, WatchlistListResponseDTO, BlockingCheckResultDTO } from "./types";
+
+export function mapWatchlistToDTO(
+  watchlist: Watchlist & {
+    createdBy?: User | null;
+    updatedBy?: User | null;
+  }
+): WatchlistEntryDTO {
+  return {
+    id: watchlist.id,
+    type: watchlist.type,
+    value: watchlist.value,
+    description: watchlist.description,
+    action: watchlist.action,
+    source: watchlist.source,
+    isGlobal: watchlist.isGlobal,
+    lastUpdatedAt: watchlist.lastUpdatedAt.toISOString(),
+    organizationId: watchlist.organizationId,
+    createdBy: watchlist.createdBy
+      ? {
+          id: watchlist.createdBy.id,
+          name: watchlist.createdBy.name,
+          email: watchlist.createdBy.email,
+          avatarUrl: watchlist.createdBy.avatarUrl,
+        }
+      : null,
+    updatedBy: watchlist.updatedBy
+      ? {
+          id: watchlist.updatedBy.id,
+          name: watchlist.updatedBy.name,
+          email: watchlist.updatedBy.email,
+          avatarUrl: watchlist.updatedBy.avatarUrl,
+        }
+      : null,
+  };
+}
+
+export function mapWatchlistListToDTO(
+  watchlists: Array<
+    Watchlist & {
+      createdBy?: User | null;
+      updatedBy?: User | null;
+    }
+  >,
+  pagination?: {
+    total: number;
+    page: number;
+    limit: number;
+  }
+): WatchlistListResponseDTO {
+  return {
+    entries: watchlists.map(mapWatchlistToDTO),
+    pagination: pagination
+      ? {
+          ...pagination,
+          hasMore: pagination.page * pagination.limit < pagination.total,
+        }
+      : undefined,
+  };
+}
+
+export function mapBlockingResultToDTO(result: {
+  isBlocked: boolean;
+  reason?: WatchlistType;
+  watchlistEntry?: WatchlistEntryDTO | null;
+}): BlockingCheckResultDTO {
+  return {
+    isBlocked: result.isBlocked,
+    reason: result.reason,
+    matchedEntry: result.watchlistEntry
+      ? {
+          id: result.watchlistEntry.id,
+          type: result.watchlistEntry.type,
+          value: result.watchlistEntry.value,
+          action: result.watchlistEntry.action,
+        }
+      : undefined,
+  };
+}
+
+export function sanitizeWatchlistEntryDTO(dto: WatchlistEntryDTO): WatchlistEntryDTO {
+  return {
+    ...dto,
+    createdBy: dto.createdBy
+      ? {
+          id: dto.createdBy.id,
+          name: dto.createdBy.name,
+          email: "", // Hide email in public responses
+          avatarUrl: dto.createdBy.avatarUrl,
+        }
+      : null,
+    updatedBy: dto.updatedBy
+      ? {
+          id: dto.updatedBy.id,
+          name: dto.updatedBy.name,
+          email: "", // Hide email in public responses
+          avatarUrl: dto.updatedBy.avatarUrl,
+        }
+      : null,
+  };
+}
+
+export function sanitizeWatchlistValue(type: WatchlistType, value: string): string {
+  switch (type) {
+    case WatchlistType.EMAIL:
+      return normalizeEmail(value);
+    case WatchlistType.DOMAIN:
+      return normalizeDomain(value);
+    case WatchlistType.USERNAME:
+      return normalizeUsername(value);
+    default:
+      return value.trim();
+  }
+}
diff --git a/packages/features/watchlist/lib/dto/types.ts b/packages/features/watchlist/lib/dto/types.ts
new file mode 100644
index 00000000000000..4e912f01c15d2b
--- /dev/null
+++ b/packages/features/watchlist/lib/dto/types.ts
@@ -0,0 +1,106 @@
+import type { WatchlistAction, WatchlistType, WatchlistSource } from "@calcom/prisma/enums";
+
+// Base DTOs for API responses
+export interface WatchlistEntryDTO {
+  id: string;
+  type: WatchlistType;
+  value: string;
+  description?: string | null;
+  action: WatchlistAction;
+  source: WatchlistSource;
+  isGlobal: boolean;
+  lastUpdatedAt: string;
+  organizationId?: number | null;
+  createdBy?: {
+    id: number;
+    name: string | null;
+    email: string;
+    avatarUrl?: string | null;
+  } | null;
+  updatedBy?: {
+    id: number;
+    name: string | null;
+    email: string;
+    avatarUrl?: string | null;
+  } | null;
+}
+
+// Request DTOs for creating/updating entries
+export interface CreateWatchlistEntryDTO {
+  type: WatchlistType;
+  value: string;
+  description?: string;
+  action?: WatchlistAction;
+  organizationId?: number;
+}
+
+export interface UpdateWatchlistEntryDTO {
+  value?: string;
+  description?: string;
+  action?: WatchlistAction;
+}
+
+// Response DTOs for API operations
+export interface WatchlistListResponseDTO {
+  entries: WatchlistEntryDTO[];
+  pagination?: {
+    total: number;
+    page: number;
+    limit: number;
+    hasMore: boolean;
+  };
+}
+
+// Search and filter DTOs
+export interface WatchlistSearchDTO {
+  query?: string;
+  type?: WatchlistType;
+  action?: WatchlistAction;
+  source?: WatchlistSource;
+  isGlobal?: boolean;
+  organizationId?: number;
+  page?: number;
+  limit?: number;
+}
+
+export interface BlockingCheckResultDTO {
+  isBlocked: boolean;
+  reason?: WatchlistType;
+  matchedEntry?: {
+    id: string;
+    type: WatchlistType;
+    value: string;
+    action: WatchlistAction;
+  };
+}
+
+export interface UsersBlockedCheckResponseDTO {
+  containsBlockedUser: boolean;
+}
+
+// Error DTOs
+export interface WatchlistErrorDTO {
+  code: string;
+  message: string;
+  field?: string;
+  details?: Record<string, unknown>;
+}
+
+// Bulk operations DTOs
+export interface BulkWatchlistOperationDTO {
+  entries: CreateWatchlistEntryDTO[];
+  organizationId?: number;
+}
+
+export interface BulkWatchlistResultDTO {
+  created: WatchlistEntryDTO[];
+  failed: Array<{
+    entry: CreateWatchlistEntryDTO;
+    error: WatchlistErrorDTO;
+  }>;
+  summary: {
+    total: number;
+    created: number;
+    failed: number;
+  };
+}
diff --git a/packages/features/watchlist/lib/facade/WatchlistFeature.ts b/packages/features/watchlist/lib/facade/WatchlistFeature.ts
new file mode 100644
index 00000000000000..ed8ad9997e803b
--- /dev/null
+++ b/packages/features/watchlist/lib/facade/WatchlistFeature.ts
@@ -0,0 +1,47 @@
+import type { Container } from "@evyweb/ioctopus";
+
+import { WATCHLIST_DI_TOKENS } from "@calcom/features/di/watchlist/Watchlist.tokens";
+import logger from "@calcom/lib/logger";
+
+import type { IAuditRepository } from "../interface/IAuditRepository";
+import type {
+  IGlobalWatchlistRepository,
+  IOrganizationWatchlistRepository,
+} from "../interface/IWatchlistRepositories";
+import { GlobalBlockingService } from "../service/GlobalBlockingService";
+import { OrganizationBlockingService } from "../service/OrganizationBlockingService";
+import { WatchlistAuditService } from "../service/WatchlistAuditService";
+import { WatchlistService } from "../service/WatchlistService";
+
+export interface WatchlistFeature {
+  /** Global blocking service - handles global watchlist entries only */
+  globalBlocking: GlobalBlockingService;
+  /** Organization blocking service - handles org-specific entries only */
+  orgBlocking: OrganizationBlockingService;
+  /** Watchlist CRUD service - manages watchlist entries */
+  watchlist: WatchlistService;
+  /** Audit service - logs blocking attempts and decisions */
+  audit: WatchlistAuditService;
+}
+
+export function createWatchlistFeature(container: Container): WatchlistFeature {
+  // Get repositories from container
+  const globalRepo = container.get<IGlobalWatchlistRepository>(
+    WATCHLIST_DI_TOKENS.GLOBAL_WATCHLIST_REPOSITORY
+  );
+  const orgRepo = container.get<IOrganizationWatchlistRepository>(
+    WATCHLIST_DI_TOKENS.ORGANIZATION_WATCHLIST_REPOSITORY
+  );
+  const auditRepo = container.get<IAuditRepository>(WATCHLIST_DI_TOKENS.AUDIT_REPOSITORY);
+
+  // Create sub-loggers for each service
+  const watchlistLogger = logger.getSubLogger({ prefix: ["[WatchlistService]"] });
+
+  // Create services with Deps pattern
+  return {
+    globalBlocking: new GlobalBlockingService({ globalRepo }),
+    orgBlocking: new OrganizationBlockingService({ orgRepo }),
+    watchlist: new WatchlistService({ globalRepo, orgRepo, logger: watchlistLogger }),
+    audit: new WatchlistAuditService({ auditRepository: auditRepo }),
+  };
+}
diff --git a/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts b/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
new file mode 100644
index 00000000000000..f3d430b71858a4
--- /dev/null
+++ b/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
@@ -0,0 +1,63 @@
+import type { Mock } from "vitest";
+import { describe, expect, test, vi, afterEach } from "vitest";
+
+import { checkIfFreeEmailDomain } from "./checkIfFreeEmailDomain";
+
+vi.mock("@calcom/features/di/watchlist/containers/watchlist", () => {
+  return {
+    getWatchlistFeature: vi.fn().mockReturnValue({
+      globalBlocking: {
+        isFreeEmailDomain: vi.fn().mockResolvedValue(true),
+      },
+    }),
+  };
+});
+
+describe("checkIfFreeEmailDomain", () => {
+  test("If gmail should return true", async () => {
+    expect(await checkIfFreeEmailDomain({ email: "test@gmail.com" })).toBe(true);
+  });
+  test("If outlook should return true", async () => {
+    expect(await checkIfFreeEmailDomain({ email: "test@outlook.com" })).toBe(true);
+  });
+  test("If there's no email domain return as if it was a free email domain", async () => {
+    expect(await checkIfFreeEmailDomain({ email: "test@" })).toBe(true);
+  });
+  test("If free email domain in watchlist, should return true", async () => {
+    const { getWatchlistFeature } = await import("@calcom/features/di/watchlist/containers/watchlist");
+    const getWatchlistFeatureMock = getWatchlistFeature as Mock;
+
+    const result = await checkIfFreeEmailDomain({ email: "test@freedomain.com" });
+
+    expect(getWatchlistFeatureMock).toHaveBeenCalled();
+
+    const mockInstance = getWatchlistFeatureMock.mock.results.at(-1)?.value;
+
+    expect(mockInstance.globalBlocking.isFreeEmailDomain).toHaveBeenCalledWith("freedomain.com");
+    expect(result).toBe(true);
+  });
+
+  test("If non-free email domain, should return false", async () => {
+    const { getWatchlistFeature } = await import("@calcom/features/di/watchlist/containers/watchlist");
+    const getWatchlistFeatureMock = getWatchlistFeature as Mock;
+
+    getWatchlistFeatureMock.mockReturnValueOnce({
+      globalBlocking: {
+        isFreeEmailDomain: vi.fn().mockResolvedValue(false),
+      },
+    });
+
+    const result = await checkIfFreeEmailDomain({ email: "test@corporatedomain.com" });
+
+    expect(getWatchlistFeatureMock).toHaveBeenCalled();
+
+    const mockInstance = getWatchlistFeatureMock.mock.results.at(-1)?.value;
+
+    expect(mockInstance.globalBlocking.isFreeEmailDomain).toHaveBeenCalledWith("corporatedomain.com");
+    expect(result).toBe(false);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+});
diff --git a/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts b/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
new file mode 100644
index 00000000000000..f9442ac8f526a5
--- /dev/null
+++ b/packages/features/watchlist/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
@@ -0,0 +1,30 @@
+import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
+import type logger from "@calcom/lib/logger";
+
+import { extractDomainFromEmail } from "../utils/normalization";
+
+interface CheckFreeEmailDomainParams {
+  email: string;
+  logger?: ReturnType<typeof logger.getSubLogger>;
+}
+
+export const checkIfFreeEmailDomain = async (params: CheckFreeEmailDomainParams): Promise<boolean> => {
+  const { email, logger: log } = params;
+
+  try {
+    const emailDomain = extractDomainFromEmail(email);
+
+    // If there's no email domain return as if it was a free email domain
+    if (!emailDomain) return true;
+
+    // Gmail and Outlook are one of the most common email domains so we don't need to check the domains list
+    if (emailDomain === "gmail.com" || emailDomain === "outlook.com") return true;
+
+    const watchlist = await getWatchlistFeature();
+    return await watchlist.globalBlocking.isFreeEmailDomain(emailDomain);
+  } catch (err) {
+    log?.error(err);
+    // If normalization fails, treat as free email domain for safety
+    return true;
+  }
+};
diff --git a/packages/lib/freeEmailDomainCheck/freeEmailDomains.ts b/packages/features/watchlist/lib/freeEmailDomainCheck/freeEmailDomains.ts
similarity index 100%
rename from packages/lib/freeEmailDomainCheck/freeEmailDomains.ts
rename to packages/features/watchlist/lib/freeEmailDomainCheck/freeEmailDomains.ts
diff --git a/packages/features/watchlist/lib/interface/IAuditRepository.ts b/packages/features/watchlist/lib/interface/IAuditRepository.ts
new file mode 100644
index 00000000000000..fada8936e2eae1
--- /dev/null
+++ b/packages/features/watchlist/lib/interface/IAuditRepository.ts
@@ -0,0 +1,33 @@
+import type { WatchlistAction, WatchlistAudit, WatchlistType } from "../types";
+
+export interface CreateWatchlistAuditInput {
+  type: WatchlistType;
+  value: string;
+  description?: string | null;
+  action: WatchlistAction;
+  changedByUserId?: number | null;
+  watchlistId: string;
+}
+
+export interface UpdateWatchlistAuditInput {
+  type?: WatchlistType;
+  value?: string;
+  description?: string | null;
+  action?: WatchlistAction;
+  changedByUserId?: number | null;
+}
+
+export interface IAuditRepository {
+  // Basic CRUD operations for WatchlistAudit table
+  create(data: CreateWatchlistAuditInput): Promise<WatchlistAudit>;
+  findById(id: string): Promise<WatchlistAudit | null>;
+  findByWatchlistId(watchlistId: string): Promise<WatchlistAudit[]>;
+  update(id: string, data: UpdateWatchlistAuditInput): Promise<WatchlistAudit>;
+  delete(id: string): Promise<void>;
+  findMany(filters?: {
+    watchlistId?: string;
+    changedByUserId?: number;
+    limit?: number;
+    offset?: number;
+  }): Promise<WatchlistAudit[]>;
+}
diff --git a/packages/features/watchlist/lib/interface/IAuditService.ts b/packages/features/watchlist/lib/interface/IAuditService.ts
new file mode 100644
index 00000000000000..7103a5ee69b830
--- /dev/null
+++ b/packages/features/watchlist/lib/interface/IAuditService.ts
@@ -0,0 +1,17 @@
+import type { WatchlistAudit } from "../types";
+import type { CreateWatchlistAuditInput, UpdateWatchlistAuditInput } from "./IAuditRepository";
+
+export interface IWatchlistAuditService {
+  // Basic CRUD operations for WatchlistAudit
+  createAuditEntry(data: CreateWatchlistAuditInput): Promise<WatchlistAudit>;
+  getAuditEntry(id: string): Promise<WatchlistAudit | null>;
+  getAuditHistory(watchlistId: string): Promise<WatchlistAudit[]>;
+  updateAuditEntry(id: string, data: UpdateWatchlistAuditInput): Promise<WatchlistAudit>;
+  deleteAuditEntry(id: string): Promise<void>;
+  getAuditEntries(filters?: {
+    watchlistId?: string;
+    changedByUserId?: number;
+    limit?: number;
+    offset?: number;
+  }): Promise<WatchlistAudit[]>;
+}
diff --git a/packages/features/watchlist/lib/interface/IBlockingService.ts b/packages/features/watchlist/lib/interface/IBlockingService.ts
new file mode 100644
index 00000000000000..dabf67ab96e462
--- /dev/null
+++ b/packages/features/watchlist/lib/interface/IBlockingService.ts
@@ -0,0 +1,11 @@
+import type { WatchlistType } from "../types";
+
+export interface BlockingResult {
+  isBlocked: boolean;
+  reason?: WatchlistType;
+  watchlistEntry?: Record<string, unknown> | null;
+}
+
+export interface IBlockingService {
+  isBlocked(email: string, organizationId?: number | null): Promise<BlockingResult>;
+}
diff --git a/packages/features/watchlist/lib/interface/IWatchlistRepositories.ts b/packages/features/watchlist/lib/interface/IWatchlistRepositories.ts
new file mode 100644
index 00000000000000..b2baccfddbef96
--- /dev/null
+++ b/packages/features/watchlist/lib/interface/IWatchlistRepositories.ts
@@ -0,0 +1,79 @@
+import type { Watchlist } from "@calcom/prisma/client";
+
+import type { WatchlistAction, WatchlistSource, WatchlistType } from "../types";
+
+/**
+ * Interface for Global Watchlist Repository
+ * Follows Dependency Inversion Principle
+ */
+export interface IGlobalWatchlistRepository {
+  findBlockedEmail(email: string): Promise<Watchlist | null>;
+  findBlockedDomain(domain: string): Promise<Watchlist | null>;
+  findFreeEmailDomain(domain: string): Promise<Watchlist | null>;
+  findById(id: string): Promise<Watchlist | null>;
+  listBlockedEntries(): Promise<Watchlist[]>;
+
+  // Write operations
+  createEntry(data: {
+    type: WatchlistType;
+    value: string;
+    description?: string;
+    action: WatchlistAction;
+    source?: WatchlistSource;
+  }): Promise<Watchlist>;
+
+  updateEntry(
+    id: string,
+    data: {
+      value?: string;
+      description?: string;
+      action?: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist>;
+
+  deleteEntry(id: string): Promise<void>;
+}
+
+/**
+ * Interface for Organization Watchlist Repository
+ * Follows Dependency Inversion Principle
+ */
+export interface IOrganizationWatchlistRepository {
+  findBlockedEmail({
+    email,
+    organizationId,
+  }: {
+    email: string;
+    organizationId: number;
+  }): Promise<Watchlist | null>;
+  findBlockedDomain(domain: string, organizationId: number): Promise<Watchlist | null>;
+  findById(id: string, organizationId: number): Promise<Watchlist | null>;
+  listBlockedEntries(organizationId: number): Promise<Watchlist[]>;
+  listAllOrganizationEntries(): Promise<Watchlist[]>;
+
+  // Write operations
+  createEntry(
+    organizationId: number,
+    data: {
+      type: WatchlistType;
+      value: string;
+      description?: string;
+      action: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist>;
+
+  updateEntry(
+    id: string,
+    organizationId: number,
+    data: {
+      value?: string;
+      description?: string;
+      action?: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist>;
+
+  deleteEntry(id: string, organizationId: number): Promise<void>;
+}
diff --git a/packages/features/watchlist/lib/interface/IWatchlistService.ts b/packages/features/watchlist/lib/interface/IWatchlistService.ts
new file mode 100644
index 00000000000000..4526bbbee46b05
--- /dev/null
+++ b/packages/features/watchlist/lib/interface/IWatchlistService.ts
@@ -0,0 +1,9 @@
+import type { WatchlistEntry, CreateWatchlistEntryData, UpdateWatchlistEntryData } from "../types";
+
+export interface IWatchlistService {
+  createEntry(data: CreateWatchlistEntryData): Promise<WatchlistEntry>;
+  updateEntry(id: string, data: UpdateWatchlistEntryData): Promise<WatchlistEntry>;
+  deleteEntry(id: string): Promise<void>;
+  getEntry(id: string): Promise<WatchlistEntry | null>;
+  listAllSystemEntries(): Promise<WatchlistEntry[]>;
+}
diff --git a/packages/features/watchlist/lib/repository/GlobalWatchlistRepository.ts b/packages/features/watchlist/lib/repository/GlobalWatchlistRepository.ts
new file mode 100644
index 00000000000000..a6c64343f9e525
--- /dev/null
+++ b/packages/features/watchlist/lib/repository/GlobalWatchlistRepository.ts
@@ -0,0 +1,136 @@
+import type { PrismaClient, Watchlist } from "@calcom/prisma/client";
+import { WatchlistAction, WatchlistType, WatchlistSource } from "@calcom/prisma/enums";
+
+import type { IGlobalWatchlistRepository } from "../interface/IWatchlistRepositories";
+
+/**
+ * Repository for global watchlist operations (organizationId = null)
+ * Handles system-wide blocking rules that apply to all organizations
+ *
+ * Note: Expects normalized values from the service layer
+ */
+export class GlobalWatchlistRepository implements IGlobalWatchlistRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  private readonly selectFields = {
+    id: true,
+    type: true,
+    value: true,
+    description: true,
+    isGlobal: true,
+    organizationId: true,
+    action: true,
+    source: true,
+    lastUpdatedAt: true,
+  } as const;
+
+  async findBlockedEmail(email: string): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        type: WatchlistType.EMAIL,
+        value: email,
+        action: WatchlistAction.BLOCK,
+        organizationId: null,
+        isGlobal: true,
+      },
+    });
+  }
+
+  async findBlockedDomain(domain: string): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        type: WatchlistType.DOMAIN,
+        value: domain,
+        action: WatchlistAction.BLOCK,
+        organizationId: null,
+        isGlobal: true,
+      },
+    });
+  }
+
+  async findFreeEmailDomain(domain: string): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        type: WatchlistType.DOMAIN,
+        value: domain,
+        source: WatchlistSource.FREE_DOMAIN_POLICY,
+        organizationId: null,
+        isGlobal: true,
+      },
+    });
+  }
+
+  async findById(id: string): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        id,
+        organizationId: null,
+        isGlobal: true,
+      },
+    });
+  }
+
+  async listBlockedEntries(): Promise<Watchlist[]> {
+    return this.prisma.watchlist.findMany({
+      select: this.selectFields,
+      where: {
+        organizationId: null,
+        isGlobal: true,
+        action: WatchlistAction.BLOCK,
+      },
+    });
+  }
+
+  // Write operations for global entries
+  async createEntry(data: {
+    type: WatchlistType;
+    value: string;
+    description?: string | null;
+    action: WatchlistAction;
+    source?: WatchlistSource;
+  }): Promise<Watchlist> {
+    return this.prisma.watchlist.create({
+      select: this.selectFields,
+      data: {
+        type: data.type,
+        value: data.value,
+        description: data.description,
+        isGlobal: true,
+        organizationId: null,
+        action: data.action,
+        source: data.source || WatchlistSource.MANUAL,
+      },
+    });
+  }
+
+  async updateEntry(
+    id: string,
+    data: {
+      value?: string;
+      description?: string | null;
+      action?: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist> {
+    return this.prisma.watchlist.update({
+      select: this.selectFields,
+      where: { id },
+      data: {
+        ...(data.value !== undefined && { value: data.value }),
+        ...(data.description !== undefined && { description: data.description }),
+        ...(data.action && { action: data.action }),
+        ...(data.source && { source: data.source }),
+      },
+    });
+  }
+
+  async deleteEntry(id: string): Promise<void> {
+    this.prisma.watchlist.delete({
+      where: { id },
+    });
+  }
+}
diff --git a/packages/features/watchlist/lib/repository/OrganizationWatchlistRepository.ts b/packages/features/watchlist/lib/repository/OrganizationWatchlistRepository.ts
new file mode 100644
index 00000000000000..43cd6add533c03
--- /dev/null
+++ b/packages/features/watchlist/lib/repository/OrganizationWatchlistRepository.ts
@@ -0,0 +1,143 @@
+import type { PrismaClient, Watchlist } from "@calcom/prisma/client";
+import { WatchlistAction, WatchlistType, WatchlistSource } from "@calcom/prisma/enums";
+
+import type { IOrganizationWatchlistRepository } from "../interface/IWatchlistRepositories";
+
+/**
+ * Repository for organization-specific watchlist operations
+ * Handles blocking rules that apply only to a specific organization,
+ * or to all organizations
+ *
+ * Note: Expects normalized values from the service layer
+ */
+export class OrganizationWatchlistRepository implements IOrganizationWatchlistRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  private readonly selectFields = {
+    id: true,
+    type: true,
+    value: true,
+    description: true,
+    isGlobal: true,
+    organizationId: true,
+    action: true,
+    source: true,
+    lastUpdatedAt: true,
+  } as const;
+
+  async findBlockedEmail({
+    email,
+    organizationId,
+  }: {
+    email: string;
+    organizationId: number;
+  }): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        type: WatchlistType.EMAIL,
+        value: email,
+        action: WatchlistAction.BLOCK,
+        organizationId,
+      },
+    });
+  }
+
+  async findBlockedDomain(domain: string, organizationId: number): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        type: WatchlistType.DOMAIN,
+        value: domain,
+        action: WatchlistAction.BLOCK,
+        organizationId,
+      },
+    });
+  }
+
+  async listBlockedEntries(organizationId: number): Promise<Watchlist[]> {
+    return this.prisma.watchlist.findMany({
+      select: this.selectFields,
+      where: {
+        organizationId,
+        action: WatchlistAction.BLOCK,
+      },
+    });
+  }
+
+  async listAllOrganizationEntries(): Promise<Watchlist[]> {
+    return this.prisma.watchlist.findMany({
+      select: this.selectFields,
+      where: {
+        organizationId: { not: null },
+        isGlobal: false,
+        action: WatchlistAction.BLOCK,
+      },
+    });
+  }
+
+  async findById(id: string, organizationId: number): Promise<Watchlist | null> {
+    return this.prisma.watchlist.findFirst({
+      select: this.selectFields,
+      where: {
+        id,
+        organizationId,
+      },
+    });
+  }
+
+  // Write operations for organization-specific entries
+  async createEntry(
+    organizationId: number,
+    data: {
+      type: WatchlistType;
+      value: string;
+      description?: string;
+      action: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist> {
+    return this.prisma.watchlist.create({
+      select: this.selectFields,
+      data: {
+        type: data.type,
+        value: data.value,
+        description: data.description,
+        isGlobal: false,
+        organizationId,
+        action: data.action,
+        source: data.source || WatchlistSource.MANUAL,
+      },
+    });
+  }
+
+  async updateEntry(
+    id: string,
+    organizationId: number,
+    data: {
+      value?: string;
+      description?: string | null;
+      action?: WatchlistAction;
+      source?: WatchlistSource;
+    }
+  ): Promise<Watchlist> {
+    return this.prisma.watchlist.update({
+      select: this.selectFields,
+      where: { id, organizationId },
+      data: {
+        ...(data.value !== undefined && { value: data.value }),
+        ...(data.description !== undefined && { description: data.description }),
+        ...(data.action !== undefined && { action: data.action }),
+        ...(data.source !== undefined && { source: data.source }),
+      },
+    });
+  }
+
+  async deleteEntry(id: string, organizationId: number): Promise<void> {
+    return this.prisma.watchlist
+      .delete({
+        where: { id, organizationId },
+      })
+      .then(() => {});
+  }
+}
diff --git a/packages/features/watchlist/lib/repository/PrismaWatchlistAuditRepository.ts b/packages/features/watchlist/lib/repository/PrismaWatchlistAuditRepository.ts
new file mode 100644
index 00000000000000..e1c1c251492de2
--- /dev/null
+++ b/packages/features/watchlist/lib/repository/PrismaWatchlistAuditRepository.ts
@@ -0,0 +1,93 @@
+import type { PrismaClient } from "@calcom/prisma/client";
+import { WatchlistAction, WatchlistType } from "@calcom/prisma/enums";
+
+import type {
+  IAuditRepository,
+  CreateWatchlistAuditInput,
+  UpdateWatchlistAuditInput,
+} from "../interface/IAuditRepository";
+import type { WatchlistAudit } from "../types";
+
+export class PrismaWatchlistAuditRepository implements IAuditRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  private readonly selectFields = {
+    id: true,
+    type: true,
+    value: true,
+    description: true,
+    action: true,
+    changedAt: true,
+    changedByUserId: true,
+    watchlistId: true,
+  } as const;
+
+  async create(data: CreateWatchlistAuditInput): Promise<WatchlistAudit> {
+    return this.prisma.watchlistAudit.create({
+      select: this.selectFields,
+      data: {
+        type: data.type as WatchlistType,
+        value: data.value,
+        description: data.description,
+        action: data.action as WatchlistAction,
+        changedByUserId: data.changedByUserId,
+        watchlistId: data.watchlistId,
+      },
+    });
+  }
+
+  async findById(id: string): Promise<WatchlistAudit | null> {
+    return this.prisma.watchlistAudit.findUnique({
+      select: this.selectFields,
+      where: { id },
+    });
+  }
+
+  async findByWatchlistId(watchlistId: string): Promise<WatchlistAudit[]> {
+    return this.prisma.watchlistAudit.findMany({
+      select: this.selectFields,
+      where: { watchlistId },
+      orderBy: { changedAt: "desc" },
+    });
+  }
+
+  async update(id: string, data: UpdateWatchlistAuditInput): Promise<WatchlistAudit> {
+    return this.prisma.watchlistAudit.update({
+      select: this.selectFields,
+      where: { id },
+      data: {
+        ...(data.type && { type: data.type as WatchlistType }),
+        ...(data.value && { value: data.value }),
+        ...(data.description !== undefined && { description: data.description }),
+        ...(data.action && { action: data.action as WatchlistAction }),
+        ...(data.changedByUserId !== undefined && { changedByUserId: data.changedByUserId }),
+      },
+    });
+  }
+
+  async delete(id: string): Promise<void> {
+    return this.prisma.watchlistAudit
+      .delete({
+        where: { id },
+      })
+      .then(() => {});
+  }
+
+  async findMany(filters?: {
+    watchlistId?: string;
+    changedByUserId?: number;
+    limit?: number;
+    offset?: number;
+  }): Promise<WatchlistAudit[]> {
+    return this.prisma.watchlistAudit.findMany({
+      select: this.selectFields,
+      where: {
+        ...(filters?.watchlistId && { watchlistId: filters.watchlistId }),
+        ...(filters?.changedByUserId && { changedByUserId: filters.changedByUserId }),
+      },
+      orderBy: { changedAt: "desc" },
+      ...(filters?.limit && { take: filters.limit }),
+      ...(filters?.offset && { skip: filters.offset }),
+    });
+  }
+}
diff --git a/packages/features/watchlist/lib/service/GlobalBlockingService.test.ts b/packages/features/watchlist/lib/service/GlobalBlockingService.test.ts
new file mode 100644
index 00000000000000..92ca4a3d7cc868
--- /dev/null
+++ b/packages/features/watchlist/lib/service/GlobalBlockingService.test.ts
@@ -0,0 +1,196 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+import type { IGlobalWatchlistRepository } from "../interface/IWatchlistRepositories";
+import { GlobalBlockingService } from "./GlobalBlockingService";
+
+const mockGlobalRepo: IGlobalWatchlistRepository = {
+  findBlockedEmail: vi.fn(),
+  findBlockedDomain: vi.fn(),
+  findFreeEmailDomain: vi.fn(),
+  createEntry: vi.fn(),
+  updateEntry: vi.fn(),
+  deleteEntry: vi.fn(),
+  findById: vi.fn(),
+  listBlockedEntries: vi.fn(),
+};
+
+describe("GlobalBlockingService", () => {
+  let service: GlobalBlockingService;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    service = new GlobalBlockingService({ globalRepo: mockGlobalRepo });
+  });
+
+  describe("isBlocked", () => {
+    test("should return blocked when email matches", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "blocked@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockResolvedValue(mockEntry);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockResolvedValue(null);
+
+      const result = await service.isBlocked("blocked@example.com");
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.EMAIL);
+      expect(result.watchlistEntry).toEqual(mockEntry);
+      expect(mockGlobalRepo.findBlockedEmail).toHaveBeenCalledWith("blocked@example.com");
+      expect(mockGlobalRepo.findBlockedDomain).toHaveBeenCalledWith("example.com");
+    });
+
+    test("should return blocked when domain matches", async () => {
+      const mockEntry = {
+        id: "456",
+        type: WatchlistType.DOMAIN,
+        value: "spam.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockResolvedValue(mockEntry);
+
+      const result = await service.isBlocked("user@spam.com");
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.DOMAIN);
+      expect(result.watchlistEntry).toEqual(mockEntry);
+      expect(mockGlobalRepo.findBlockedEmail).toHaveBeenCalledWith("user@spam.com");
+      expect(mockGlobalRepo.findBlockedDomain).toHaveBeenCalledWith("spam.com");
+    });
+
+    test("should return not blocked when no matches", async () => {
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockResolvedValue(null);
+
+      const result = await service.isBlocked("clean@example.com");
+
+      expect(result.isBlocked).toBe(false);
+      expect(result.reason).toBeUndefined();
+      expect(result.watchlistEntry).toBeUndefined();
+    });
+
+    test("should normalize email before checking", async () => {
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockResolvedValue(null);
+
+      await service.isBlocked("USER@EXAMPLE.COM");
+
+      expect(mockGlobalRepo.findBlockedEmail).toHaveBeenCalledWith("user@example.com");
+      expect(mockGlobalRepo.findBlockedDomain).toHaveBeenCalledWith("example.com");
+    });
+
+    test("should check both email and domain in parallel", async () => {
+      const emailPromise = Promise.resolve(null);
+      const domainPromise = Promise.resolve(null);
+
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockReturnValue(emailPromise);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockReturnValue(domainPromise);
+
+      await service.isBlocked("test@example.com");
+
+      // Both should be called before awaiting (parallel execution)
+      expect(mockGlobalRepo.findBlockedEmail).toHaveBeenCalled();
+      expect(mockGlobalRepo.findBlockedDomain).toHaveBeenCalled();
+    });
+
+    test("should return email match over domain match", async () => {
+      const emailEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "specific@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      const domainEntry = {
+        id: "456",
+        type: WatchlistType.DOMAIN,
+        value: "example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.findBlockedEmail).mockResolvedValue(emailEntry);
+      vi.mocked(mockGlobalRepo.findBlockedDomain).mockResolvedValue(domainEntry);
+
+      const result = await service.isBlocked("specific@example.com");
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.EMAIL); // Email takes precedence
+      expect(result.watchlistEntry).toEqual(emailEntry);
+    });
+  });
+
+  describe("isFreeEmailDomain", () => {
+    test("should return true when domain is in free email list", async () => {
+      const mockEntry = {
+        id: "789",
+        type: WatchlistType.DOMAIN,
+        value: "yahoo.com",
+        description: null,
+        action: WatchlistAction.REPORT,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.FREE_DOMAIN_POLICY,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.findFreeEmailDomain).mockResolvedValue(mockEntry);
+
+      const result = await service.isFreeEmailDomain("yahoo.com");
+
+      expect(result).toBe(true);
+      expect(mockGlobalRepo.findFreeEmailDomain).toHaveBeenCalledWith("yahoo.com");
+    });
+
+    test("should return false when domain is not in free email list", async () => {
+      vi.mocked(mockGlobalRepo.findFreeEmailDomain).mockResolvedValue(null);
+
+      const result = await service.isFreeEmailDomain("corporatedomain.com");
+
+      expect(result).toBe(false);
+      expect(mockGlobalRepo.findFreeEmailDomain).toHaveBeenCalledWith("corporatedomain.com");
+    });
+
+    test("should normalize domain before checking", async () => {
+      vi.mocked(mockGlobalRepo.findFreeEmailDomain).mockResolvedValue(null);
+
+      await service.isFreeEmailDomain("GMAIL.COM");
+
+      expect(mockGlobalRepo.findFreeEmailDomain).toHaveBeenCalledWith("gmail.com");
+    });
+
+    test("should handle domain with @ prefix", async () => {
+      vi.mocked(mockGlobalRepo.findFreeEmailDomain).mockResolvedValue(null);
+
+      await service.isFreeEmailDomain("@hotmail.com");
+
+      expect(mockGlobalRepo.findFreeEmailDomain).toHaveBeenCalledWith("hotmail.com");
+    });
+  });
+});
diff --git a/packages/features/watchlist/lib/service/GlobalBlockingService.ts b/packages/features/watchlist/lib/service/GlobalBlockingService.ts
new file mode 100644
index 00000000000000..13ba8f28d6416f
--- /dev/null
+++ b/packages/features/watchlist/lib/service/GlobalBlockingService.ts
@@ -0,0 +1,49 @@
+import type { IBlockingService, BlockingResult } from "../interface/IBlockingService";
+import type { IGlobalWatchlistRepository } from "../interface/IWatchlistRepositories";
+import { WatchlistType } from "../types";
+import { normalizeEmail, extractDomainFromEmail, normalizeDomain } from "../utils/normalization";
+
+type Deps = {
+  globalRepo: IGlobalWatchlistRepository;
+};
+
+/**
+ * Global Blocking Service - handles only global watchlist entries
+ * For organization-specific blocking, use OrganizationBlockingService
+ */
+export class GlobalBlockingService implements IBlockingService {
+  constructor(private readonly deps: Deps) {}
+
+  async isBlocked(email: string): Promise<BlockingResult> {
+    const normalizedEmail = normalizeEmail(email);
+    const normalizedDomain = extractDomainFromEmail(normalizedEmail);
+
+    const [globalEmailEntry, globalDomainEntry] = await Promise.all([
+      this.deps.globalRepo.findBlockedEmail(normalizedEmail),
+      this.deps.globalRepo.findBlockedDomain(normalizedDomain),
+    ]);
+
+    if (globalEmailEntry) {
+      return {
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: globalEmailEntry,
+      };
+    }
+
+    if (globalDomainEntry) {
+      return {
+        isBlocked: true,
+        reason: WatchlistType.DOMAIN,
+        watchlistEntry: globalDomainEntry,
+      };
+    }
+
+    return { isBlocked: false };
+  }
+
+  async isFreeEmailDomain(domain: string): Promise<boolean> {
+    const normalizedDomain = normalizeDomain(domain);
+    return this.deps.globalRepo.findFreeEmailDomain(normalizedDomain).then((entry) => !!entry);
+  }
+}
diff --git a/packages/features/watchlist/lib/service/OrganizationBlockingService.test.ts b/packages/features/watchlist/lib/service/OrganizationBlockingService.test.ts
new file mode 100644
index 00000000000000..f8342b9b8a83d4
--- /dev/null
+++ b/packages/features/watchlist/lib/service/OrganizationBlockingService.test.ts
@@ -0,0 +1,175 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+import type { IOrganizationWatchlistRepository } from "../interface/IWatchlistRepositories";
+import { OrganizationBlockingService } from "./OrganizationBlockingService";
+
+const mockOrgRepo: IOrganizationWatchlistRepository = {
+  findBlockedEmail: vi.fn(),
+  findBlockedDomain: vi.fn(),
+  createEntry: vi.fn(),
+  updateEntry: vi.fn(),
+  deleteEntry: vi.fn(),
+  findById: vi.fn(),
+  listBlockedEntries: vi.fn(),
+  listAllOrganizationEntries: vi.fn(),
+};
+
+describe("OrganizationBlockingService", () => {
+  let service: OrganizationBlockingService;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    service = new OrganizationBlockingService({ orgRepo: mockOrgRepo });
+  });
+
+  describe("isBlocked", () => {
+    const ORGANIZATION_ID = 123;
+
+    test("should return blocked when email matches for organization", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "blocked@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: ORGANIZATION_ID,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(mockEntry);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(null);
+
+      const result = await service.isBlocked("blocked@example.com", ORGANIZATION_ID);
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.EMAIL);
+      expect(result.watchlistEntry).toEqual(mockEntry);
+      expect(mockOrgRepo.findBlockedEmail).toHaveBeenCalledWith({
+        email: "blocked@example.com",
+        organizationId: ORGANIZATION_ID,
+      });
+      expect(mockOrgRepo.findBlockedDomain).toHaveBeenCalledWith("example.com", ORGANIZATION_ID);
+    });
+
+    test("should return blocked when domain matches for organization", async () => {
+      const mockEntry = {
+        id: "456",
+        type: WatchlistType.DOMAIN,
+        value: "competitor.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: ORGANIZATION_ID,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(mockEntry);
+
+      const result = await service.isBlocked("user@competitor.com", ORGANIZATION_ID);
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.DOMAIN);
+      expect(result.watchlistEntry).toEqual(mockEntry);
+    });
+
+    test("should return not blocked when no matches for organization", async () => {
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(null);
+
+      const result = await service.isBlocked("clean@example.com", ORGANIZATION_ID);
+
+      expect(result.isBlocked).toBe(false);
+      expect(result.reason).toBeUndefined();
+      expect(result.watchlistEntry).toBeUndefined();
+    });
+
+    test("should normalize email before checking", async () => {
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(null);
+
+      await service.isBlocked("USER@EXAMPLE.COM", ORGANIZATION_ID);
+
+      expect(mockOrgRepo.findBlockedEmail).toHaveBeenCalledWith({
+        email: "user@example.com",
+        organizationId: ORGANIZATION_ID,
+      });
+      expect(mockOrgRepo.findBlockedDomain).toHaveBeenCalledWith("example.com", ORGANIZATION_ID);
+    });
+
+    test("should check both email and domain in parallel", async () => {
+      const emailPromise = Promise.resolve(null);
+      const domainPromise = Promise.resolve(null);
+
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockReturnValue(emailPromise);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockReturnValue(domainPromise);
+
+      await service.isBlocked("test@example.com", ORGANIZATION_ID);
+
+      // Both should be called before awaiting (parallel execution)
+      expect(mockOrgRepo.findBlockedEmail).toHaveBeenCalled();
+      expect(mockOrgRepo.findBlockedDomain).toHaveBeenCalled();
+    });
+
+    test("should return email match over domain match", async () => {
+      const emailEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "specific@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: ORGANIZATION_ID,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      const domainEntry = {
+        id: "456",
+        type: WatchlistType.DOMAIN,
+        value: "example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: ORGANIZATION_ID,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(emailEntry);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(domainEntry);
+
+      const result = await service.isBlocked("specific@example.com", ORGANIZATION_ID);
+
+      expect(result.isBlocked).toBe(true);
+      expect(result.reason).toBe(WatchlistType.EMAIL); // Email takes precedence
+      expect(result.watchlistEntry).toEqual(emailEntry);
+    });
+
+    test("should only check specified organization", async () => {
+      const ORG_A = 100;
+      const ORG_B = 200;
+
+      vi.mocked(mockOrgRepo.findBlockedEmail).mockResolvedValue(null);
+      vi.mocked(mockOrgRepo.findBlockedDomain).mockResolvedValue(null);
+
+      await service.isBlocked("test@example.com", ORG_A);
+
+      // Should only query for ORG_A, not ORG_B
+      expect(mockOrgRepo.findBlockedEmail).toHaveBeenCalledWith({
+        email: "test@example.com",
+        organizationId: ORG_A,
+      });
+      expect(mockOrgRepo.findBlockedDomain).toHaveBeenCalledWith("example.com", ORG_A);
+      expect(mockOrgRepo.findBlockedEmail).not.toHaveBeenCalledWith({
+        email: "test@example.com",
+        organizationId: ORG_B,
+      });
+    });
+  });
+});
diff --git a/packages/features/watchlist/lib/service/OrganizationBlockingService.ts b/packages/features/watchlist/lib/service/OrganizationBlockingService.ts
new file mode 100644
index 00000000000000..2321aab4f98f8b
--- /dev/null
+++ b/packages/features/watchlist/lib/service/OrganizationBlockingService.ts
@@ -0,0 +1,59 @@
+import type { IBlockingService, BlockingResult } from "../interface/IBlockingService";
+import type { IOrganizationWatchlistRepository } from "../interface/IWatchlistRepositories";
+import { WatchlistType } from "../types";
+import { normalizeEmail, extractDomainFromEmail, normalizeDomain } from "../utils/normalization";
+
+type Deps = {
+  orgRepo: IOrganizationWatchlistRepository;
+};
+
+/**
+ * Service for organization-specific blocking operations
+ * Handles blocking rules that apply only to a specific organization
+ */
+export class OrganizationBlockingService implements IBlockingService {
+  constructor(private readonly deps: Deps) {}
+
+  async isBlocked(email: string, organizationId: number): Promise<BlockingResult> {
+    const normalizedEmail = normalizeEmail(email);
+    const normalizedDomain = extractDomainFromEmail(normalizedEmail);
+
+    const emailPromise = this.deps.orgRepo.findBlockedEmail({ email: normalizedEmail, organizationId });
+    const domainPromise = this.deps.orgRepo.findBlockedDomain(normalizedDomain, organizationId);
+
+    const [emailEntry, domainEntry] = await Promise.all([emailPromise, domainPromise]);
+
+    if (emailEntry) {
+      return {
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: emailEntry,
+      };
+    }
+
+    if (domainEntry) {
+      return {
+        isBlocked: true,
+        reason: WatchlistType.DOMAIN,
+        watchlistEntry: domainEntry,
+      };
+    }
+
+    return { isBlocked: false };
+  }
+
+  async isDomainBlocked(domain: string, organizationId: number): Promise<BlockingResult> {
+    const normalizedDomain = normalizeDomain(domain);
+
+    return this.deps.orgRepo.findBlockedDomain(normalizedDomain, organizationId).then((domainEntry) => {
+      if (domainEntry) {
+        return {
+          isBlocked: true,
+          reason: WatchlistType.DOMAIN,
+          watchlistEntry: domainEntry,
+        };
+      }
+      return { isBlocked: false };
+    });
+  }
+}
diff --git a/packages/features/watchlist/lib/service/SpamCheckService.ts b/packages/features/watchlist/lib/service/SpamCheckService.ts
new file mode 100644
index 00000000000000..7b2d6a0bf390da
--- /dev/null
+++ b/packages/features/watchlist/lib/service/SpamCheckService.ts
@@ -0,0 +1,63 @@
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+
+import type { BlockingResult } from "../interface/IBlockingService";
+import type { GlobalBlockingService } from "./GlobalBlockingService";
+import type { OrganizationBlockingService } from "./OrganizationBlockingService";
+
+/**
+ * Spam Check Service - Orchestrates spam checking by coordinating blocking checks
+ *
+ * Checks both global watchlist entries (via GlobalBlockingService) and organization-specific
+ * watchlist entries (via OrganizationBlockingService) when an organizationId is provided.
+ */
+export class SpamCheckService {
+  private spamCheckPromise: Promise<BlockingResult> | null = null;
+
+  constructor(
+    private readonly globalBlockingService: GlobalBlockingService,
+    private readonly organizationBlockingService: OrganizationBlockingService
+  ) { }
+
+  startCheck({ email, organizationId }: { email: string, organizationId: number | null }): void {
+    this.spamCheckPromise = this.isBlocked(email, organizationId ?? undefined).catch((error) => {
+      logger.error("Error starting spam check", safeStringify(error));
+      return { isBlocked: false };
+    });
+  }
+
+  async waitForCheck(): Promise<BlockingResult> {
+    if (!this.spamCheckPromise) {
+      throw new Error(
+        "waitForCheck() called before startCheck(). You must call startCheck() first to initialize spam checking."
+      );
+    }
+    return await this.spamCheckPromise;
+  }
+
+  /**
+   * Checks if an email is blocked by global or organization-specific watchlist rules
+   * Runs both checks in parallel for better performance
+   */
+  private async isBlocked(email: string, organizationId?: number): Promise<BlockingResult> {
+    const checks = [this.globalBlockingService.isBlocked(email)];
+
+    if (organizationId) {
+      checks.push(this.organizationBlockingService.isBlocked(email, organizationId));
+    }
+
+    const [globalResult, orgResult] = await Promise.all(checks);
+
+    // Global blocking takes precedence
+    if (globalResult.isBlocked) {
+      return globalResult;
+    }
+
+    // Check organization blocking if it was performed
+    if (orgResult?.isBlocked) {
+      return orgResult;
+    }
+
+    return { isBlocked: false };
+  }
+}
diff --git a/packages/features/watchlist/lib/service/WatchlistAuditService.ts b/packages/features/watchlist/lib/service/WatchlistAuditService.ts
new file mode 100644
index 00000000000000..ee2cb4539332bb
--- /dev/null
+++ b/packages/features/watchlist/lib/service/WatchlistAuditService.ts
@@ -0,0 +1,44 @@
+import type {
+  IAuditRepository,
+  CreateWatchlistAuditInput,
+  UpdateWatchlistAuditInput,
+} from "../interface/IAuditRepository";
+import type { IWatchlistAuditService } from "../interface/IAuditService";
+import type { WatchlistAudit } from "../types";
+
+type Deps = {
+  auditRepository: IAuditRepository;
+};
+
+export class WatchlistAuditService implements IWatchlistAuditService {
+  constructor(private readonly deps: Deps) {}
+
+  async createAuditEntry(data: CreateWatchlistAuditInput): Promise<WatchlistAudit> {
+    return this.deps.auditRepository.create(data);
+  }
+
+  async getAuditEntry(id: string): Promise<WatchlistAudit | null> {
+    return this.deps.auditRepository.findById(id);
+  }
+
+  async getAuditHistory(watchlistId: string): Promise<WatchlistAudit[]> {
+    return this.deps.auditRepository.findByWatchlistId(watchlistId);
+  }
+
+  async updateAuditEntry(id: string, data: UpdateWatchlistAuditInput): Promise<WatchlistAudit> {
+    return this.deps.auditRepository.update(id, data);
+  }
+
+  async deleteAuditEntry(id: string): Promise<void> {
+    return this.deps.auditRepository.delete(id);
+  }
+
+  async getAuditEntries(filters?: {
+    watchlistId?: string;
+    changedByUserId?: number;
+    limit?: number;
+    offset?: number;
+  }): Promise<WatchlistAudit[]> {
+    return this.deps.auditRepository.findMany(filters);
+  }
+}
diff --git a/packages/features/watchlist/lib/service/WatchlistService.test.ts b/packages/features/watchlist/lib/service/WatchlistService.test.ts
new file mode 100644
index 00000000000000..c20fc55c7734a8
--- /dev/null
+++ b/packages/features/watchlist/lib/service/WatchlistService.test.ts
@@ -0,0 +1,373 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+import type {
+  IGlobalWatchlistRepository,
+  IOrganizationWatchlistRepository,
+} from "../interface/IWatchlistRepositories";
+import { WatchlistService } from "./WatchlistService";
+
+const mockGlobalRepo: IGlobalWatchlistRepository = {
+  findBlockedEmail: vi.fn(),
+  findBlockedDomain: vi.fn(),
+  findFreeEmailDomain: vi.fn(),
+  createEntry: vi.fn(),
+  updateEntry: vi.fn(),
+  deleteEntry: vi.fn(),
+  findById: vi.fn(),
+  listBlockedEntries: vi.fn(),
+};
+
+const mockOrgRepo: IOrganizationWatchlistRepository = {
+  findBlockedEmail: vi.fn(),
+  findBlockedDomain: vi.fn(),
+  createEntry: vi.fn(),
+  updateEntry: vi.fn(),
+  deleteEntry: vi.fn(),
+  findById: vi.fn(),
+  listBlockedEntries: vi.fn(),
+  listAllOrganizationEntries: vi.fn(),
+};
+
+const mockLogger = {
+  error: vi.fn(),
+  info: vi.fn(),
+  warn: vi.fn(),
+  debug: vi.fn(),
+};
+
+describe("WatchlistService", () => {
+  let service: WatchlistService;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    service = new WatchlistService({
+      globalRepo: mockGlobalRepo,
+      orgRepo: mockOrgRepo,
+      logger: mockLogger as never,
+    });
+  });
+
+  describe("createEntry", () => {
+    test("should create global entry with normalized email", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "test@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.createEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.createEntry({
+        type: WatchlistType.EMAIL,
+        value: "TEST@EXAMPLE.COM", // Not normalized
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+      });
+
+      expect(mockGlobalRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "test@example.com", // Normalized by service
+        description: undefined,
+        action: WatchlistAction.BLOCK,
+        source: undefined,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+
+    test("should create global entry with normalized domain", async () => {
+      const mockEntry = {
+        id: "456",
+        type: WatchlistType.DOMAIN,
+        value: "spam.com",
+        description: "Spam domain",
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.createEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.createEntry({
+        type: WatchlistType.DOMAIN,
+        value: "SPAM.COM", // Not normalized, no @ prefix
+        description: "Spam domain",
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+      });
+
+      expect(mockGlobalRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "spam.com", // Normalized without @ prefix
+        description: "Spam domain",
+        action: WatchlistAction.BLOCK,
+        source: undefined,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+
+    test("should create organization entry", async () => {
+      const mockEntry = {
+        id: "789",
+        type: WatchlistType.EMAIL,
+        value: "competitor@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: 123,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockOrgRepo.createEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.createEntry({
+        type: WatchlistType.EMAIL,
+        value: "COMPETITOR@EXAMPLE.COM",
+        action: WatchlistAction.BLOCK,
+        isGlobal: false,
+        organizationId: 123,
+      });
+
+      expect(mockOrgRepo.createEntry).toHaveBeenCalledWith(123, {
+        type: WatchlistType.EMAIL,
+        value: "competitor@example.com",
+        description: undefined,
+        action: WatchlistAction.BLOCK,
+        source: undefined,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+
+    test("should throw when organizationId missing for non-global entry", async () => {
+      await expect(
+        service.createEntry({
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          // organizationId missing!
+        })
+      ).rejects.toThrow("organizationId is required for organization-scoped entries");
+
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        "organizationId required for non-global entry",
+        expect.objectContaining({
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+        })
+      );
+    });
+
+    test("should create entry with FREE_DOMAIN_POLICY source", async () => {
+      const mockEntry = {
+        id: "free-1",
+        type: WatchlistType.DOMAIN,
+        value: "gmail.com",
+        description: null,
+        action: WatchlistAction.REPORT,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.FREE_DOMAIN_POLICY,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.createEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.createEntry({
+        type: WatchlistType.DOMAIN,
+        value: "gmail.com",
+        action: WatchlistAction.REPORT,
+        isGlobal: true,
+        source: WatchlistSource.FREE_DOMAIN_POLICY,
+      });
+
+      expect(mockGlobalRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "gmail.com",
+        description: undefined,
+        action: WatchlistAction.REPORT,
+        source: WatchlistSource.FREE_DOMAIN_POLICY,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+  });
+
+  describe("updateEntry", () => {
+    test("should update entry with normalized email", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "updated@example.com",
+        description: "Updated description",
+        action: WatchlistAction.ALERT,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.updateEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.updateEntry("123", {
+        type: WatchlistType.EMAIL,
+        value: "UPDATED@EXAMPLE.COM", // Not normalized
+        description: "Updated description",
+        action: WatchlistAction.ALERT,
+      });
+
+      expect(mockGlobalRepo.updateEntry).toHaveBeenCalledWith("123", {
+        type: WatchlistType.EMAIL,
+        value: "updated@example.com", // Normalized
+        description: "Updated description",
+        action: WatchlistAction.ALERT,
+        source: undefined,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+
+    test("should update entry without value change", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "test@example.com",
+        description: "New description",
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.updateEntry).mockResolvedValue(mockEntry);
+
+      const result = await service.updateEntry("123", {
+        type: WatchlistType.EMAIL, // Required for normalization
+        description: "New description",
+      });
+
+      expect(mockGlobalRepo.updateEntry).toHaveBeenCalledWith("123", {
+        type: WatchlistType.EMAIL,
+        description: "New description",
+        action: undefined,
+        source: undefined,
+      });
+      expect(result).toEqual(mockEntry);
+    });
+  });
+
+  describe("deleteEntry", () => {
+    test("should delete entry by id", async () => {
+      vi.mocked(mockGlobalRepo.deleteEntry).mockResolvedValue();
+
+      await service.deleteEntry("123");
+
+      expect(mockGlobalRepo.deleteEntry).toHaveBeenCalledWith("123");
+    });
+  });
+
+  describe("getEntry", () => {
+    test("should get entry by id", async () => {
+      const mockEntry = {
+        id: "123",
+        type: WatchlistType.EMAIL,
+        value: "test@example.com",
+        description: null,
+        action: WatchlistAction.BLOCK,
+        isGlobal: true,
+        organizationId: null,
+        source: WatchlistSource.MANUAL,
+        lastUpdatedAt: new Date(),
+      };
+
+      vi.mocked(mockGlobalRepo.findById).mockResolvedValue(mockEntry);
+
+      const result = await service.getEntry("123");
+
+      expect(mockGlobalRepo.findById).toHaveBeenCalledWith("123");
+      expect(result).toEqual(mockEntry);
+    });
+
+    test("should return null when entry not found", async () => {
+      vi.mocked(mockGlobalRepo.findById).mockResolvedValue(null);
+
+      const result = await service.getEntry("nonexistent");
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe("listAllSystemEntries", () => {
+    test("should return combined global and org entries", async () => {
+      const globalEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "global@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      const orgEntries = [
+        {
+          id: "2",
+          type: WatchlistType.DOMAIN,
+          value: "competitor.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          organizationId: 123,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      vi.mocked(mockGlobalRepo.listBlockedEntries).mockResolvedValue(globalEntries);
+      vi.mocked(mockOrgRepo.listAllOrganizationEntries).mockResolvedValue(orgEntries);
+
+      const result = await service.listAllSystemEntries();
+
+      expect(mockGlobalRepo.listBlockedEntries).toHaveBeenCalled();
+      expect(mockOrgRepo.listAllOrganizationEntries).toHaveBeenCalled();
+      expect(result).toHaveLength(2);
+      expect(result).toEqual([...globalEntries, ...orgEntries]);
+    });
+
+    test("should return empty array when no entries exist", async () => {
+      vi.mocked(mockGlobalRepo.listBlockedEntries).mockResolvedValue([]);
+      vi.mocked(mockOrgRepo.listAllOrganizationEntries).mockResolvedValue([]);
+
+      const result = await service.listAllSystemEntries();
+
+      expect(result).toEqual([]);
+    });
+
+    test("should fetch global and org entries in parallel", async () => {
+      const globalPromise = Promise.resolve([]);
+      const orgPromise = Promise.resolve([]);
+
+      vi.mocked(mockGlobalRepo.listBlockedEntries).mockReturnValue(globalPromise);
+      vi.mocked(mockOrgRepo.listAllOrganizationEntries).mockReturnValue(orgPromise);
+
+      await service.listAllSystemEntries();
+
+      // Verify both repository methods are invoked (implementation uses Promise.all)
+      expect(mockGlobalRepo.listBlockedEntries).toHaveBeenCalled();
+      expect(mockOrgRepo.listAllOrganizationEntries).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/features/watchlist/lib/service/WatchlistService.ts b/packages/features/watchlist/lib/service/WatchlistService.ts
new file mode 100644
index 00000000000000..6812cae9a4f95c
--- /dev/null
+++ b/packages/features/watchlist/lib/service/WatchlistService.ts
@@ -0,0 +1,87 @@
+import type logger from "@calcom/lib/logger";
+import { WatchlistType } from "@calcom/prisma/enums";
+
+import type {
+  IGlobalWatchlistRepository,
+  IOrganizationWatchlistRepository,
+} from "../interface/IWatchlistRepositories";
+import type { IWatchlistService } from "../interface/IWatchlistService";
+import type { WatchlistEntry, CreateWatchlistEntryData, UpdateWatchlistEntryData } from "../types";
+import { normalizeEmail, normalizeDomain } from "../utils/normalization";
+
+type Deps = {
+  globalRepo: IGlobalWatchlistRepository;
+  orgRepo: IOrganizationWatchlistRepository;
+  logger: ReturnType<typeof logger.getSubLogger>;
+};
+
+export class WatchlistService implements IWatchlistService {
+  private readonly log: ReturnType<typeof logger.getSubLogger>;
+
+  constructor(private readonly deps: Deps) {
+    this.log = deps.logger;
+  }
+
+  async createEntry(data: CreateWatchlistEntryData): Promise<WatchlistEntry> {
+    const isGlobal = data.isGlobal ?? false;
+
+    // Normalize value based on type (service layer responsibility)
+    const normalizedValue =
+      data.type === WatchlistType.EMAIL ? normalizeEmail(data.value) : normalizeDomain(data.value);
+
+    const payload = {
+      type: data.type,
+      value: normalizedValue,
+      description: data.description,
+      action: data.action,
+      source: data.source,
+    };
+
+    // Global path
+    if (isGlobal) {
+      return this.deps.globalRepo.createEntry(payload);
+    }
+
+    // Org path (validate, then narrow)
+    const orgId = data.organizationId;
+    if (orgId == null) {
+      this.log.error("organizationId required for non-global entry", { type: data.type, value: data.value });
+      throw new Error("organizationId is required for organization-scoped entries");
+    }
+
+    return this.deps.orgRepo.createEntry(orgId, payload);
+  }
+
+  async updateEntry(id: string, data: UpdateWatchlistEntryData): Promise<WatchlistEntry> {
+    // Normalize value if provided (service layer responsibility)
+    const payload = {
+      ...data,
+      ...(data.value && {
+        value: data.type === WatchlistType.EMAIL ? normalizeEmail(data.value) : normalizeDomain(data.value),
+      }),
+    };
+
+    return this.deps.globalRepo.updateEntry(id, payload);
+  }
+
+  async deleteEntry(id: string): Promise<void> {
+    return this.deps.globalRepo.deleteEntry(id);
+  }
+
+  async getEntry(id: string): Promise<WatchlistEntry | null> {
+    return this.deps.globalRepo.findById(id);
+  }
+
+  /**
+   * System admin method to get ALL watchlist entries across the entire system
+   * Returns both global entries and all organization-specific entries from every organization
+   */
+  async listAllSystemEntries(): Promise<WatchlistEntry[]> {
+    const [globalEntries, allOrgEntries] = await Promise.all([
+      this.deps.globalRepo.listBlockedEntries(),
+      this.deps.orgRepo.listAllOrganizationEntries(),
+    ]);
+
+    return [...globalEntries, ...allOrgEntries];
+  }
+}
diff --git a/packages/features/watchlist/lib/telemetry/index.ts b/packages/features/watchlist/lib/telemetry/index.ts
new file mode 100644
index 00000000000000..eb7a8816a4eb96
--- /dev/null
+++ b/packages/features/watchlist/lib/telemetry/index.ts
@@ -0,0 +1,3 @@
+export type { SpanOptions, SpanFn } from "./types";
+export { sentrySpan } from "./sentry-span";
+export { noOpSpan } from "./no-op-span";
diff --git a/packages/features/watchlist/lib/telemetry/no-op-span.ts b/packages/features/watchlist/lib/telemetry/no-op-span.ts
new file mode 100644
index 00000000000000..45997315e925f4
--- /dev/null
+++ b/packages/features/watchlist/lib/telemetry/no-op-span.ts
@@ -0,0 +1,9 @@
+import type { SpanFn } from "./types";
+
+/**
+ * No-op implementation of telemetry spans
+ * Useful for testing or when telemetry is disabled
+ */
+export const noOpSpan: SpanFn = async (_options, callback) => {
+  return Promise.resolve(callback());
+};
diff --git a/packages/features/watchlist/lib/telemetry/sentry-span.ts b/packages/features/watchlist/lib/telemetry/sentry-span.ts
new file mode 100644
index 00000000000000..a311e55cffba84
--- /dev/null
+++ b/packages/features/watchlist/lib/telemetry/sentry-span.ts
@@ -0,0 +1,11 @@
+import { startSpan } from "@sentry/nextjs";
+
+import type { SpanFn } from "./types";
+
+/**
+ * Sentry implementation of telemetry spans
+ * Wraps Sentry's startSpan for production use
+ */
+export const sentrySpan: SpanFn = async (options, callback) => {
+  return startSpan({ name: options.name, op: options.op }, callback);
+};
diff --git a/packages/features/watchlist/lib/telemetry/types.ts b/packages/features/watchlist/lib/telemetry/types.ts
new file mode 100644
index 00000000000000..1e215b10fec4c2
--- /dev/null
+++ b/packages/features/watchlist/lib/telemetry/types.ts
@@ -0,0 +1,11 @@
+/**
+ * Telemetry abstraction for tracing operations
+ * Allows injecting different implementations (Sentry, no-op, test mocks)
+ */
+
+export interface SpanOptions {
+  name: string;
+  op?: string;
+}
+
+export type SpanFn = <T>(options: SpanOptions, callback: () => T | Promise<T>) => Promise<T>;
diff --git a/packages/features/watchlist/lib/types.ts b/packages/features/watchlist/lib/types.ts
new file mode 100644
index 00000000000000..a230299c0c1ce6
--- /dev/null
+++ b/packages/features/watchlist/lib/types.ts
@@ -0,0 +1,61 @@
+import { WatchlistAction, WatchlistType, WatchlistSource } from "@calcom/prisma/enums";
+
+export { WatchlistAction, WatchlistType, WatchlistSource };
+
+export interface Watchlist {
+  id: string;
+  type: WatchlistType;
+  value: string;
+  description?: string | null;
+  isGlobal: boolean;
+  organizationId?: number | null;
+  action: WatchlistAction;
+  source: WatchlistSource;
+  lastUpdatedAt: Date;
+}
+
+export interface WatchlistAudit {
+  id: string;
+  type: WatchlistType;
+  value: string;
+  description?: string | null;
+  action: WatchlistAction;
+  changedAt: Date;
+  changedByUserId?: number | null;
+  watchlistId: string;
+}
+
+export interface WatchlistEventAudit {
+  id: string;
+  watchlistId: string;
+  eventTypeId: number;
+  actionTaken: WatchlistAction;
+  timestamp: Date;
+}
+
+// Input types for creating/updating watchlist entries
+export interface CreateWatchlistInput {
+  type: WatchlistType;
+  value: string;
+  description?: string;
+  isGlobal?: boolean;
+  organizationId?: number;
+  action: WatchlistAction;
+  source?: WatchlistSource;
+}
+
+export interface UpdateWatchlistInput {
+  type: WatchlistType; // Required to normalize value correctly without fetching
+  value?: string;
+  description?: string;
+  action?: WatchlistAction;
+  source?: WatchlistSource;
+}
+
+// Alias types for the service interface
+export type WatchlistEntry = Watchlist;
+export type CreateWatchlistEntryData = CreateWatchlistInput;
+export type UpdateWatchlistEntryData = UpdateWatchlistInput;
+
+// Type aliases for convenience
+export type WatchlistEvent = WatchlistEventAudit;
diff --git a/packages/features/watchlist/lib/utils/normalization.test.ts b/packages/features/watchlist/lib/utils/normalization.test.ts
new file mode 100644
index 00000000000000..a94d7173fe2e0a
--- /dev/null
+++ b/packages/features/watchlist/lib/utils/normalization.test.ts
@@ -0,0 +1,97 @@
+import { describe, expect, test } from "vitest";
+
+import { normalizeEmail, normalizeDomain, extractDomainFromEmail, normalizeUsername } from "./normalization";
+
+describe("normalization", () => {
+  describe("normalizeEmail", () => {
+    test("should normalize basic email", () => {
+      expect(normalizeEmail("Test@Example.COM")).toBe("test@example.com");
+      expect(normalizeEmail("  user@domain.org  ")).toBe("user@domain.org");
+    });
+
+    test("should throw on invalid emails", () => {
+      expect(() => normalizeEmail("invalid")).toThrow("Invalid email format");
+      expect(() => normalizeEmail("@domain.com")).toThrow("Invalid email format");
+      expect(() => normalizeEmail("user@")).toThrow("Invalid email format");
+    });
+  });
+
+  describe("normalizeDomain", () => {
+    test("should normalize basic domain", () => {
+      expect(normalizeDomain("Example.COM")).toBe("example.com");
+      expect(normalizeDomain("@Domain.ORG")).toBe("domain.org");
+      expect(normalizeDomain("  sub.domain.net  ")).toBe("sub.domain.net");
+    });
+
+    test("should preserve full domain including subdomains", () => {
+      expect(normalizeDomain("mail.google.com")).toBe("mail.google.com");
+      expect(normalizeDomain("sub.domain.example.org")).toBe("sub.domain.example.org");
+    });
+
+    test("should handle multi-level TLDs correctly", () => {
+      expect(normalizeDomain("example.co.uk")).toBe("example.co.uk");
+      expect(normalizeDomain("mail.example.co.uk")).toBe("mail.example.co.uk");
+      expect(normalizeDomain("company.com.au")).toBe("company.com.au");
+    });
+
+    test("should throw on invalid domains", () => {
+      expect(() => normalizeDomain("invalid..domain")).toThrow("Invalid domain format");
+      expect(() => normalizeDomain(".domain.com")).toThrow("Invalid domain format");
+      expect(() => normalizeDomain("domain.")).toThrow("Invalid domain format");
+    });
+  });
+
+  describe("extractDomainFromEmail", () => {
+    test("should extract and normalize domain from email", () => {
+      expect(extractDomainFromEmail("user@Example.COM")).toBe("example.com");
+      expect(extractDomainFromEmail("test@sub.domain.org")).toBe("sub.domain.org");
+      expect(extractDomainFromEmail("user@mail.google.com")).toBe("mail.google.com");
+    });
+
+    test("should handle multi-level TLDs", () => {
+      expect(extractDomainFromEmail("user@example.co.uk")).toBe("example.co.uk");
+      expect(extractDomainFromEmail("admin@mail.company.com.au")).toBe("mail.company.com.au");
+    });
+
+    test("should throw on invalid emails", () => {
+      expect(() => extractDomainFromEmail("invalid")).toThrow("Invalid email format");
+    });
+  });
+
+  describe("normalizeUsername", () => {
+    test("should normalize basic username", () => {
+      expect(normalizeUsername("TestUser")).toBe("testuser");
+      expect(normalizeUsername("  user_name  ")).toBe("user_name");
+      expect(normalizeUsername("User.Name-123")).toBe("user.name-123");
+    });
+
+    test("should preserve special characters", () => {
+      expect(normalizeUsername("user@name!")).toBe("user@name!");
+      expect(normalizeUsername("test.user-123")).toBe("test.user-123");
+    });
+
+    test("should throw on invalid usernames", () => {
+      expect(() => normalizeUsername("")).toThrow("Invalid username: must be a non-empty string");
+    });
+  });
+
+  describe("Edge cases and consistency", () => {
+    test("should handle international domains", () => {
+      // Note: In a real implementation, you might want to handle punycode
+      expect(normalizeDomain("münchen.de")).toBe("münchen.de");
+    });
+
+    test("should be consistent across multiple calls", () => {
+      const email = "Test.User+Tag@GMAIL.COM";
+      const result1 = normalizeEmail(email);
+      const result2 = normalizeEmail(email);
+      expect(result1).toBe(result2);
+    });
+
+    test("should handle empty strings gracefully", () => {
+      expect(() => normalizeEmail("")).toThrow();
+      expect(() => normalizeDomain("")).toThrow();
+      expect(() => normalizeUsername("")).toThrow();
+    });
+  });
+});
diff --git a/packages/features/watchlist/lib/utils/normalization.ts b/packages/features/watchlist/lib/utils/normalization.ts
new file mode 100644
index 00000000000000..04f2c2377ca203
--- /dev/null
+++ b/packages/features/watchlist/lib/utils/normalization.ts
@@ -0,0 +1,93 @@
+import { emailRegex } from "@calcom/lib/emailSchema";
+
+/**
+ * Centralized normalization utilities for emails and domains
+ *
+ */
+
+/**
+ * Normalizes an email address for consistent comparison
+ *
+ * Rules applied:
+ * 1. Convert to lowercase
+ * 2. Trim whitespace
+ * 3. Validate basic email format
+ *
+ * @param email - Raw email address
+ * @returns Normalized email address
+ * @throws Error if email format is invalid
+ */
+export function normalizeEmail(email: string): string {
+  const normalized = email.trim().toLowerCase();
+
+  if (!emailRegex.test(normalized)) {
+    throw new Error(`Invalid email format: ${email}`);
+  }
+  return normalized;
+}
+
+/**
+ * Normalizes a domain for consistent comparison
+ *
+ * Rules applied:
+ * 1. Convert to lowercase
+ * 2. Trim whitespace
+ * 3. Remove @ prefix if present
+ *
+ * Note: Domains are stored without @ prefix (e.g., mail.google.com, example.co.uk)
+ * No subdomain stripping is performed to avoid multi-level TLD issues.
+ * If you want to block subdomains separately, create separate entries.
+ *
+ * @param domain - Raw domain (with or without @ prefix)
+ * @returns Normalized domain without @ prefix
+ */
+export function normalizeDomain(domain: string): string {
+  let normalized = domain.trim().toLowerCase();
+
+  if (normalized.startsWith("@")) {
+    normalized = normalized.slice(1);
+  }
+
+  const domainRegex =
+    /^[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?(\.[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?)*$/;
+  if (!domainRegex.test(normalized)) {
+    throw new Error(`Invalid domain format: ${domain}`);
+  }
+
+  return normalized;
+}
+
+/**
+ * Extracts and normalizes domain from an email address
+ *
+ * @param email - Email address
+ * @returns Normalized domain without @ prefix
+ */
+export function extractDomainFromEmail(email: string): string {
+  const normalizedEmail = normalizeEmail(email);
+  const domain = normalizedEmail.split("@")[1];
+
+  if (!domain) {
+    throw new Error(`Could not extract domain from email: ${email}`);
+  }
+
+  return normalizeDomain(domain);
+}
+
+/**
+ * Normalizes a username for consistent comparison
+ *
+ * Rules applied:
+ * 1. Convert to lowercase
+ * 2. Trim whitespace
+ *
+ * @param username - Raw username
+ * @returns Normalized username
+ */
+export function normalizeUsername(username: string): string {
+  if (!username || typeof username !== "string") {
+    throw new Error("Invalid username: must be a non-empty string");
+  }
+
+  return username.trim().toLowerCase();
+}
diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
new file mode 100644
index 00000000000000..8d6337fedb88df
--- /dev/null
+++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
@@ -0,0 +1,247 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+import { WatchlistFeature } from "../lib/facade/WatchlistFeature";
+import type { SpanFn } from "../lib/telemetry";
+import { checkIfEmailIsBlockedInWatchlistController } from "./check-if-email-in-watchlist.controller";
+
+// Mock the DI container
+vi.mock("@calcom/features/di/watchlist/containers/watchlist", () => ({
+  getWatchlistFeature: vi.fn(),
+}));
+
+const mockGlobalBlocking = {
+  isBlocked: vi.fn(),
+};
+
+const mockOrgBlocking = {
+  isBlocked: vi.fn(),
+};
+
+const mockWatchlistFeature = {
+  globalBlocking: mockGlobalBlocking,
+  orgBlocking: mockOrgBlocking,
+  watchlist: {},
+  audit: {},
+};
+
+describe("checkIfEmailIsBlockedInWatchlistController", () => {
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    const { getWatchlistFeature } = await import("@calcom/features/di/watchlist/containers/watchlist");
+    vi.mocked(getWatchlistFeature).mockResolvedValue(mockWatchlistFeature as WatchlistFeature);
+  });
+
+  describe("Global blocking only", () => {
+    test("should return false when email not blocked globally", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "clean@example.com",
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("clean@example.com");
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled();
+    });
+
+    test("should return true when email blocked globally", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: { id: "123" },
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "blocked@example.com",
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("blocked@example.com");
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled(); // Short-circuit
+    });
+
+    test("should return true when domain blocked globally", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.DOMAIN,
+        watchlistEntry: { id: "456" },
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "user@spam.com",
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@spam.com");
+    });
+
+    test("should normalize email before checking", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      await checkIfEmailIsBlockedInWatchlistController({
+        email: "USER@EXAMPLE.COM",
+      });
+
+      // Email should be normalized by the time it reaches the service
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+    });
+  });
+
+  describe("Organization-specific blocking", () => {
+    test("should check org blocklist when organizationId provided", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+      mockOrgBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "user@example.com",
+        organizationId: 123,
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+      expect(mockOrgBlocking.isBlocked).toHaveBeenCalledWith("user@example.com", 123);
+    });
+
+    test("should return true when blocked in org blocklist", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+      mockOrgBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: { id: "org-123" },
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "competitor@example.com",
+        organizationId: 123,
+      });
+
+      expect(result).toBe(true);
+      expect(mockOrgBlocking.isBlocked).toHaveBeenCalledWith("competitor@example.com", 123);
+    });
+
+    test("should short-circuit on global block (not check org)", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: { id: "global-1" },
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "spam@example.com",
+        organizationId: 123,
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalled();
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled(); // Global takes precedence
+    });
+
+    test("should handle organizationId as null (explicit no-org)", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "user@example.com",
+        organizationId: null,
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalled();
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("Telemetry (span)", () => {
+    test("should call span when provided", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const mockSpan: SpanFn = vi.fn((options, callback) => {
+        return Promise.resolve(callback());
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "test@example.com",
+        span: mockSpan,
+      });
+
+      expect(result).toBe(false);
+      expect(mockSpan).toHaveBeenCalledWith(
+        { name: "checkIfEmailInWatchlist Controller" },
+        expect.any(Function)
+      );
+      expect(mockSpan).toHaveBeenCalledWith(
+        { name: "checkIfEmailInWatchlist Presenter", op: "serialize" },
+        expect.any(Function)
+      );
+    });
+
+    test("should not call span when not provided", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "test@example.com",
+        // No span provided
+      });
+
+      expect(result).toBe(false);
+      // No span to verify - just ensure it doesn't crash
+    });
+
+    test("should execute callback inside span", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+      });
+
+      let callbackExecuted = false;
+      const mockSpan: SpanFn = vi.fn(async (options, callback) => {
+        const result = await callback();
+        callbackExecuted = true;
+        return result;
+      });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "blocked@example.com",
+        span: mockSpan,
+      });
+
+      expect(result).toBe(true);
+      expect(callbackExecuted).toBe(true);
+    });
+  });
+
+  describe("Edge cases", () => {
+    test("should handle whitespace in email", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      await checkIfEmailIsBlockedInWatchlistController({
+        email: "  user@example.com  ",
+      });
+
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+    });
+
+    test("should handle case-insensitive email", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      await checkIfEmailIsBlockedInWatchlistController({
+        email: "UsEr@ExAmPlE.CoM",
+      });
+
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+    });
+
+    test("should handle organizationId as undefined", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfEmailIsBlockedInWatchlistController({
+        email: "user@example.com",
+        organizationId: undefined,
+      });
+
+      expect(result).toBe(false);
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
index e945f08ec24397..2b9ee6ef2321ad 100644
--- a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
+++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
@@ -1,33 +1,53 @@
-import { startSpan } from "@sentry/nextjs";
+import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
 
-import type { Watchlist } from "../watchlist.model";
-import { WatchlistRepository } from "../watchlist.repository";
+import type { SpanFn } from "../lib/telemetry";
+import { normalizeEmail } from "../lib/utils/normalization";
 
-/**
- * Controllers use Presenters to convert the data to a UI-friendly format just before
- * returning it to the "consumer". This helps us ship less JavaScript to the client (logic
- * and libraries to convert the data), helps prevent leaking any sensitive properties, like
- * emails or hashed passwords, and also helps us slim down the amount of data we're sending
- * back to the client.
- */
-function presenter(watchlistedEmail: Watchlist | null) {
-  return startSpan({ name: "checkIfEmailInWatchlist Presenter", op: "serialize" }, () => {
-    return !!watchlistedEmail;
-  });
+interface CheckEmailBlockedParams {
+  email: string;
+  organizationId?: number | null;
+  span?: SpanFn;
+}
+
+function presenter(isBlocked: boolean, span?: SpanFn): Promise<boolean> {
+  if (!span) {
+    return Promise.resolve(isBlocked);
+  }
+  return span({ name: "checkIfEmailInWatchlist Presenter", op: "serialize" }, () => isBlocked);
 }
 
 /**
- * Controllers perform authentication checks and input validation before passing the input
- * to the specific use cases. Controllers orchestrate Use Cases. They don't implement any
- * logic, but define the whole operations using use cases.
+ * Controllers perform auth/validation and orchestrate use-cases.
+ * Uses DI container for proper dependency management.
  */
 export async function checkIfEmailIsBlockedInWatchlistController(
-  email: string
-): Promise<ReturnType<typeof presenter>> {
-  return await startSpan({ name: "checkIfEmailInWatchlist Controller" }, async () => {
-    const lowercasedEmail = email.toLowerCase();
-    const watchlistRepository = new WatchlistRepository();
-    const watchlistedEmail = await watchlistRepository.getBlockedEmailInWatchlist(lowercasedEmail);
-    return presenter(watchlistedEmail);
-  });
+  params: CheckEmailBlockedParams
+): Promise<boolean> {
+  const { email, organizationId, span } = params;
+
+  const execute = async () => {
+    const normalizedEmail = normalizeEmail(email);
+
+    const watchlist = await getWatchlistFeature();
+
+    const globalResult = await watchlist.globalBlocking.isBlocked(normalizedEmail);
+    if (globalResult.isBlocked) {
+      return presenter(true, span);
+    }
+
+    if (organizationId != null) {
+      const orgResult = await watchlist.orgBlocking.isBlocked(normalizedEmail, organizationId);
+      if (orgResult.isBlocked) {
+        return presenter(true, span);
+      }
+    }
+
+    return presenter(false, span);
+  };
+
+  if (!span) {
+    return execute();
+  }
+
+  return span({ name: "checkIfEmailInWatchlist Controller" }, execute);
 }
diff --git a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
new file mode 100644
index 00000000000000..c4a9c86d4d8be8
--- /dev/null
+++ b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
@@ -0,0 +1,284 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+import type { SpanFn } from "../lib/telemetry";
+import { checkIfUsersAreBlocked } from "./check-if-users-are-blocked.controller";
+
+// Mock the DI container
+vi.mock("@calcom/features/di/watchlist/containers/watchlist", () => ({
+  getWatchlistFeature: vi.fn(),
+}));
+
+const mockGlobalBlocking = {
+  isBlocked: vi.fn(),
+};
+
+const mockOrgBlocking = {
+  isBlocked: vi.fn(),
+};
+
+const mockWatchlistFeature = {
+  globalBlocking: mockGlobalBlocking,
+  orgBlocking: mockOrgBlocking,
+  watchlist: {},
+  audit: {},
+};
+
+describe("checkIfUsersAreBlocked", () => {
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    const { getWatchlistFeature } = await import("@calcom/features/di/watchlist/containers/watchlist");
+    vi.mocked(getWatchlistFeature).mockResolvedValue(mockWatchlistFeature as never);
+  });
+
+  describe("Basic functionality", () => {
+    test("should return false when no users are blocked", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@example.com", username: "user1", locked: false },
+          { email: "user2@example.com", username: "user2", locked: false },
+        ],
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledTimes(2);
+    });
+
+    test("should return true when any user email is blocked globally", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValueOnce({ isBlocked: false }).mockResolvedValueOnce({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+        watchlistEntry: { id: "123" },
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "clean@example.com", username: "user1", locked: false },
+          { email: "blocked@spam.com", username: "user2", locked: false },
+        ],
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("clean@example.com");
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("blocked@spam.com");
+    });
+
+    test("should return true when any user domain is blocked", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValueOnce({ isBlocked: false }).mockResolvedValueOnce({
+        isBlocked: true,
+        reason: WatchlistType.DOMAIN,
+        watchlistEntry: { id: "456" },
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@clean.com", username: "user1", locked: false },
+          { email: "user2@blocked.com", username: "user2", locked: false },
+        ],
+      });
+
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("Early exit on locked user", () => {
+    test("should return true immediately if user is already locked", async () => {
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@example.com", username: "user1", locked: true }, // Already locked
+          { email: "user2@example.com", username: "user2", locked: false },
+        ],
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).not.toHaveBeenCalled(); // Should short-circuit
+    });
+
+    test("should short-circuit even if locked user is not first", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@example.com", username: "user1", locked: false },
+          { email: "user2@example.com", username: "user2", locked: true }, // Locked user second
+        ],
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).not.toHaveBeenCalled(); // Still short-circuits with .some()
+    });
+
+    test("should not call watchlist if all users are locked", async () => {
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@example.com", username: "user1", locked: true },
+          { email: "user2@example.com", username: "user2", locked: true },
+        ],
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("Organization-specific blocking", () => {
+    test("should check both global and org blocklists", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+      mockOrgBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "user@example.com", username: "user1", locked: false }],
+        organizationId: 123,
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+      expect(mockOrgBlocking.isBlocked).toHaveBeenCalledWith("user@example.com", 123);
+    });
+
+    test("should return true when blocked in org blocklist", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+      mockOrgBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "competitor@example.com", username: "user1", locked: false }],
+        organizationId: 123,
+      });
+
+      expect(result).toBe(true);
+    });
+
+    test("should short-circuit on global block (not check org)", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "spam@example.com", username: "user1", locked: false }],
+        organizationId: 123,
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalled();
+      expect(mockOrgBlocking.isBlocked).not.toHaveBeenCalled(); // Global block short-circuits
+    });
+  });
+
+  describe("Email normalization", () => {
+    test("should normalize emails before checking", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      await checkIfUsersAreBlocked({
+        users: [
+          { email: "USER1@EXAMPLE.COM", username: "user1", locked: false },
+          { email: "  user2@example.com  ", username: "user2", locked: false },
+        ],
+      });
+
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user1@example.com");
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user2@example.com");
+    });
+  });
+
+  describe("Edge cases", () => {
+    test("should skip users with no email", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "", username: "user1", locked: false }, // Empty email
+          { email: "user2@example.com", username: "user2", locked: false },
+        ],
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledTimes(1); // Only checks user2
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user2@example.com");
+    });
+
+    test("should return false for empty users array", async () => {
+      const result = await checkIfUsersAreBlocked({
+        users: [],
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).not.toHaveBeenCalled();
+    });
+
+    test("should handle users with null username", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "user@example.com", username: null, locked: false }],
+      });
+
+      expect(result).toBe(false);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledWith("user@example.com");
+    });
+  });
+
+  describe("Telemetry (span)", () => {
+    test("should call span when provided", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const mockSpan: SpanFn = vi.fn((options, callback) => {
+        return Promise.resolve(callback());
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "test@example.com", username: "test", locked: false }],
+        span: mockSpan,
+      });
+
+      expect(result).toBe(false);
+      expect(mockSpan).toHaveBeenCalledWith(
+        { name: "checkIfUsersAreBlocked Controller" },
+        expect.any(Function)
+      );
+      expect(mockSpan).toHaveBeenCalledWith(
+        { name: "checkIfUsersAreBlocked Presenter", op: "serialize" },
+        expect.any(Function)
+      );
+    });
+
+    test("should not call span when not provided", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValue({ isBlocked: false });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [{ email: "test@example.com", username: "test", locked: false }],
+        // No span provided
+      });
+
+      expect(result).toBe(false);
+      // No span to verify - just ensure it doesn't crash
+    });
+  });
+
+  describe("Performance optimization", () => {
+    test("should stop checking after finding blocked user", async () => {
+      mockGlobalBlocking.isBlocked.mockResolvedValueOnce({ isBlocked: false }).mockResolvedValueOnce({
+        isBlocked: true,
+        reason: WatchlistType.EMAIL,
+      });
+
+      const result = await checkIfUsersAreBlocked({
+        users: [
+          { email: "user1@example.com", username: "user1", locked: false },
+          { email: "blocked@example.com", username: "user2", locked: false },
+          { email: "user3@example.com", username: "user3", locked: false }, // Should not check this
+        ],
+      });
+
+      expect(result).toBe(true);
+      expect(mockGlobalBlocking.isBlocked).toHaveBeenCalledTimes(2); // Stops after 2nd user
+      expect(mockGlobalBlocking.isBlocked).not.toHaveBeenCalledWith("user3@example.com");
+    });
+  });
+});
diff --git a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.ts b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.ts
index 62b8e34e132752..11aec8ea31ee29 100644
--- a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.ts
+++ b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.ts
@@ -1,35 +1,53 @@
-import { startSpan } from "@sentry/nextjs";
+import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
+import type { SpanFn } from "@calcom/features/watchlist/lib/telemetry";
+import { normalizeEmail } from "@calcom/features/watchlist/lib/utils/normalization";
 
-import { WatchlistRepository } from "../watchlist.repository";
+function presenter(containsBlockedUser: boolean, span?: SpanFn): Promise<boolean> {
+  const result = !!containsBlockedUser;
+  if (!span) {
+    return Promise.resolve(result);
+  }
+  return span({ name: "checkIfUsersAreBlocked Presenter", op: "serialize" }, () => result);
+}
 
-function presenter(containsBlockedUser: boolean) {
-  return startSpan({ name: "checkIfUsersAreBlocked Presenter", op: "serialize" }, () => {
-    return !!containsBlockedUser;
-  });
+interface CheckUsersBlockedParams {
+  users: { email: string; username: string | null; locked: boolean }[];
+  organizationId?: number | null;
+  span?: SpanFn;
 }
 
-export async function checkIfUsersAreBlocked(
-  users: { email: string; username: string | null; locked: boolean }[]
-): Promise<ReturnType<typeof presenter>> {
-  const usernamesToCheck = [],
-    emailsToCheck = [],
-    domainsToCheck = [];
-
-  for (const user of users) {
-    // If any user is locked, then return true
-    if (user.locked) return true;
-    const emailDomain = user.email.split("@")[1];
-    if (user.username) usernamesToCheck.push(user.username);
-    emailsToCheck.push(user.email);
-    domainsToCheck.push(emailDomain);
-  }
+export async function checkIfUsersAreBlocked(params: CheckUsersBlockedParams): Promise<boolean> {
+  const { users, organizationId, span } = params;
+  const execute = async () => {
+    if (users.some((user) => user.locked)) {
+      return presenter(true, span);
+    }
+
+    const watchlist = await getWatchlistFeature();
+
+    for (const user of users) {
+      if (!user.email) continue;
+      const normalizedEmail = normalizeEmail(user.email);
 
-  const watchlistRepository = new WatchlistRepository();
-  const blockedRecords = await watchlistRepository.searchForAllBlockedRecords({
-    usernames: usernamesToCheck,
-    emails: emailsToCheck,
-    domains: domainsToCheck,
-  });
+      const globalResult = await watchlist.globalBlocking.isBlocked(normalizedEmail);
+      if (globalResult.isBlocked) {
+        return presenter(true, span);
+      }
+
+      if (organizationId) {
+        const orgResult = await watchlist.orgBlocking.isBlocked(normalizedEmail, organizationId);
+        if (orgResult.isBlocked) {
+          return presenter(true, span);
+        }
+      }
+    }
+
+    return presenter(false, span);
+  };
+
+  if (!span) {
+    return execute();
+  }
 
-  return presenter(blockedRecords.length > 0);
+  return span({ name: "checkIfUsersAreBlocked Controller" }, execute);
 }
diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
new file mode 100644
index 00000000000000..7e67c33c7757db
--- /dev/null
+++ b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
@@ -0,0 +1,327 @@
+import { describe, test, expect, vi, beforeEach } from "vitest";
+
+import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+import type { SpanFn } from "../lib/telemetry";
+import { listAllSystemEntriesController } from "./list-all-system-entries.controller";
+
+// Mock the DI container
+vi.mock("@calcom/features/di/watchlist/containers/watchlist", () => ({
+  getWatchlistFeature: vi.fn(),
+}));
+
+const mockWatchlistService = {
+  listAllSystemEntries: vi.fn(),
+};
+
+const mockWatchlistFeature: Partial<
+  ReturnType<typeof import("../lib/facade/WatchlistFeature").createWatchlistFeature>
+> = {
+  watchlist: mockWatchlistService as never,
+};
+
+describe("listAllSystemEntriesController", () => {
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    const { getWatchlistFeature } = await import("@calcom/features/di/watchlist/containers/watchlist");
+    vi.mocked(getWatchlistFeature).mockResolvedValue(
+      mockWatchlistFeature as ReturnType<typeof getWatchlistFeature>
+    );
+  });
+
+  describe("Basic functionality", () => {
+    test("should return all system entries (global + org)", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "global@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "2",
+          type: WatchlistType.DOMAIN,
+          value: "@competitor.com",
+          description: "Competitor domain",
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          organizationId: 123,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result).toEqual(mockEntries);
+      expect(result).toHaveLength(2);
+      expect(mockWatchlistService.listAllSystemEntries).toHaveBeenCalledTimes(1);
+    });
+
+    test("should return empty array when no entries exist", async () => {
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue([]);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result).toEqual([]);
+      expect(mockWatchlistService.listAllSystemEntries).toHaveBeenCalled();
+    });
+  });
+
+  describe("Entry types", () => {
+    test("should return entries of all types (EMAIL, DOMAIN, USERNAME)", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "email@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "2",
+          type: WatchlistType.DOMAIN,
+          value: "@domain.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "3",
+          type: WatchlistType.USERNAME,
+          value: "spammer123",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result).toHaveLength(3);
+      expect(result.map((e) => e.type)).toEqual([
+        WatchlistType.EMAIL,
+        WatchlistType.DOMAIN,
+        WatchlistType.USERNAME,
+      ]);
+    });
+
+    test("should return entries with different actions (BLOCK, REPORT, ALERT)", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "blocked@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "2",
+          type: WatchlistType.EMAIL,
+          value: "reported@example.com",
+          description: null,
+          action: WatchlistAction.REPORT,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "3",
+          type: WatchlistType.EMAIL,
+          value: "alert@example.com",
+          description: null,
+          action: WatchlistAction.ALERT,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result.map((e) => e.action)).toEqual([
+        WatchlistAction.BLOCK,
+        WatchlistAction.REPORT,
+        WatchlistAction.ALERT,
+      ]);
+    });
+
+    test("should return entries with different sources (MANUAL, FREE_DOMAIN_POLICY)", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "manual@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "2",
+          type: WatchlistType.DOMAIN,
+          value: "@gmail.com",
+          description: null,
+          action: WatchlistAction.REPORT,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.FREE_DOMAIN_POLICY,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result.map((e) => e.source)).toEqual([
+        WatchlistSource.MANUAL,
+        WatchlistSource.FREE_DOMAIN_POLICY,
+      ]);
+    });
+  });
+
+  describe("Multiple organizations", () => {
+    test("should return entries from multiple organizations", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "org1@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          organizationId: 100,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "2",
+          type: WatchlistType.EMAIL,
+          value: "org2@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          organizationId: 200,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+        {
+          id: "3",
+          type: WatchlistType.EMAIL,
+          value: "org3@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: false,
+          organizationId: 300,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const result = await listAllSystemEntriesController({});
+
+      expect(result).toHaveLength(3);
+      const orgIds = result.map((e) => e.organizationId);
+      expect(orgIds).toEqual([100, 200, 300]);
+      expect(new Set(orgIds).size).toBe(3); // All different orgs
+    });
+  });
+
+  describe("Telemetry (span)", () => {
+    test("should call span when provided", async () => {
+      const mockEntries = [
+        {
+          id: "1",
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+          description: null,
+          action: WatchlistAction.BLOCK,
+          isGlobal: true,
+          organizationId: null,
+          source: WatchlistSource.MANUAL,
+          lastUpdatedAt: new Date(),
+        },
+      ];
+
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue(mockEntries);
+
+      const mockSpan: SpanFn = vi.fn((options, callback) => {
+        return Promise.resolve(callback());
+      });
+
+      const result = await listAllSystemEntriesController({
+        span: mockSpan,
+      });
+
+      expect(result).toEqual(mockEntries);
+      expect(mockSpan).toHaveBeenCalledWith(
+        { name: "listAllSystemEntries Controller" },
+        expect.any(Function)
+      );
+    });
+
+    test("should not call span when not provided", async () => {
+      mockWatchlistService.listAllSystemEntries.mockResolvedValue([]);
+
+      const result = await listAllSystemEntriesController({
+        // No span provided
+      });
+
+      expect(result).toEqual([]);
+      // No span to verify - just ensure it doesn't crash
+    });
+  });
+
+  describe("Error handling", () => {
+    test("should propagate errors from service", async () => {
+      const error = new Error("Service error");
+      mockWatchlistService.listAllSystemEntries.mockRejectedValue(error);
+
+      await expect(listAllSystemEntriesController({})).rejects.toThrow("Service error");
+    });
+
+    test("should propagate errors from service when span is provided", async () => {
+      const error = new Error("Service error");
+      mockWatchlistService.listAllSystemEntries.mockRejectedValue(error);
+
+      const mockSpan: SpanFn = vi.fn((options, callback) => {
+        return Promise.resolve(callback());
+      });
+
+      await expect(listAllSystemEntriesController({ span: mockSpan })).rejects.toThrow("Service error");
+      expect(mockSpan).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.ts
new file mode 100644
index 00000000000000..43bd224019e5a1
--- /dev/null
+++ b/packages/features/watchlist/operations/list-all-system-entries.controller.ts
@@ -0,0 +1,31 @@
+import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
+
+import type { SpanFn } from "../lib/telemetry";
+import type { WatchlistEntry } from "../lib/types";
+
+interface ListAllSystemEntriesParams {
+  span?: SpanFn;
+}
+
+/**
+ * System admin controller to get ALL watchlist entries across the entire system
+ * Returns both global entries and all organization-specific entries from every organization
+ *
+ * This should only be accessible to system administrators
+ */
+export async function listAllSystemEntriesController(
+  params: ListAllSystemEntriesParams = {}
+): Promise<WatchlistEntry[]> {
+  const { span } = params;
+
+  const execute = async () => {
+    const watchlist = await getWatchlistFeature();
+    return watchlist.watchlist.listAllSystemEntries();
+  };
+
+  if (!span) {
+    return execute();
+  }
+
+  return span({ name: "listAllSystemEntries Controller" }, execute);
+}
diff --git a/packages/features/watchlist/watchlist.model.ts b/packages/features/watchlist/watchlist.model.ts
deleted file mode 100644
index 8b23eddb1ed413..00000000000000
--- a/packages/features/watchlist/watchlist.model.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { z } from "zod";
-
-import { WatchlistSchema } from "@calcom/prisma/zod/modelSchema/WatchlistSchema";
-
-export const WatchlistModelSchema = WatchlistSchema.pick({
-  id: true,
-  type: true,
-  value: true,
-  description: true,
-  createdAt: true,
-  createdById: true,
-  updatedAt: true,
-  updatedById: true,
-});
-
-export type Watchlist = z.infer<typeof WatchlistModelSchema>;
-
-export const insertWatchlistSchema = WatchlistModelSchema.pick({
-  type: true,
-  value: true,
-  description: true,
-});
diff --git a/packages/features/watchlist/watchlist.repository.interface.ts b/packages/features/watchlist/watchlist.repository.interface.ts
deleted file mode 100644
index 7ba722454be1cb..00000000000000
--- a/packages/features/watchlist/watchlist.repository.interface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type { Watchlist } from "./watchlist.model";
-
-export interface IWatchlistRepository {
-  getBlockedEmailInWatchlist(email: string): Promise<Watchlist | null>;
-}
diff --git a/packages/features/watchlist/watchlist.repository.mock.ts b/packages/features/watchlist/watchlist.repository.mock.ts
deleted file mode 100644
index b41c215ed81fd3..00000000000000
--- a/packages/features/watchlist/watchlist.repository.mock.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { WatchlistType } from "@calcom/prisma/enums";
-
-import type { IWatchlistRepository } from "./watchlist.repository.interface";
-
-export class MockFeaturesRepository implements IWatchlistRepository {
-  async getEmailInWatchlist(email: string) {
-    if (email !== "watchlisted@example.com") return null;
-    return {
-      id: "1",
-      type: WatchlistType.EMAIL,
-      value: "watchlisted@example.com",
-      description: "This is a watchlisted email",
-      createdAt: new Date(),
-      createdById: 1,
-      updatedAt: new Date(),
-      updatedById: 1,
-    };
-  }
-}
diff --git a/packages/features/watchlist/watchlist.repository.ts b/packages/features/watchlist/watchlist.repository.ts
deleted file mode 100644
index b986bf9b9a34a6..00000000000000
--- a/packages/features/watchlist/watchlist.repository.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { captureException } from "@sentry/nextjs";
-
-import db from "@calcom/prisma";
-import { WatchlistType } from "@calcom/prisma/enums";
-
-import type { IWatchlistRepository } from "./watchlist.repository.interface";
-
-export class WatchlistRepository implements IWatchlistRepository {
-  async getBlockedEmailInWatchlist(email: string) {
-    const [, domain] = email.split("@");
-    try {
-      const emailInWatchlist = await db.watchlist.findFirst({
-        where: {
-          OR: [
-            { type: WatchlistType.EMAIL, value: email },
-            { type: WatchlistType.DOMAIN, value: domain },
-          ],
-        },
-      });
-      return emailInWatchlist;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
-  }
-
-  async getFreeEmailDomainInWatchlist(emailDomain: string) {
-    try {
-      const domainInWatchWatchlist = await db.watchlist.findFirst({
-        where: {
-          type: WatchlistType.DOMAIN,
-          value: emailDomain,
-        },
-      });
-      return domainInWatchWatchlist;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
-  }
-
-  /** Returns a boolean if any of the users passed are blocked */
-  async searchForAllBlockedRecords({
-    usernames,
-    emails,
-    domains,
-  }: {
-    usernames: string[];
-    emails: string[];
-    domains: string[];
-  }) {
-    try {
-      const blockedRecords = await db.watchlist.findMany({
-        where: {
-          OR: [
-            ...(usernames.length > 0
-              ? [
-                  {
-                    type: WatchlistType.USERNAME,
-                    value: {
-                      in: usernames,
-                    },
-                  },
-                ]
-              : []),
-            ...(emails.length > 0
-              ? [
-                  {
-                    type: WatchlistType.EMAIL,
-                    value: {
-                      in: emails,
-                    },
-                  },
-                ]
-              : []),
-            ...(domains.length > 0
-              ? [
-                  {
-                    type: WatchlistType.DOMAIN,
-                    value: {
-                      in: domains,
-                    },
-                  },
-                ]
-              : []),
-          ],
-        },
-      });
-      return blockedRecords;
-    } catch (err) {
-      captureException(err);
-      throw err;
-    }
-  }
-}
diff --git a/packages/features/webhooks/lib/dto/types.ts b/packages/features/webhooks/lib/dto/types.ts
index 34dcbfce3962e8..ba849372c3870d 100644
--- a/packages/features/webhooks/lib/dto/types.ts
+++ b/packages/features/webhooks/lib/dto/types.ts
@@ -1,5 +1,5 @@
 import type { TGetTranscriptAccessLink } from "@calcom/app-store/dailyvideo/zod";
-import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/trpc/utils";
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
 import type { TimeUnit, WebhookTriggerEvents } from "@calcom/prisma/enums";
 import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
diff --git a/packages/features/webhooks/lib/factory/FormPayloadBuilder.ts b/packages/features/webhooks/lib/factory/FormPayloadBuilder.ts
index 86a4a4dd5bfef5..d1dae27bd79974 100644
--- a/packages/features/webhooks/lib/factory/FormPayloadBuilder.ts
+++ b/packages/features/webhooks/lib/factory/FormPayloadBuilder.ts
@@ -1,4 +1,4 @@
-import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/trpc/utils";
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
 import { WebhookTriggerEvents } from "@calcom/prisma/enums";
 
 import type { FormSubmittedDTO, FormSubmittedNoEventDTO } from "../dto/types";
diff --git a/packages/features/webhooks/lib/interface/repository.ts b/packages/features/webhooks/lib/interface/repository.ts
index 5431372bbfddb3..3e893922101dcb 100644
--- a/packages/features/webhooks/lib/interface/repository.ts
+++ b/packages/features/webhooks/lib/interface/repository.ts
@@ -1,4 +1,5 @@
-import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
+import type { WebhookTriggerEvents, UserPermissionRole } from "@calcom/prisma/enums";
+import type { Webhook } from "@calcom/prisma/client";
 
 import type { WebhookSubscriber } from "../dto/types";
 
@@ -11,6 +12,48 @@ export interface GetSubscribersOptions {
   oAuthClientId?: string | null;
 }
 
+type WebhookGroup = {
+  teamId?: number | null;
+  profile: {
+    slug: string | null;
+    name: string | null;
+    image?: string;
+  };
+  metadata?: {
+    canModify: boolean;
+    canDelete: boolean;
+  };
+  webhooks: Webhook[];
+};
+
 export interface IWebhookRepository {
   getSubscribers(options: GetSubscribersOptions): Promise<WebhookSubscriber[]>;
+  getWebhookById(id: string): Promise<WebhookSubscriber | null>;
+  findByWebhookId(webhookId?: string): Promise<{
+    id: string;
+    subscriberUrl: string;
+    payloadTemplate: string | null;
+    active: boolean;
+    eventTriggers: WebhookTriggerEvents[];
+    secret: string | null;
+    teamId: number | null;
+    userId: number | null;
+    platform: boolean;
+    time: number | null;
+    timeUnit: string | null;
+  }>;
+  getFilteredWebhooksForUser(options: {
+    userId: number;
+    userRole?: UserPermissionRole;
+  }): Promise<{
+    webhookGroups: WebhookGroup[];
+    profiles: {
+      teamId: number | null | undefined;
+      slug: string | null;
+      name: string | null;
+      image?: string | undefined;
+      canModify?: boolean;
+      canDelete?: boolean;
+    }[];
+  }>;
 }
diff --git a/packages/features/webhooks/lib/repository/WebhookRepository.ts b/packages/features/webhooks/lib/repository/WebhookRepository.ts
index 8bfba518ddac68..a777cc3fa20149 100644
--- a/packages/features/webhooks/lib/repository/WebhookRepository.ts
+++ b/packages/features/webhooks/lib/repository/WebhookRepository.ts
@@ -1,7 +1,12 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
+import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import { prisma as defaultPrisma } from "@calcom/prisma";
 import type { PrismaClient } from "@calcom/prisma";
+import type { Webhook } from "@calcom/prisma/client";
 import type { TimeUnit, WebhookTriggerEvents } from "@calcom/prisma/enums";
+import { UserPermissionRole, MembershipRole } from "@calcom/prisma/enums";
 
 import type { WebhookSubscriber } from "../dto/types";
 import type { IWebhookRepository } from "../interface/repository";
@@ -20,9 +25,42 @@ interface WebhookQueryResult {
   priority: number; // This field is added by the query and removed before returning
 }
 
+type WebhookGroup = {
+  teamId?: number | null;
+  profile: {
+    slug: string | null;
+    name: string | null;
+    image?: string;
+  };
+  metadata?: {
+    canModify: boolean;
+    canDelete: boolean;
+  };
+  webhooks: Webhook[];
+};
+
+const filterWebhooks = (webhook: Webhook) => {
+  const appIds = [
+    "zapier",
+    "make",
+    // Add more if needed
+  ];
+
+  return !appIds.some((appId: string) => webhook.appId == appId);
+};
+
 export class WebhookRepository implements IWebhookRepository {
   constructor(private prisma: PrismaClient = defaultPrisma) {}
 
+  private static _instance: WebhookRepository;
+
+  static getInstance(): WebhookRepository {
+    if (!WebhookRepository._instance) {
+      WebhookRepository._instance = new WebhookRepository();
+    }
+    return WebhookRepository._instance;
+  }
+
   async getSubscribers(options: GetSubscribersOptions): Promise<WebhookSubscriber[]> {
     const teamId = options.teamId;
     const userId = options.userId;
@@ -201,9 +239,164 @@ export class WebhookRepository implements IWebhookRepository {
       eventTriggers: webhook.eventTriggers,
     };
   }
+
+  async findByWebhookId(webhookId?: string) {
+    return await this.prisma.webhook.findUniqueOrThrow({
+      where: {
+        id: webhookId,
+      },
+      select: {
+        id: true,
+        subscriberUrl: true,
+        payloadTemplate: true,
+        active: true,
+        eventTriggers: true,
+        secret: true,
+        teamId: true,
+        userId: true,
+        platform: true,
+        time: true,
+        timeUnit: true,
+      },
+    });
+  }
+
+  async getFilteredWebhooksForUser({ userId, userRole }: { userId: number; userRole?: UserPermissionRole }) {
+    const user = await this.prisma.user.findUnique({
+      where: { id: userId },
+      select: {
+        id: true,
+        username: true,
+        name: true,
+        avatarUrl: true,
+        webhooks: true,
+        teams: {
+          where: {
+            accepted: true,
+          },
+          select: {
+            role: true,
+            team: {
+              select: {
+                id: true,
+                name: true,
+                slug: true,
+                logoUrl: true,
+                webhooks: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!user) {
+      throw new Error("User not found");
+    }
+
+    // Use permission service which handles both PBAC and role-based fallbacks
+    const permissionService = new PermissionCheckService();
+
+    // Build webhook groups with proper permissions
+    const webhookGroups: WebhookGroup[] = [];
+
+    // Add user's personal webhooks
+    webhookGroups.push({
+      teamId: null,
+      profile: {
+        slug: user.username,
+        name: user.name,
+        image: getUserAvatarUrl({ avatarUrl: user.avatarUrl }),
+      },
+      webhooks: user.webhooks.filter(filterWebhooks),
+      metadata: {
+        canModify: true,
+        canDelete: true,
+      },
+    });
+
+    // Check permissions for each team
+    // The permission service handles PBAC when enabled and falls back to role-based permissions
+    for (const membership of user.teams) {
+      const teamId = membership.team.id;
+
+      // Check read permission (fallback: MEMBER, ADMIN, OWNER can read)
+      const canRead = await permissionService.checkPermission({
+        userId,
+        teamId,
+        permission: "webhook.read",
+        fallbackRoles: [MembershipRole.MEMBER, MembershipRole.ADMIN, MembershipRole.OWNER],
+      });
+
+      if (!canRead) {
+        // User doesn't have permission to view this team's webhooks
+        continue;
+      }
+
+      // Check update/delete permissions in parallel (fallback: only ADMIN, OWNER can modify)
+      const [canUpdate, canDelete] = await Promise.all([
+        permissionService.checkPermission({
+          userId,
+          teamId,
+          permission: "webhook.update",
+          fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+        }),
+        permissionService.checkPermission({
+          userId,
+          teamId,
+          permission: "webhook.delete",
+          fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+        }),
+      ]);
+
+      webhookGroups.push({
+        teamId: membership.team.id,
+        profile: {
+          name: membership.team.name,
+          slug: membership.team.slug || null,
+          image: getPlaceholderAvatar(membership.team.logoUrl, membership.team.name),
+        },
+        webhooks: membership.team.webhooks.filter(filterWebhooks),
+        metadata: {
+          canModify: canUpdate,
+          canDelete,
+        },
+      });
+    }
+
+    // Add platform webhooks for admins
+    if (userRole === UserPermissionRole.ADMIN) {
+      const platformWebhooks = await this.prisma.webhook.findMany({
+        where: { platform: true },
+      });
+
+      webhookGroups.push({
+        teamId: null,
+        profile: {
+          slug: "Platform",
+          name: "Platform",
+          image: getPlaceholderAvatar(null, "Platform"),
+        },
+        webhooks: platformWebhooks,
+        metadata: {
+          canDelete: true,
+          canModify: true,
+        },
+      });
+    }
+
+    return {
+      webhookGroups: webhookGroups.filter((group) => group.webhooks.length > 0),
+      profiles: webhookGroups.map((group) => ({
+        teamId: group.teamId,
+        ...group.profile,
+        ...group.metadata,
+      })),
+    };
+  }
 }
 
 export const webhookRepository = withReporting(
-  (options: GetSubscribersOptions) => new WebhookRepository().getSubscribers(options),
+  (options: GetSubscribersOptions) => WebhookRepository.getInstance().getSubscribers(options),
   "WebhookRepository.getSubscribers"
 );
diff --git a/packages/features/webhooks/lib/scheduleTrigger.ts b/packages/features/webhooks/lib/scheduleTrigger.ts
index 02485d3f8196f4..3d60ec3b5638af 100644
--- a/packages/features/webhooks/lib/scheduleTrigger.ts
+++ b/packages/features/webhooks/lib/scheduleTrigger.ts
@@ -1,10 +1,10 @@
 import { v4 } from "uuid";
 
+import { DailyLocationType, getHumanReadableLocationValue } from "@calcom/app-store/locations";
 import { selectOOOEntries } from "@calcom/app-store/zapier/api/subscriptions/listOOOEntries";
 import dayjs from "@calcom/dayjs";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import tasker from "@calcom/features/tasker";
-import { DailyLocationType, getHumanReadableLocationValue } from "@calcom/app-store/locations";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
@@ -12,6 +12,7 @@ import { getTranslation } from "@calcom/lib/server/i18n";
 import { prisma } from "@calcom/prisma";
 import type { Prisma, Webhook, Booking, ApiKey } from "@calcom/prisma/client";
 import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums";
+import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
 
 const SCHEDULING_TRIGGER: WebhookTriggerEvents[] = [
   WebhookTriggerEvents.MEETING_ENDED,
@@ -204,6 +205,7 @@ export async function listBookings(
         id: "desc",
       },
       select: {
+        uid: true,
         title: true,
         description: true,
         customInputs: true,
@@ -213,6 +215,7 @@ export async function listBookings(
         location: true,
         cancellationReason: true,
         status: true,
+        metadata: true,
         user: {
           select: {
             username: true,
@@ -249,6 +252,7 @@ export async function listBookings(
     const t = await getTranslation(bookings[0].user?.locale ?? "en", "common");
 
     const updatedBookings = bookings.map((booking) => {
+      const parsedMetadata = bookingMetadataSchema.safeParse(booking.metadata || {});
       return {
         ...booking,
         ...getCalEventResponses({
@@ -256,6 +260,9 @@ export async function listBookings(
           booking,
         }),
         location: getHumanReadableLocationValue(booking.location || "", t),
+        metadata: {
+          videoCallUrl: parsedMetadata.success ? parsedMetadata.data?.videoCallUrl : undefined,
+        },
       };
     });
 
diff --git a/packages/features/webhooks/lib/sendPayload.ts b/packages/features/webhooks/lib/sendPayload.ts
index 835636e2bf8894..f4b78ed349996b 100644
--- a/packages/features/webhooks/lib/sendPayload.ts
+++ b/packages/features/webhooks/lib/sendPayload.ts
@@ -78,6 +78,7 @@ export type OOOEntryPayloadType = {
 export type EventPayloadType = CalendarEvent &
   TranscriptionGeneratedPayload &
   EventTypeInfo & {
+    uid?: string | null;
     metadata?: { [key: string]: string | number | boolean | null };
     bookingId?: number;
     status?: string;
@@ -130,6 +131,7 @@ function getZapierPayload(data: WithUTCOffsetType<EventPayloadType & { createdAt
   const location = getHumanReadableLocationValue(data.location || "", t);
 
   const body = {
+    uid: data.uid,
     title: data.title,
     description: data.description,
     customInputs: data.customInputs,
@@ -159,6 +161,9 @@ function getZapierPayload(data: WithUTCOffsetType<EventPayloadType & { createdAt
     },
     attendees: attendees,
     createdAt: data.createdAt,
+    metadata: {
+      videoCallUrl: data.metadata?.videoCallUrl,
+    },
   };
   return JSON.stringify(body);
 }
@@ -175,7 +180,7 @@ function applyTemplate(template: string, data: WebhookDataType, contentType: Con
 export function jsonParse(jsonString: string) {
   try {
     return JSON.parse(jsonString);
-  } catch (e) {
+  } catch {
     // don't do anything.
   }
   return false;
diff --git a/packages/features/webhooks/lib/service/FormWebhookService.ts b/packages/features/webhooks/lib/service/FormWebhookService.ts
index 82ac1e1948613c..cd26f1eafc0987 100644
--- a/packages/features/webhooks/lib/service/FormWebhookService.ts
+++ b/packages/features/webhooks/lib/service/FormWebhookService.ts
@@ -1,4 +1,4 @@
-import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/trpc/utils";
+import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
 import dayjs from "@calcom/dayjs";
 import { WebhookTriggerEvents } from "@calcom/prisma/enums";
 
diff --git a/packages/features/webhooks/pages/webhooks-view.tsx b/packages/features/webhooks/pages/webhooks-view.tsx
index edfa2350e58fa8..5905d1e834149c 100644
--- a/packages/features/webhooks/pages/webhooks-view.tsx
+++ b/packages/features/webhooks/pages/webhooks-view.tsx
@@ -2,9 +2,9 @@
 
 import { useRouter } from "next/navigation";
 
+import { useBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import classNames from "@calcom/ui/classNames";
diff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.ts
index 454cebcc4f2753..03e1b6ac6f756a 100644
--- a/packages/lib/CalEventParser.ts
+++ b/packages/lib/CalEventParser.ts
@@ -2,10 +2,10 @@ import type { TFunction } from "i18next";
 import short from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
 
+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";
 import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
 import { WEBAPP_URL } from "./constants";
-import getLabelValueMapFromResponses from "./getLabelValueMapFromResponses";
 import isSmsCalEmail from "./isSmsCalEmail";
 
 const translator = short();
diff --git a/packages/features/bookings/lib/SystemField.ts b/packages/lib/bookings/SystemField.ts
similarity index 100%
rename from packages/features/bookings/lib/SystemField.ts
rename to packages/lib/bookings/SystemField.ts
diff --git a/packages/lib/getLabelValueMapFromResponses.ts b/packages/lib/bookings/getLabelValueMapFromResponses.ts
similarity index 89%
rename from packages/lib/getLabelValueMapFromResponses.ts
rename to packages/lib/bookings/getLabelValueMapFromResponses.ts
index 5779b17327966d..d72eb52afa92be 100644
--- a/packages/lib/getLabelValueMapFromResponses.ts
+++ b/packages/lib/bookings/getLabelValueMapFromResponses.ts
@@ -1,7 +1,7 @@
 import type z from "zod";
 
-import { TITLE_FIELD, SMS_REMINDER_NUMBER_FIELD } from "@calcom/features/bookings/lib/SystemField";
-import type { bookingResponse } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
+import { TITLE_FIELD, SMS_REMINDER_NUMBER_FIELD } from "@calcom/lib/bookings/SystemField";
+import type { dbReadResponseSchema as bookingResponse } from "@calcom/lib/dbReadResponseSchema";
 import type { CalendarEvent } from "@calcom/types/Calendar";
 
 export default function getLabelValueMapFromResponses(
diff --git a/packages/lib/csvUtils.ts b/packages/lib/csvUtils.ts
index 2238bb46743d0c..a99c3daeb9750f 100644
--- a/packages/lib/csvUtils.ts
+++ b/packages/lib/csvUtils.ts
@@ -1,7 +1,3 @@
-import type { Table } from "@tanstack/react-table";
-
-import type { UserTableUser } from "@calcom/features/users/components/UserTable/types";
-
 export const downloadAsCsv = (data: string | Record<string, any>[], filename: string) => {
   // If data is an array of objects, convert it to CSV string
   const csvString = typeof data === "string" ? data : objectsToCsv(data);
@@ -61,92 +57,3 @@ export const sanitizeValue = (value: string) => {
   }
   return value;
 };
-
-export const generateHeaderFromReactTable = (table: Table<UserTableUser>): string[] | null => {
-  const headerGroups = table.getHeaderGroups();
-  if (!headerGroups.length) {
-    return null;
-  }
-
-  const { headers } = headerGroups[0];
-  const HEADER_IDS_TO_EXCLUDE = ["select", "actions"]; // these columns only make sense in web page
-  const filteredHeaders = headers.filter((header) => !HEADER_IDS_TO_EXCLUDE.includes(header.id));
-  const headerNames = filteredHeaders.map((header) => {
-    const h = header.column.columnDef.header;
-    if (typeof h === "string") {
-      return sanitizeValue(h);
-    }
-    if (typeof h === "function") {
-      return sanitizeValue(h(header.getContext()));
-    }
-    return "Unknown";
-  });
-
-  // Add "Link" column (member's public page)
-  const MEMBERS_COLUMN = "Members";
-  const LINK_COLUMN = "Link";
-  const memberIndex = headerNames.findIndex((name) => name === MEMBERS_COLUMN);
-  if (memberIndex > -1) {
-    headerNames.splice(memberIndex + 1, 0, LINK_COLUMN);
-  }
-
-  return headerNames;
-};
-
-export const generateCsvRawForMembersTable = (
-  headers: string[],
-  rows: UserTableUser[],
-  ATTRIBUTE_IDS: string[],
-  orgDomain: string
-): string => {
-  if (!headers.length) {
-    throw new Error("The header is empty.");
-  }
-
-  const REQUIRED_HEADERS = ["Members", "Link", "Role", "Teams"] as const;
-  // Validate required headers are present and in correct order
-  const firstFourHeaders = headers.slice(0, REQUIRED_HEADERS.length);
-  if (!REQUIRED_HEADERS.every((header, index) => header === firstFourHeaders[index])) {
-    throw new Error(
-      `Invalid headers structure. Expected headers to start with: ${JSON.stringify(REQUIRED_HEADERS)}`
-    );
-  }
-
-  // Body formation
-  const csvRows = rows.map((row) => {
-    const { email, role, teams, username, attributes } = row;
-
-    // Create a map of attributeId to array of values
-    const attributeMap = (attributes ?? []).reduce((acc, attr) => {
-      if (!acc[attr.attributeId]) {
-        acc[attr.attributeId] = [];
-      }
-      acc[attr.attributeId].push({
-        value: attr.value,
-        weight: attr.weight ?? undefined,
-      });
-      return acc;
-    }, {} as Record<string, { value: string; weight: number | undefined }[]>);
-
-    const requiredColumns = [
-      email, // Members column
-      `${orgDomain}/${username}`, // Link column
-      role, // Role column
-      sanitizeValue(teams.map((team) => team.name).join(",")), // Teams column
-    ];
-
-    // Add attribute columns
-    const attributeColumns = ATTRIBUTE_IDS.map((attrId) => {
-      const attributes = attributeMap[attrId];
-      if (!attributes?.length) return "";
-
-      return sanitizeValue(
-        attributes.map((attr) => (attr.weight ? `${attr.value} (${attr.weight}%)` : attr.value)).join(",")
-      );
-    });
-
-    return [...requiredColumns, ...attributeColumns];
-  });
-
-  return [headers.join(","), ...csvRows.map((row) => row.join(","))].join("\n");
-};
diff --git a/packages/lib/dbReadResponseSchema.ts b/packages/lib/dbReadResponseSchema.ts
new file mode 100644
index 00000000000000..973fde46913923
--- /dev/null
+++ b/packages/lib/dbReadResponseSchema.ts
@@ -0,0 +1,18 @@
+import { z } from "zod";
+
+/**
+ * DB Read schema has no field type based validation because user might change the type of a field from Type1 to Type2 after some data has been collected with Type1.
+ * Parsing that type1 data with type2 schema will fail.
+ * So, we just validate that the response conforms to one of the field types' schema.
+ */
+export const dbReadResponseSchema = z.union([
+  z.string(),
+  z.boolean(),
+  z.string().array(),
+  z.object({
+    optionValue: z.string(),
+    value: z.string(),
+  }),
+  // For variantsConfig case
+  z.record(z.string()),
+]);
diff --git a/packages/lib/emailSchema.ts b/packages/lib/emailSchema.ts
index bad54fa8e73cda..d91d7b9ccc211a 100644
--- a/packages/lib/emailSchema.ts
+++ b/packages/lib/emailSchema.ts
@@ -1,9 +1,19 @@
 import { z } from "zod";
 
 /** @see https://github.com/colinhacks/zod/issues/3155#issuecomment-2060045794 */
+
 export const emailRegex =
+  /* eslint-disable-next-line no-useless-escape */
   /^(?!\.)(?!.*\.\.)([A-Z0-9_+-\.']*)[A-Z0-9_+'-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
 
+/**
+ * Domain regex for watchlist entries
+ * Supports international domains with Unicode characters
+ * Examples: example.com, münchen.de, example.co.uk
+ */
+export const domainRegex =
+  /^[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?(\.[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?)*$/;
+
 /**
  * RFC 5321 Section 4.5.3.1.3 specifies:
  * - Maximum email address length: 254 characters
diff --git a/packages/lib/errorCodes.ts b/packages/lib/errorCodes.ts
index b015ae9164de25..901320d002291c 100644
--- a/packages/lib/errorCodes.ts
+++ b/packages/lib/errorCodes.ts
@@ -26,4 +26,8 @@ export enum ErrorCode {
   EventTypeNoHosts = "event_type_no_hosts",
   RequestBodyInvalid = "request_body_invalid_error",
   PrivateLinkExpired = "private_link_expired",
+  BookerEmailBlocked = "booker_email_blocked",
+  BookerEmailRequiresLogin = "booker_email_requires_login",
+  InvalidVerificationCode = "invalid_verification_code",
+  UnableToValidateVerificationCode = "unable_to_validate_verification_code",
 }
diff --git a/packages/lib/eslint.config.mjs b/packages/lib/eslint.config.mjs
index cac9f72e6af162..c47ff3ffeda109 100644
--- a/packages/lib/eslint.config.mjs
+++ b/packages/lib/eslint.config.mjs
@@ -8,4 +8,9 @@ export default [
     target: ".",
     message: "lib package should not import from app-store to avoid circular dependencies.",
   }),
+  forbid({
+    from: "../features/**",
+    target: ".",
+    message: "lib package should not import from features to avoid circular dependencies.",
+  }),
 ];
diff --git a/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts b/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
deleted file mode 100644
index 5345262085e479..00000000000000
--- a/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { Mock } from "vitest";
-import { describe, expect, test, vi, afterEach } from "vitest";
-
-import { WatchlistRepository } from "@calcom/features/watchlist/watchlist.repository";
-
-import { checkIfFreeEmailDomain } from "./checkIfFreeEmailDomain";
-
-vi.mock("@calcom/features/watchlist/watchlist.repository", () => {
-  return {
-    WatchlistRepository: vi.fn().mockImplementation(() => ({
-      getFreeEmailDomainInWatchlist: vi.fn().mockResolvedValue(undefined),
-    })),
-  };
-});
-
-describe("checkIfFreeEmailDomain", () => {
-  test("If gmail should return true", async () => {
-    expect(await checkIfFreeEmailDomain("test@gmail.com")).toBe(true);
-  });
-  test("If outlook should return true", async () => {
-    expect(await checkIfFreeEmailDomain("test@outlook.com")).toBe(true);
-  });
-  test("If there's no email domain return as if it was a free email domain", async () => {
-    expect(await checkIfFreeEmailDomain("test@")).toBe(true);
-  });
-  test("If free email domain in watchlist, should return true", async () => {
-    const WatchlistRepoMock = WatchlistRepository as Mock;
-
-    await checkIfFreeEmailDomain("test@freedomain.com");
-
-    expect(WatchlistRepoMock).toHaveBeenCalled();
-
-    const mockInstance = WatchlistRepoMock.mock.results.at(-1)?.value;
-
-    expect(mockInstance.getFreeEmailDomainInWatchlist).toHaveBeenCalledWith("freedomain.com");
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-});
diff --git a/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts b/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
deleted file mode 100644
index 11571b40e681d2..00000000000000
--- a/packages/lib/freeEmailDomainCheck/checkIfFreeEmailDomain.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { WatchlistRepository } from "@calcom/features/watchlist/watchlist.repository";
-
-export const checkIfFreeEmailDomain = async (email: string) => {
-  const emailDomain = email.split("@")[1].toLowerCase();
-  // If there's no email domain return as if it was a free email domain
-  if (!emailDomain) return true;
-
-  // Gmail and Outlook are one of the most common email domains so we don't need to check the domains list
-  if (emailDomain === "gmail.com" || emailDomain === "outlook.com") return true;
-
-  // Check if email domain is in the watchlist
-  const watchlistRepository = new WatchlistRepository();
-  return !!(await watchlistRepository.getFreeEmailDomainInWatchlist(emailDomain));
-};
diff --git a/packages/lib/restrictionSchedule.ts b/packages/lib/restrictionSchedule.ts
deleted file mode 100644
index 306ea5c0336e11..00000000000000
--- a/packages/lib/restrictionSchedule.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { FeaturesRepository } from "@calcom/features/flags/features.repository";
-import prisma from "@calcom/prisma";
-
-/**
- * Checks if the restriction schedule feature is enabled for a team
- * @param teamId - The team ID to check
- * @returns Promise<boolean> - True if the feature is enabled, false otherwise
- */
-export async function isRestrictionScheduleEnabled(teamId?: number): Promise<boolean> {
-  if (!teamId) {
-    return false; // Personal events don't have restriction schedules
-  }
-
-  const featureRepo = new FeaturesRepository(prisma);
-  return await featureRepo.checkIfTeamHasFeature(teamId, "restriction-schedule");
-}
diff --git a/packages/lib/schedules/transformers/getScheduleListItemData.ts b/packages/lib/schedules/transformers/getScheduleListItemData.ts
new file mode 100644
index 00000000000000..c08e51c2bf05f8
--- /dev/null
+++ b/packages/lib/schedules/transformers/getScheduleListItemData.ts
@@ -0,0 +1,26 @@
+export type Schedule = {
+  isDefault: boolean;
+  id: number;
+  name: string;
+  timeZone: string | null;
+  availability: {
+    id: number;
+    userId: number | null;
+    startTime: Date;
+    endTime: Date;
+    eventTypeId: number | null;
+    date: Date | null;
+    days: number[];
+    scheduleId: number | null;
+  }[];
+};
+
+export const getScheduleListItemData = (schedule: Schedule) => ({
+  ...schedule,
+  availability: schedule.availability.map((avail) => ({
+    ...avail,
+    startTime: new Date(avail.startTime),
+    endTime: new Date(avail.endTime),
+    date: avail.date ? new Date(avail.date) : null,
+  })),
+});
diff --git a/packages/lib/server/repository/PrismaAgentRepository.ts b/packages/lib/server/repository/PrismaAgentRepository.ts
index d8808b20cb292e..d0676cd5ebd69e 100644
--- a/packages/lib/server/repository/PrismaAgentRepository.ts
+++ b/packages/lib/server/repository/PrismaAgentRepository.ts
@@ -460,15 +460,7 @@ export class PrismaAgentRepository {
     });
   }
 
-  async findByIdWithAdminAccess({
-    id,
-    userId,
-    teamId,
-  }: {
-    id: string;
-    userId: number;
-    teamId?: number;
-  }) {
+  async findByIdWithAdminAccess({ id, userId, teamId }: { id: string; userId: number; teamId?: number }) {
     const adminTeamIds = await this.getUserAdminTeamIds(userId);
 
     let whereCondition: Prisma.Sql;
@@ -576,13 +568,7 @@ export class PrismaAgentRepository {
     });
   }
 
-  async linkInboundAgentToWorkflow({
-    workflowStepId,
-    agentId,
-  }: {
-    workflowStepId: number;
-    agentId: string;
-  }) {
+  async linkInboundAgentToWorkflow({ workflowStepId, agentId }: { workflowStepId: number; agentId: string }) {
     return await this.prismaClient.workflowStep.update({
       where: {
         id: workflowStepId,
@@ -604,13 +590,7 @@ export class PrismaAgentRepository {
     });
   }
 
-  async canManageTeamResources({
-    userId,
-    teamId,
-  }: {
-    userId: number;
-    teamId: number;
-  }): Promise<boolean> {
+  async canManageTeamResources({ userId, teamId }: { userId: number; teamId: number }): Promise<boolean> {
     const result = await this.prismaClient.$queryRaw<{ count: bigint }[]>`
       SELECT COUNT(*) as count
       FROM "Membership"
@@ -622,4 +602,27 @@ export class PrismaAgentRepository {
 
     return Number(result[0].count) > 0;
   }
+
+  async findAgentWithPhoneNumbers(agentId: string) {
+    return await this.prismaClient.agent.findUnique({
+      where: { id: agentId },
+      select: {
+        id: true,
+        outboundPhoneNumbers: {
+          select: {
+            id: true,
+            phoneNumber: true,
+            subscriptionStatus: true,
+          },
+        },
+      },
+    });
+  }
+
+  async findProviderAgentIdById(agentId: string) {
+    return await this.prismaClient.agent.findUnique({
+      where: { id: agentId },
+      select: { providerAgentId: true },
+    });
+  }
 }
diff --git a/packages/lib/server/repository/PrismaApiKeyRepository.ts b/packages/lib/server/repository/PrismaApiKeyRepository.ts
index f4d28ecbe0db33..a5e1e48c67c922 100644
--- a/packages/lib/server/repository/PrismaApiKeyRepository.ts
+++ b/packages/lib/server/repository/PrismaApiKeyRepository.ts
@@ -10,6 +10,25 @@ export class PrismaApiKeyRepository {
     return new PrismaApiKeyRepository((await import("@calcom/prisma")).prisma);
   }
 
+  async findByHashedKey(hashedKey: string) {
+    return this.prismaClient.apiKey.findUnique({
+      where: { hashedKey },
+      select: {
+        id: true,
+        hashedKey: true,
+        userId: true,
+        expiresAt: true,
+        user: {
+          select: {
+            role: true,
+            locked: true,
+            email: true,
+          },
+        },
+      },
+    });
+  }
+
   async findApiKeysFromUserId({ userId }: { userId: number }) {
     const apiKeys = await this.prismaClient.apiKey.findMany({
       where: {
diff --git a/packages/lib/server/repository/PrismaRoutingFormRepository.ts b/packages/lib/server/repository/PrismaRoutingFormRepository.ts
index d71c070edd2488..1d2749cef7f73a 100644
--- a/packages/lib/server/repository/PrismaRoutingFormRepository.ts
+++ b/packages/lib/server/repository/PrismaRoutingFormRepository.ts
@@ -35,6 +35,49 @@ export class PrismaRoutingFormRepository {
     })) as SelectedFields<T> | null;
   }
 
+  static async findActiveFormsForUserOrTeam({ userId, teamId }: { userId?: number; teamId?: number }) {
+    if (!userId && !teamId) return [];
+
+    const routingFormQuery = {
+      select: {
+        id: true,
+        name: true,
+      },
+      orderBy: [
+        {
+          name: "asc" as const,
+        },
+      ],
+    };
+
+    if (teamId) {
+      return await prisma.app_RoutingForms_Form.findMany({
+        where: {
+          teamId: teamId,
+          disabled: false,
+          team: {
+            members: {
+              some: {
+                userId: userId,
+                accepted: true,
+              },
+            },
+          },
+        },
+        ...routingFormQuery,
+      });
+    }
+
+    return await prisma.app_RoutingForms_Form.findMany({
+      where: {
+        userId: userId,
+        teamId: null, // Only personal forms, not team forms
+        disabled: false,
+      },
+      ...routingFormQuery,
+    });
+  }
+
   static async findFormByIdIncludeUserTeamAndOrg(
     formId: string
   ): Promise<RoutingFormWithUserTeamAndOrg | null> {
@@ -50,6 +93,8 @@ export class PrismaRoutingFormRepository {
             email: true,
             movedToProfileId: true,
             metadata: true,
+            timeFormat: true,
+            locale: true,
             organization: {
               select: {
                 slug: true,
diff --git a/packages/lib/server/repository/PrismaRoutingFormRepositoryInterface.ts b/packages/lib/server/repository/PrismaRoutingFormRepositoryInterface.ts
index f278866b249f9c..09707167b8b043 100644
--- a/packages/lib/server/repository/PrismaRoutingFormRepositoryInterface.ts
+++ b/packages/lib/server/repository/PrismaRoutingFormRepositoryInterface.ts
@@ -56,6 +56,8 @@ export type RoutingFormWithUserTeamAndOrg = {
     username: string | null;
     email: string;
     movedToProfileId: number | null;
+    timeFormat: number | null;
+    locale: string | null;
   };
   team: {
     metadata: any;
diff --git a/packages/lib/server/repository/TeamRepository.test.ts b/packages/lib/server/repository/TeamRepository.test.ts
deleted file mode 100644
index dd2035757415a8..00000000000000
--- a/packages/lib/server/repository/TeamRepository.test.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
-
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-
-import type { Team } from "@calcom/prisma/client";
-
-import { TeamRepository } from "./team";
-
-describe("TeamRepository", () => {
-  let teamRepository: TeamRepository;
-
-  beforeEach(() => {
-    vi.resetAllMocks();
-    teamRepository = new TeamRepository(prismaMock);
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe("findById", () => {
-    it("should return null if team is not found", async () => {
-      prismaMock.team.findUnique.mockResolvedValue(null);
-      const result = await teamRepository.findById({ id: 1 });
-      expect(result).toBeNull();
-    });
-
-    it("should return parsed team if found", async () => {
-      const mockTeam = {
-        id: 1,
-        name: "Test Team",
-        slug: "test-team",
-        logoUrl: "test-logo-url",
-        parentId: 1,
-        metadata: {
-          requestedSlug: null,
-        },
-        isOrganization: true,
-        organizationSettings: {},
-        isPlatform: true,
-        requestedSlug: null,
-      };
-      prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team);
-      const result = await teamRepository.findById({ id: 1 });
-      expect(result).toEqual(mockTeam);
-    });
-  });
-
-  describe("deleteById", () => {
-    it("should delete team and related data", async () => {
-      const mockDeletedTeam = { id: 1, name: "Deleted Team" };
-      const deleteManyEventTypeMock = vi.fn();
-      const deleteManyMembershipMock = vi.fn();
-      const deleteTeamMock = vi.fn().mockResolvedValue(mockDeletedTeam as unknown as Team);
-      prismaMock.$transaction.mockImplementation(async (callback) => {
-        const mockTx = {
-          ...prismaMock,
-          eventType: {
-            ...prismaMock.eventType,
-            deleteMany: deleteManyEventTypeMock,
-          },
-          membership: {
-            ...prismaMock.membership,
-            deleteMany: deleteManyMembershipMock,
-          },
-          team: {
-            ...prismaMock.team,
-            delete: deleteTeamMock,
-          },
-        };
-        return callback(mockTx);
-      });
-
-      const result = await teamRepository.deleteById({ id: 1 });
-
-      expect(deleteManyEventTypeMock).toHaveBeenCalledWith({
-        where: {
-          teamId: 1,
-          schedulingType: "MANAGED",
-        },
-      });
-      expect(deleteManyMembershipMock).toHaveBeenCalledWith({
-        where: {
-          teamId: 1,
-        },
-      });
-      expect(deleteTeamMock).toHaveBeenCalledWith({
-        where: {
-          id: 1,
-        },
-      });
-      expect(result).toEqual(mockDeletedTeam);
-    });
-  });
-
-  describe("findAllByParentId", () => {
-    it("should return all teams with given parentId", async () => {
-      const mockTeams = [{ id: 1 }, { id: 2 }];
-      prismaMock.team.findMany.mockResolvedValue(mockTeams as unknown as Team[]);
-      const result = await teamRepository.findAllByParentId({ parentId: 1 });
-      expect(prismaMock.team.findMany).toHaveBeenCalledWith({
-        where: { parentId: 1 },
-        select: {
-          id: true,
-          name: true,
-          slug: true,
-          logoUrl: true,
-          parentId: true,
-          metadata: true,
-          isOrganization: true,
-          organizationSettings: true,
-          isPlatform: true,
-        },
-      });
-      expect(result).toEqual(mockTeams);
-    });
-  });
-
-  describe("findTeamWithMembers", () => {
-    it("should return team with its members", async () => {
-      const mockTeam = { id: 1, members: [] };
-      prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team & { members: [] });
-      const result = await teamRepository.findTeamWithMembers(1);
-      expect(prismaMock.team.findUnique).toHaveBeenCalledWith({
-        where: { id: 1 },
-        select: {
-          members: {
-            select: {
-              accepted: true,
-            },
-          },
-          id: true,
-          metadata: true,
-          parentId: true,
-          isOrganization: true,
-        },
-      });
-      expect(result).toEqual(mockTeam);
-    });
-  });
-});
diff --git a/packages/lib/server/repository/bookingReport.interface.ts b/packages/lib/server/repository/bookingReport.interface.ts
new file mode 100644
index 00000000000000..9d74cf9174b8a6
--- /dev/null
+++ b/packages/lib/server/repository/bookingReport.interface.ts
@@ -0,0 +1,25 @@
+import type { BookingReportReason } from "@calcom/prisma/enums";
+
+export interface CreateBookingReportInput {
+  bookingUid: string;
+  bookerEmail: string;
+  reportedById: number;
+  reason: BookingReportReason;
+  description?: string;
+  cancelled: boolean;
+  organizationId?: number | null;
+}
+
+export interface BookingReportSummary {
+  id: string;
+  reportedById: number | null;
+  reason: BookingReportReason;
+  description: string | null;
+  createdAt: Date;
+}
+
+export interface IBookingReportRepository {
+  createReport(input: CreateBookingReportInput): Promise<{ id: string }>;
+
+  findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]>;
+}
diff --git a/packages/lib/server/repository/bookingReport.test.ts b/packages/lib/server/repository/bookingReport.test.ts
new file mode 100644
index 00000000000000..d185c8606ffc98
--- /dev/null
+++ b/packages/lib/server/repository/bookingReport.test.ts
@@ -0,0 +1,130 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import type { PrismaClient } from "@calcom/prisma";
+import { BookingReportReason } from "@calcom/prisma/enums";
+
+import { PrismaBookingReportRepository } from "./bookingReport";
+import type { CreateBookingReportInput } from "./bookingReport.interface";
+
+vi.mock("@sentry/nextjs", () => ({
+  captureException: vi.fn(),
+}));
+
+describe("PrismaBookingReportRepository", () => {
+  let repository: PrismaBookingReportRepository;
+
+  const mockPrisma = {
+    bookingReport: {
+      create: vi.fn(),
+      findUnique: vi.fn(),
+      findMany: vi.fn(),
+      findFirst: vi.fn(),
+    },
+  } as unknown as PrismaClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    repository = new PrismaBookingReportRepository(mockPrisma);
+  });
+
+  describe("createReport", () => {
+    it("should create a booking report with all fields", async () => {
+      const input: CreateBookingReportInput = {
+        bookingUid: "test-booking-uid-1",
+        bookerEmail: "booker@example.com",
+        reportedById: 1,
+        reason: BookingReportReason.SPAM,
+        description: "This is spam",
+        cancelled: true,
+        organizationId: 10,
+      };
+
+      const mockCreatedReport = { id: "report-123" };
+      mockPrisma.bookingReport.create.mockResolvedValue(mockCreatedReport);
+
+      const result = await repository.createReport(input);
+
+      expect(result).toEqual({ id: "report-123" });
+      expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
+        data: {
+          bookingUid: "test-booking-uid-1",
+          bookerEmail: "booker@example.com",
+          reportedById: 1,
+          reason: BookingReportReason.SPAM,
+          description: "This is spam",
+          cancelled: true,
+          organizationId: 10,
+        },
+        select: { id: true },
+      });
+    });
+
+    it("should create a booking report without optional fields", async () => {
+      const input: CreateBookingReportInput = {
+        bookingUid: "test-booking-uid-2",
+        bookerEmail: "user@example.com",
+        reportedById: 2,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
+        cancelled: false,
+      };
+
+      const mockCreatedReport = { id: "report-456" };
+      mockPrisma.bookingReport.create.mockResolvedValue(mockCreatedReport);
+
+      const result = await repository.createReport(input);
+
+      expect(result).toEqual({ id: "report-456" });
+      expect(mockPrisma.bookingReport.create).toHaveBeenCalledWith({
+        data: {
+          bookingUid: "test-booking-uid-2",
+          bookerEmail: "user@example.com",
+          reportedById: 2,
+          reason: BookingReportReason.DONT_KNOW_PERSON,
+          description: undefined,
+          cancelled: false,
+          organizationId: undefined,
+        },
+        select: { id: true },
+      });
+    });
+  });
+
+  describe("findAllReportedBookings", () => {
+    it("should find all reported bookings with pagination", async () => {
+      const mockReports = [
+        {
+          id: "report-1",
+          reportedById: 1,
+          reason: BookingReportReason.SPAM,
+          description: "Spam",
+          createdAt: new Date("2025-01-01T10:00:00Z"),
+        },
+        {
+          id: "report-2",
+          reportedById: 2,
+          reason: BookingReportReason.DONT_KNOW_PERSON,
+          description: null,
+          createdAt: new Date("2025-01-01T11:00:00Z"),
+        },
+      ];
+
+      mockPrisma.bookingReport.findMany.mockResolvedValue(mockReports);
+
+      const result = await repository.findAllReportedBookings({ skip: 0, take: 10 });
+
+      expect(result).toEqual(mockReports);
+      expect(mockPrisma.bookingReport.findMany).toHaveBeenCalledWith({
+        skip: 0,
+        take: 10,
+        select: {
+          id: true,
+          reportedById: true,
+          reason: true,
+          description: true,
+          createdAt: true,
+        },
+        orderBy: { createdAt: "desc" },
+      });
+    });
+  });
+});
diff --git a/packages/lib/server/repository/bookingReport.ts b/packages/lib/server/repository/bookingReport.ts
new file mode 100644
index 00000000000000..f9ef5c9c2efe37
--- /dev/null
+++ b/packages/lib/server/repository/bookingReport.ts
@@ -0,0 +1,43 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import type {
+  IBookingReportRepository,
+  CreateBookingReportInput,
+  BookingReportSummary,
+} from "./bookingReport.interface";
+
+export class PrismaBookingReportRepository implements IBookingReportRepository {
+  constructor(private readonly prismaClient: PrismaClient) {}
+
+  async createReport(input: CreateBookingReportInput): Promise<{ id: string }> {
+    const report = await this.prismaClient.bookingReport.create({
+      data: {
+        bookingUid: input.bookingUid,
+        bookerEmail: input.bookerEmail,
+        reportedById: input.reportedById,
+        reason: input.reason,
+        description: input.description,
+        cancelled: input.cancelled,
+        organizationId: input.organizationId,
+      },
+      select: { id: true },
+    });
+    return report;
+  }
+
+  async findAllReportedBookings(params: { skip?: number; take?: number }): Promise<BookingReportSummary[]> {
+    const reports = await this.prismaClient.bookingReport.findMany({
+      skip: params.skip,
+      take: params.take,
+      select: {
+        id: true,
+        reportedById: true,
+        reason: true,
+        description: true,
+        createdAt: true,
+      },
+      orderBy: { createdAt: "desc" },
+    });
+    return reports;
+  }
+}
diff --git a/packages/lib/server/repository/formResponse.ts b/packages/lib/server/repository/formResponse.ts
index a0854fde3d8c78..fd8a3de9db00f4 100644
--- a/packages/lib/server/repository/formResponse.ts
+++ b/packages/lib/server/repository/formResponse.ts
@@ -105,6 +105,8 @@ export class RoutingFormResponseRepository {
               select: {
                 id: true,
                 email: true,
+                timeFormat: true,
+                locale: true,
               },
             },
             id: true,
@@ -125,4 +127,36 @@ export class RoutingFormResponseRepository {
       },
     });
   }
+
+  async findAllResponsesWithBooking({
+    formId,
+    responseId,
+    createdAfter,
+    createdBefore,
+  }: {
+    formId: string;
+    responseId: number;
+    createdAfter: Date;
+    createdBefore: Date;
+  }) {
+    return await this.prismaClient.app_RoutingForms_FormResponse.findMany({
+      where: {
+        formId,
+        createdAt: {
+          gte: createdAfter,
+          lt: createdBefore,
+        },
+        routedToBookingUid: {
+          not: null,
+        },
+        NOT: {
+          id: responseId,
+        },
+      },
+      select: {
+        id: true,
+        response: true,
+      },
+    });
+  }
 }
diff --git a/packages/lib/server/repository/organizationOnboarding.ts b/packages/lib/server/repository/organizationOnboarding.ts
index 59a6598d796b10..d7998bae961d76 100644
--- a/packages/lib/server/repository/organizationOnboarding.ts
+++ b/packages/lib/server/repository/organizationOnboarding.ts
@@ -16,6 +16,8 @@ export type CreateOrganizationOnboardingInput = {
   slug: string;
   logo?: string | null;
   bio?: string | null;
+  brandColor?: string | null;
+  bannerUrl?: string | null;
   stripeCustomerId?: string;
   stripeSubscriptionId?: string;
   stripeSubscriptionItemId?: string;
@@ -41,6 +43,8 @@ export class OrganizationOnboardingRepository {
         slug: data.slug,
         logo: data.logo,
         bio: data.bio,
+        brandColor: data.brandColor,
+        bannerUrl: data.bannerUrl,
         stripeCustomerId: data.stripeCustomerId,
         stripeSubscriptionId: data.stripeSubscriptionId,
         invitedMembers: data.invitedMembers || [],
diff --git a/packages/lib/server/repository/watchlist.interface.ts b/packages/lib/server/repository/watchlist.interface.ts
new file mode 100644
index 00000000000000..ee95d5d79ce8e2
--- /dev/null
+++ b/packages/lib/server/repository/watchlist.interface.ts
@@ -0,0 +1,67 @@
+import type { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
+
+export interface WatchlistEntry {
+  id: string;
+  type: WatchlistType;
+  value: string;
+  action: WatchlistAction;
+  description: string | null;
+  organizationId: number | null;
+  isGlobal: boolean;
+  source: WatchlistSource;
+  createdAt?: Date;
+  lastUpdatedAt?: Date;
+}
+
+export interface WatchlistAuditEntry {
+  id: string;
+  watchlistId: string;
+  type: WatchlistType;
+  value: string;
+  description: string | null;
+  action: WatchlistAction;
+  eventType?: string;
+  changedByUserId: number | null;
+  changedAt: Date;
+}
+
+export interface CreateWatchlistInput {
+  type: WatchlistType;
+  value: string;
+  organizationId: number;
+  action: WatchlistAction;
+  description?: string;
+  userId: number;
+}
+
+export interface CheckWatchlistInput {
+  type: WatchlistType;
+  value: string;
+  organizationId: number;
+}
+
+export interface FindAllEntriesInput {
+  organizationId: number;
+  limit: number;
+  offset: number;
+  searchTerm?: string;
+  filters?: {
+    type?: WatchlistType;
+  };
+}
+
+export interface IWatchlistRepository {
+  createEntry(params: CreateWatchlistInput): Promise<WatchlistEntry>;
+  checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null>;
+  findAllEntries(params: FindAllEntriesInput): Promise<{
+    rows: (WatchlistEntry & {
+      audits?: { changedByUserId: number | null }[];
+    })[];
+    meta: { totalRowCount: number };
+  }>;
+  findEntryWithAudit(id: string): Promise<{
+    entry: WatchlistEntry | null;
+    auditHistory: WatchlistAuditEntry[];
+  }>;
+  deleteEntry(id: string, userId: number): Promise<void>;
+}
diff --git a/packages/lib/server/repository/watchlist.repository.ts b/packages/lib/server/repository/watchlist.repository.ts
new file mode 100644
index 00000000000000..e648be6efed8c5
--- /dev/null
+++ b/packages/lib/server/repository/watchlist.repository.ts
@@ -0,0 +1,211 @@
+import type { PrismaClient } from "@calcom/prisma";
+import { WatchlistSource } from "@calcom/prisma/enums";
+
+import type {
+  IWatchlistRepository,
+  CreateWatchlistInput,
+  CheckWatchlistInput,
+  WatchlistEntry,
+  FindAllEntriesInput,
+  WatchlistAuditEntry,
+} from "./watchlist.interface";
+
+export class WatchlistRepository implements IWatchlistRepository {
+  constructor(private readonly prismaClient: PrismaClient) {}
+
+  async createEntry(params: CreateWatchlistInput): Promise<WatchlistEntry> {
+    const existing = await this.checkExists({
+      type: params.type,
+      value: params.value,
+      organizationId: params.organizationId,
+    });
+
+    if (existing) {
+      throw new Error("Watchlist entry already exists for this organization");
+    }
+
+    const watchlist = await this.prismaClient.$transaction(async (tx) => {
+      const created = await tx.watchlist.create({
+        data: {
+          type: params.type,
+          value: params.value,
+          organizationId: params.organizationId,
+          action: params.action,
+          description: params.description,
+          source: WatchlistSource.MANUAL,
+          isGlobal: false,
+        },
+      });
+
+      await tx.watchlistAudit.create({
+        data: {
+          watchlistId: created.id,
+          type: params.type,
+          value: params.value,
+          description: params.description,
+          action: params.action,
+          changedByUserId: params.userId,
+        },
+      });
+
+      return created;
+    });
+
+    return watchlist;
+  }
+
+  async checkExists(params: CheckWatchlistInput): Promise<WatchlistEntry | null> {
+    const entry = await this.prismaClient.watchlist.findUnique({
+      where: {
+        type_value_organizationId: {
+          type: params.type,
+          value: params.value,
+          organizationId: params.organizationId,
+        },
+      },
+    });
+
+    return entry;
+  }
+
+  async findAllEntries(params: FindAllEntriesInput): Promise<{
+    rows: (WatchlistEntry & { audits?: { changedByUserId: number | null }[] })[];
+    meta: { totalRowCount: number };
+  }> {
+    const where = {
+      organizationId: params.organizationId,
+      ...(params.searchTerm && {
+        value: {
+          contains: params.searchTerm,
+          mode: "insensitive" as const,
+        },
+      }),
+      ...(params.filters?.type && {
+        type: params.filters.type,
+      }),
+    };
+
+    const [rows, totalRowCount] = await Promise.all([
+      this.prismaClient.watchlist.findMany({
+        where,
+        take: params.limit,
+        skip: params.offset,
+        orderBy: {
+          lastUpdatedAt: "desc",
+        },
+        select: {
+          id: true,
+          type: true,
+          value: true,
+          action: true,
+          description: true,
+          organizationId: true,
+          isGlobal: true,
+          source: true,
+          lastUpdatedAt: true,
+          audits: {
+            take: 1,
+            orderBy: {
+              changedAt: "desc",
+            },
+            select: {
+              changedByUserId: true,
+            },
+          },
+        },
+      }),
+      this.prismaClient.watchlist.count({ where }),
+    ]);
+
+    return {
+      rows,
+      meta: { totalRowCount },
+    };
+  }
+
+  async findEntryWithAudit(id: string): Promise<{
+    entry: WatchlistEntry | null;
+    auditHistory: WatchlistAuditEntry[];
+  }> {
+    const entry = await this.prismaClient.watchlist.findUnique({
+      where: { id },
+      select: {
+        id: true,
+        type: true,
+        value: true,
+        action: true,
+        description: true,
+        organizationId: true,
+        isGlobal: true,
+        source: true,
+        lastUpdatedAt: true,
+        audits: {
+          select: {
+            id: true,
+            watchlistId: true,
+            type: true,
+            value: true,
+            description: true,
+            action: true,
+            changedByUserId: true,
+            changedAt: true,
+          },
+          orderBy: {
+            changedAt: "desc",
+          },
+        },
+      },
+    });
+
+    return {
+      entry: entry
+        ? {
+            id: entry.id,
+            type: entry.type,
+            value: entry.value,
+            action: entry.action,
+            description: entry.description ?? null,
+            organizationId: entry.organizationId ?? null,
+            isGlobal: entry.isGlobal,
+            source: entry.source,
+            lastUpdatedAt: entry.lastUpdatedAt,
+          }
+        : null,
+      auditHistory: entry?.audits || [],
+    };
+  }
+
+  async deleteEntry(id: string, userId: number): Promise<void> {
+    const existing = await this.prismaClient.watchlist.findUnique({
+      where: { id },
+      select: {
+        id: true,
+        type: true,
+        value: true,
+        description: true,
+        action: true,
+      },
+    });
+
+    if (!existing) {
+      throw new Error("Watchlist entry not found");
+    }
+
+    await this.prismaClient.$transaction(async (tx) => {
+      await tx.watchlistAudit.create({
+        data: {
+          watchlistId: id,
+          type: existing.type,
+          value: existing.value,
+          description: existing.description,
+          action: existing.action,
+          changedByUserId: userId,
+        },
+      });
+
+      await tx.watchlist.delete({
+        where: { id },
+      });
+    });
+  }
+}
diff --git a/packages/lib/server/repository/webhook.ts b/packages/lib/server/repository/webhook.ts
deleted file mode 100644
index 362de82fcf3dba..00000000000000
--- a/packages/lib/server/repository/webhook.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { prisma } from "@calcom/prisma";
-import type { Webhook } from "@calcom/prisma/client";
-import { UserPermissionRole } from "@calcom/prisma/enums";
-import { MembershipRole } from "@calcom/prisma/enums";
-
-type WebhookGroup = {
-  teamId?: number | null;
-  profile: {
-    slug: string | null;
-    name: string | null;
-    image?: string;
-  };
-  metadata?: {
-    canModify: boolean;
-    canDelete: boolean;
-  };
-  webhooks: Webhook[];
-};
-
-const filterWebhooks = (webhook: Webhook) => {
-  const appIds = [
-    "zapier",
-    "make",
-    // Add more if needed
-  ];
-
-  return !appIds.some((appId: string) => webhook.appId == appId);
-};
-
-export class WebhookRepository {
-  static async findByWebhookId(webhookId?: string) {
-    return await prisma.webhook.findUniqueOrThrow({
-      where: {
-        id: webhookId,
-      },
-      select: {
-        id: true,
-        subscriberUrl: true,
-        payloadTemplate: true,
-        active: true,
-        eventTriggers: true,
-        secret: true,
-        teamId: true,
-        userId: true,
-        platform: true,
-        time: true,
-        timeUnit: true,
-      },
-    });
-  }
-
-  static async getFilteredWebhooksForUser({
-    userId,
-    userRole,
-  }: {
-    userId: number;
-    userRole?: UserPermissionRole;
-  }) {
-    const user = await prisma.user.findUnique({
-      where: { id: userId },
-      select: {
-        id: true,
-        username: true,
-        name: true,
-        avatarUrl: true,
-        webhooks: true,
-        teams: {
-          where: {
-            accepted: true,
-          },
-          select: {
-            role: true,
-            team: {
-              select: {
-                id: true,
-                name: true,
-                slug: true,
-                logoUrl: true,
-                webhooks: true,
-              },
-            },
-          },
-        },
-      },
-    });
-
-    if (!user) {
-      throw new Error("User not found");
-    }
-
-    // Use permission service which handles both PBAC and role-based fallbacks
-    const permissionService = new PermissionCheckService();
-
-    // Build webhook groups with proper permissions
-    const webhookGroups: WebhookGroup[] = [];
-
-    // Add user's personal webhooks
-    webhookGroups.push({
-      teamId: null,
-      profile: {
-        slug: user.username,
-        name: user.name,
-        image: getUserAvatarUrl({ avatarUrl: user.avatarUrl }),
-      },
-      webhooks: user.webhooks.filter(filterWebhooks),
-      metadata: {
-        canModify: true,
-        canDelete: true,
-      },
-    });
-
-    // Check permissions for each team
-    // The permission service handles PBAC when enabled and falls back to role-based permissions
-    for (const membership of user.teams) {
-      const teamId = membership.team.id;
-
-      // Check read permission (fallback: MEMBER, ADMIN, OWNER can read)
-      const canRead = await permissionService.checkPermission({
-        userId,
-        teamId,
-        permission: "webhook.read",
-        fallbackRoles: [MembershipRole.MEMBER, MembershipRole.ADMIN, MembershipRole.OWNER],
-      });
-
-      if (!canRead) {
-        // User doesn't have permission to view this team's webhooks
-        continue;
-      }
-
-      // Check update/delete permissions in parallel (fallback: only ADMIN, OWNER can modify)
-      const [canUpdate, canDelete] = await Promise.all([
-        permissionService.checkPermission({
-          userId,
-          teamId,
-          permission: "webhook.update",
-          fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
-        }),
-        permissionService.checkPermission({
-          userId,
-          teamId,
-          permission: "webhook.delete",
-          fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
-        }),
-      ]);
-
-      webhookGroups.push({
-        teamId: membership.team.id,
-        profile: {
-          name: membership.team.name,
-          slug: membership.team.slug || null,
-          image: getPlaceholderAvatar(membership.team.logoUrl, membership.team.name),
-        },
-        webhooks: membership.team.webhooks.filter(filterWebhooks),
-        metadata: {
-          canModify: canUpdate,
-          canDelete,
-        },
-      });
-    }
-
-    // Add platform webhooks for admins
-    if (userRole === UserPermissionRole.ADMIN) {
-      const platformWebhooks = await prisma.webhook.findMany({
-        where: { platform: true },
-      });
-
-      webhookGroups.push({
-        teamId: null,
-        profile: {
-          slug: "Platform",
-          name: "Platform",
-          image: getPlaceholderAvatar(null, "Platform"),
-        },
-        webhooks: platformWebhooks,
-        metadata: {
-          canDelete: true,
-          canModify: true,
-        },
-      });
-    }
-
-    return {
-      webhookGroups: webhookGroups.filter((group) => group.webhooks.length > 0),
-      profiles: webhookGroups.map((group) => ({
-        teamId: group.teamId,
-        ...group.profile,
-        ...group.metadata,
-      })),
-    };
-  }
-}
diff --git a/packages/lib/server/repository/workflowRelations.ts b/packages/lib/server/repository/workflowRelations.ts
new file mode 100644
index 00000000000000..628c231d36af06
--- /dev/null
+++ b/packages/lib/server/repository/workflowRelations.ts
@@ -0,0 +1,94 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+export class WorkflowRelationsRepository {
+  constructor(private prismaClient: PrismaClient) {}
+
+  // Team relationship methods
+  async deleteAllActiveOnTeams(workflowId: number) {
+    return await this.prismaClient.workflowsOnTeams.deleteMany({
+      where: { workflowId },
+    });
+  }
+
+  async createActiveOnTeams(workflowId: number, teamIds: number[]) {
+    if (teamIds.length === 0) return;
+
+    return await this.prismaClient.workflowsOnTeams.createMany({
+      data: teamIds.map((teamId) => ({
+        workflowId,
+        teamId,
+      })),
+    });
+  }
+
+  async findActiveOnTeams(workflowId: number) {
+    return await this.prismaClient.workflowsOnTeams.findMany({
+      where: { workflowId },
+      select: {
+        teamId: true,
+      },
+    });
+  }
+
+  // Routing Forms relationship methods
+  async deleteAllActiveOnRoutingForms(workflowId: number) {
+    return await this.prismaClient.workflowsOnRoutingForms.deleteMany({
+      where: { workflowId },
+    });
+  }
+
+  async createActiveOnRoutingForms(workflowId: number, routingFormIds: string[]) {
+    if (routingFormIds.length === 0) return;
+
+    return await this.prismaClient.workflowsOnRoutingForms.createMany({
+      data: routingFormIds.map((routingFormId) => ({
+        workflowId,
+        routingFormId,
+      })),
+    });
+  }
+
+  // Event Types relationship methods
+  async deleteAllActiveOnEventTypes(workflowId: number) {
+    return await this.prismaClient.workflowsOnEventTypes.deleteMany({
+      where: { workflowId },
+    });
+  }
+
+  async createActiveOnEventTypes(workflowId: number, eventTypeIds: number[]) {
+    if (eventTypeIds.length === 0) return;
+
+    return await this.prismaClient.workflowsOnEventTypes.createMany({
+      data: eventTypeIds.map((eventTypeId) => ({
+        workflowId,
+        eventTypeId,
+      })),
+    });
+  }
+
+  async findActiveOnEventTypes(workflowId: number) {
+    return await this.prismaClient.workflowsOnEventTypes.findMany({
+      where: { workflowId },
+      select: {
+        eventTypeId: true,
+        eventType: {
+          select: {
+            children: {
+              select: {
+                id: true,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
+  async deleteAllActiveOnRelations(workflowId: number) {
+    return await Promise.all([
+      this.deleteAllActiveOnTeams(workflowId),
+      this.deleteAllActiveOnRoutingForms(workflowId),
+      this.deleteAllActiveOnEventTypes(workflowId),
+    ]);
+  }
+}
diff --git a/packages/lib/server/repository/workflowStep.ts b/packages/lib/server/repository/workflowStep.ts
new file mode 100644
index 00000000000000..427770237e441a
--- /dev/null
+++ b/packages/lib/server/repository/workflowStep.ts
@@ -0,0 +1,22 @@
+import type { Prisma, PrismaClient } from "@calcom/prisma/client";
+
+export class WorkflowStepRepository {
+  constructor(private prismaClient: PrismaClient) {}
+
+  async deleteById(id: number) {
+    return await this.prismaClient.workflowStep.delete({
+      where: { id },
+    });
+  }
+
+  async createWorkflowStep(data: Prisma.WorkflowStepUncheckedCreateInput) {
+    return await this.prismaClient.workflowStep.create({ data });
+  }
+
+  async updateWorkflowStep(id: number, data: Prisma.WorkflowStepUncheckedUpdateInput) {
+    return await this.prismaClient.workflowStep.update({
+      where: { id },
+      data,
+    });
+  }
+}
diff --git a/packages/lib/server/service/ApiKeyService.ts b/packages/lib/server/service/ApiKeyService.ts
new file mode 100644
index 00000000000000..8585501bdb5cd4
--- /dev/null
+++ b/packages/lib/server/service/ApiKeyService.ts
@@ -0,0 +1,47 @@
+import type { PrismaApiKeyRepository } from "../repository/PrismaApiKeyRepository";
+
+type Deps = {
+  apiKeyRepo: PrismaApiKeyRepository;
+};
+
+interface VerifyKeyResult {
+  valid: boolean;
+  error?: string;
+  userId?: number;
+  user?: {
+    role: string;
+    locked: boolean;
+    email: string;
+  };
+}
+
+export class ApiKeyService {
+  constructor(private readonly deps: Deps) {}
+
+  async verifyKeyByHashedKey(hashedKey: string): Promise<VerifyKeyResult> {
+    const apiKey = await this.deps.apiKeyRepo.findByHashedKey(hashedKey);
+
+    if (!apiKey) {
+      return { valid: false, error: "Your API key is not valid." };
+    }
+
+    if (apiKey.expiresAt && this.isExpired(apiKey.expiresAt)) {
+      return { valid: false, error: "This API key is expired." };
+    }
+
+    if (!apiKey.userId || !apiKey.user) {
+      return { valid: false, error: "No user found for this API key." };
+    }
+
+    return {
+      valid: true,
+      userId: apiKey.userId,
+      user: apiKey.user,
+    };
+  }
+
+  private isExpired(expiresAt: Date): boolean {
+    const now = new Date();
+    return now.setHours(0, 0, 0, 0) > expiresAt.setHours(0, 0, 0, 0);
+  }
+}
diff --git a/packages/lib/server/service/workflows.ts b/packages/lib/server/service/workflows.ts
deleted file mode 100644
index db20a71995aba0..00000000000000
--- a/packages/lib/server/service/workflows.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import type { ScheduleWorkflowRemindersArgs } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
-import { scheduleWorkflowReminders } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";
-import type { Workflow } from "@calcom/ee/workflows/lib/types";
-import { prisma } from "@calcom/prisma";
-import { WorkflowTriggerEvents } from "@calcom/prisma/enums";
-
-import { WorkflowRepository } from "../repository/workflow";
-
-// TODO (Sean): Move most of the logic migrated in 16861 to this service
-export class WorkflowService {
-  static _beforeAfterEventTriggers: WorkflowTriggerEvents[] = [
-    WorkflowTriggerEvents.AFTER_EVENT,
-    WorkflowTriggerEvents.BEFORE_EVENT,
-  ];
-  static async deleteWorkflowRemindersOfRemovedTeam(teamId: number) {
-    const team = await prisma.team.findUnique({
-      where: {
-        id: teamId,
-      },
-    });
-
-    if (team?.parentId) {
-      const activeWorkflowsOnTeam = await prisma.workflow.findMany({
-        where: {
-          teamId: team.parentId,
-          OR: [
-            {
-              activeOnTeams: {
-                some: {
-                  teamId: team.id,
-                },
-              },
-            },
-            {
-              isActiveOnAll: true,
-            },
-          ],
-        },
-        select: {
-          steps: true,
-          activeOnTeams: true,
-          isActiveOnAll: true,
-        },
-      });
-
-      for (const workflow of activeWorkflowsOnTeam) {
-        const workflowSteps = workflow.steps;
-        let remainingActiveOnIds = [];
-
-        if (workflow.isActiveOnAll) {
-          const allRemainingOrgTeams = await prisma.team.findMany({
-            where: {
-              parentId: team.parentId,
-              id: {
-                not: team.id,
-              },
-            },
-          });
-          remainingActiveOnIds = allRemainingOrgTeams.map((team) => team.id);
-        } else {
-          remainingActiveOnIds = workflow.activeOnTeams
-            .filter((activeOn) => activeOn.teamId !== team.id)
-            .map((activeOn) => activeOn.teamId);
-        }
-        const remindersToDelete = await WorkflowRepository.getRemindersFromRemovedTeams(
-          [team.id],
-          workflowSteps,
-          remainingActiveOnIds
-        );
-        await WorkflowRepository.deleteAllWorkflowReminders(remindersToDelete);
-      }
-    }
-  }
-
-  static async scheduleWorkflowsForNewBooking({
-    isNormalBookingOrFirstRecurringSlot,
-    isConfirmedByDefault,
-    isRescheduleEvent,
-    workflows,
-    ...args
-  }: ScheduleWorkflowRemindersArgs & {
-    isConfirmedByDefault: boolean;
-    isRescheduleEvent: boolean;
-    isNormalBookingOrFirstRecurringSlot: boolean;
-  }) {
-    if (workflows.length <= 0) return;
-
-    const workflowsToTrigger: Workflow[] = [];
-
-    if (isRescheduleEvent) {
-      workflowsToTrigger.push(
-        ...workflows.filter(
-          (workflow) =>
-            workflow.trigger === WorkflowTriggerEvents.RESCHEDULE_EVENT ||
-            this._beforeAfterEventTriggers.includes(workflow.trigger)
-        )
-      );
-    } else if (!isConfirmedByDefault) {
-      workflowsToTrigger.push(
-        ...workflows.filter((workflow) => workflow.trigger === WorkflowTriggerEvents.BOOKING_REQUESTED)
-      );
-    } else if (isConfirmedByDefault) {
-      workflowsToTrigger.push(
-        ...workflows.filter(
-          (workflow) =>
-            this._beforeAfterEventTriggers.includes(workflow.trigger) ||
-            (isNormalBookingOrFirstRecurringSlot && workflow.trigger === WorkflowTriggerEvents.NEW_EVENT)
-        )
-      );
-    }
-
-    if (workflowsToTrigger.length === 0) return;
-
-    await scheduleWorkflowReminders({
-      ...args,
-      workflows: workflowsToTrigger,
-    });
-  }
-
-  static async scheduleWorkflowsFilteredByTriggerEvent({
-    workflows,
-    triggers,
-    ...args
-  }: ScheduleWorkflowRemindersArgs & { triggers: WorkflowTriggerEvents[] }) {
-    if (workflows.length <= 0) return;
-    await scheduleWorkflowReminders({
-      ...args,
-      workflows: workflows.filter((workflow) => triggers.includes(workflow.trigger)),
-    });
-  }
-}
diff --git a/packages/lib/service/attribute/server/getAttributes.ts b/packages/lib/service/attribute/server/getAttributes.ts
index 4a721bcc96decc..58d9a29c6f0596 100644
--- a/packages/lib/service/attribute/server/getAttributes.ts
+++ b/packages/lib/service/attribute/server/getAttributes.ts
@@ -7,7 +7,6 @@ import type { AttributeType } from "@calcom/prisma/enums";
 
 import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository";
 import { PrismaAttributeToUserRepository } from "../../../server/repository/PrismaAttributeToUserRepository";
-import { MembershipRepository } from "../../../server/repository/membership";
 import type { AttributeId } from "../types";
 
 type UserId = number;
@@ -70,6 +69,35 @@ export type AttributeOptionValueWithType = {
   attributeOption: AttributeOptionValue | AttributeOptionValue[];
 };
 
+async function _findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: number; teamId: number }) {
+  const memberships = await prisma.membership.findMany({
+    where: {
+      teamId: {
+        in: [orgId, teamId],
+      },
+    },
+  });
+
+  type Membership = (typeof memberships)[number];
+
+  const { teamMemberships, orgMemberships } = memberships.reduce(
+    (acc, membership) => {
+      if (membership.teamId === teamId) {
+        acc.teamMemberships.push(membership);
+      } else if (membership.teamId === orgId) {
+        acc.orgMemberships.push(membership);
+      }
+      return acc;
+    },
+    { teamMemberships: [] as Membership[], orgMemberships: [] as Membership[] }
+  );
+
+  return {
+    teamMemberships,
+    orgMemberships,
+  };
+}
+
 function _prepareAssignmentData({
   assignmentsForTheTeam,
   attributesOfTheOrg,
@@ -184,7 +212,7 @@ function _getAttributeOptionFromAttributeOption({
 }
 
 async function _getOrgMembershipToUserIdForTeam({ orgId, teamId }: { orgId: number; teamId: number }) {
-  const { orgMemberships, teamMemberships } = await MembershipRepository.findMembershipsForBothOrgAndTeam({
+  const { orgMemberships, teamMemberships } = await _findMembershipsForBothOrgAndTeam({
     orgId,
     teamId,
   });
diff --git a/packages/lib/tsconfig.json b/packages/lib/tsconfig.json
index 2f804071134e01..a6b10fb43ce11a 100644
--- a/packages/lib/tsconfig.json
+++ b/packages/lib/tsconfig.json
@@ -5,6 +5,6 @@
     "jsx": "preserve",
     "resolveJsonModule": true
   },
-  "include": [".", "../types/next-auth.d.ts", "../types/window.d.ts", "../trpc/types/router.d.ts"],
+  "include": [".", "../types/next-auth.d.ts", "../types/window.d.ts"],
   "exclude": ["dist", "build", "**/node_modules/**"]
 }
diff --git a/packages/platform/atoms/CHANGELOG.md b/packages/platform/atoms/CHANGELOG.md
index edce99f3ef7c3b..80797a9678f5f1 100644
--- a/packages/platform/atoms/CHANGELOG.md
+++ b/packages/platform/atoms/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## 1.1.2
 
+## 1.11.0
+
+### Minor Changes
+
+- [#24010](https://github.com/calcom/cal.com/pull/24010) [`09ee39a`](https://github.com/calcom/cal.com/commit/09ee39a3d8602e2c1000b5bb12f64d843c77e97a) Thanks [@Ryukemeister](https://github.com/Ryukemeister)! - This PR adds ability to display bookings of a user event for calendar view atom
+
+- [#24205](https://github.com/calcom/cal.com/pull/24205) [`0757b00`](https://github.com/calcom/cal.com/commit/0757b00db754814a8c1017bc9cf83064bb6bbe45) Thanks [@Ryukemeister](https://github.com/Ryukemeister)! - This PR adds an atom to list a user's schedule. Furthermore, there was also another atom introduced which can be used to create a new schedule for a user.
+
+### Patch Changes
+
+- [#24464](https://github.com/calcom/cal.com/pull/24464) [`ec3656e`](https://github.com/calcom/cal.com/commit/ec3656e646dd0fde90e4e604b3c87c23b01402a9) Thanks [@Ryukemeister](https://github.com/Ryukemeister)! - This PR adds dry run behaviour for date overrides in the `AvailabilitySettings` atom
+
 ## 1.10.0
 
 ### Minor Changes
diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx
index 5e1cd79728eac1..888a77c34fbb6b 100644
--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx
+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx
@@ -125,6 +125,7 @@ type AvailabilitySettingsProps = {
     handleBulkEditDialogToggle: () => void;
   };
   callbacksRef?: React.MutableRefObject<{ onSuccess?: () => void; onError?: (error: Error) => void }>;
+  isDryRun?: boolean;
 };
 
 const DeleteDialogButton = ({
@@ -190,6 +191,7 @@ const DateOverride = ({
   overridesModalClassNames,
   classNames,
   handleSubmit,
+  isDryRun = false,
 }: {
   workingHours: WorkingHours[];
   userTimeFormat: number | null;
@@ -203,6 +205,7 @@ const DateOverride = ({
     button?: string;
   };
   handleSubmit: (data: AvailabilityFormValues) => Promise<void>;
+  isDryRun?: boolean;
 }) => {
   const { append, replace, fields } = useFieldArray<AvailabilityFormValues, "dateOverrides">({
     name: "dateOverrides",
@@ -213,7 +216,9 @@ const DateOverride = ({
 
   const handleAvailabilityUpdate = () => {
     const updatedValues = getValues() as AvailabilityFormValues;
-    handleSubmit(updatedValues);
+    if (!isDryRun) {
+      handleSubmit(updatedValues);
+    }
   };
 
   return (
@@ -240,6 +245,7 @@ const DateOverride = ({
           hour12={Boolean(userTimeFormat === 12)}
           travelSchedules={travelSchedules}
           handleAvailabilityUpdate={handleAvailabilityUpdate}
+          isDryRun={isDryRun}
         />
         <DateOverrideInputDialog
           className={overridesModalClassNames}
@@ -251,6 +257,7 @@ const DateOverride = ({
           }}
           userTimeFormat={userTimeFormat}
           weekStart={weekStart}
+          isDryRun={isDryRun}
           Trigger={
             <Button
               className={classNames?.button}
@@ -308,6 +315,7 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai
       allowSetToDefault = true,
       allowDelete = true,
       callbacksRef,
+      isDryRun,
     } = props;
     const [openSidebar, setOpenSidebar] = useState(false);
     const { t, i18n } = useLocale();
@@ -675,6 +683,7 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai
               {enableOverrides && (
                 <BookerStoreProvider>
                   <DateOverride
+                    isDryRun={isDryRun}
                     workingHours={schedule.workingHours}
                     userTimeFormat={timeFormat}
                     handleSubmit={handleSubmit}
diff --git a/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx b/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx
index 2f684486cf4ee5..295e3b4ce67eec 100644
--- a/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx
+++ b/packages/platform/atoms/availability/wrappers/AvailabilitySettingsPlatformWrapper.tsx
@@ -203,6 +203,7 @@ export const AvailabilitySettingsPlatformWrapper = forwardRef<
         allowSetToDefault={allowSetToDefault}
         onFormStateChange={onFormStateChange}
         callbacksRef={callbacksRef}
+        isDryRun={isDryRun}
       />
     </AtomsWrapper>
   );
diff --git a/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx b/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
index 952d94d094ebea..fc73fc72e3fa70 100644
--- a/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
+++ b/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
@@ -1,5 +1,5 @@
 import { AtomsWrapper } from "@/components/atoms-wrapper";
-import { useMemo, useEffect, useState } from "react";
+import { useMemo } from "react";
 import { shallow } from "zustand/shallow";
 
 import dayjs from "@calcom/dayjs";
@@ -16,33 +16,34 @@ import { useTimePreferences } from "@calcom/features/bookings/lib";
 import { LargeCalendar } from "@calcom/features/calendar-view/LargeCalendar";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { useTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/useTimesForSchedule";
-import { getRoutedTeamMemberIdsFromSearchParams } from "@calcom/lib/bookings/getRoutedTeamMemberIdsFromSearchParams";
 
 import { formatUsername } from "../../booker/BookerPlatformWrapper";
 import type {
   BookerPlatformWrapperAtomPropsForIndividual,
   BookerPlatformWrapperAtomPropsForTeam,
 } from "../../booker/types";
-import { useGetBookingForReschedule } from "../../hooks/bookings/useGetBookingForReschedule";
 import { useAtomGetPublicEvent } from "../../hooks/event-types/public/useAtomGetPublicEvent";
 import { useEventType } from "../../hooks/event-types/public/useEventType";
 import { useTeamEventType } from "../../hooks/event-types/public/useTeamEventType";
 import { useAvailableSlots } from "../../hooks/useAvailableSlots";
 
+type CalendarViewPlatformWrapperAtomPropsForIndividual = {
+  username: string | string[];
+  eventSlug: string;
+};
+
+type CalendarViewPlatformWrapperAtomPropsForTeam = {
+  teamId: number;
+  eventSlug: string;
+};
+
 const CalendarViewPlatformWrapperComponent = (
-  props: BookerPlatformWrapperAtomPropsForIndividual | BookerPlatformWrapperAtomPropsForTeam
+  props:
+    | (CalendarViewPlatformWrapperAtomPropsForIndividual & { teamId?: number })
+    | (CalendarViewPlatformWrapperAtomPropsForTeam & { username?: string | string[] })
 ) => {
-  const {
-    eventSlug,
-    isTeamEvent,
-    hostsLimit,
-    allowUpdatingUrlParams = false,
-    teamMemberEmail,
-    crmAppSlug,
-    crmOwnerRecordType,
-  } = props;
-
-  const teamId: number | undefined = props.isTeamEvent ? props.teamId : undefined;
+  const isTeamEvent = !!props.teamId;
+  const teamId: number | undefined = props.teamId ? props.teamId : undefined;
   const username = useMemo(() => {
     if (props.username) {
       return formatUsername(props.username);
@@ -50,16 +51,16 @@ const CalendarViewPlatformWrapperComponent = (
     return "";
   }, [props.username]);
 
-  const { isPending } = useEventType(username, eventSlug, isTeamEvent);
-  const { isPending: isTeamPending } = useTeamEventType(teamId, eventSlug, isTeamEvent, hostsLimit);
+  const { isPending } = useEventType(username, props.eventSlug, isTeamEvent);
+
+  const { isPending: isTeamPending } = useTeamEventType(teamId, props.eventSlug, isTeamEvent);
 
-  const setSelectedDuration = useBookerStoreContext((state) => state.setSelectedDuration);
   const selectedDuration = useBookerStoreContext((state) => state.selectedDuration);
 
   const event = useAtomGetPublicEvent({
     username,
     eventSlug: props.eventSlug,
-    isTeamEvent: props.isTeamEvent,
+    isTeamEvent: isTeamEvent,
     teamId,
     selectedDuration,
   });
@@ -90,67 +91,21 @@ const CalendarViewPlatformWrapperComponent = (
     selectedDate,
   });
 
-  useEffect(() => {
-    setSelectedDuration(props.duration ?? null);
-  }, [props.duration, setSelectedDuration]);
-
   const { timezone } = useTimePreferences();
   const isDynamic = useMemo(() => {
     return getUsernameList(username ?? "").length > 1;
   }, [username]);
 
-  const [routingParams, setRoutingParams] = useState<{
-    routedTeamMemberIds?: number[];
-    _shouldServeCache?: boolean;
-    skipContactOwner?: boolean;
-    isBookingDryRun?: boolean;
-  }>({});
-
-  useEffect(() => {
-    const searchParams = props.routingFormSearchParams
-      ? new URLSearchParams(props.routingFormSearchParams)
-      : new URLSearchParams(window.location.search);
-
-    const routedTeamMemberIds = getRoutedTeamMemberIdsFromSearchParams(searchParams);
-    const skipContactOwner = searchParams.get("cal.skipContactOwner") === "true";
-
-    const _cacheParam = searchParams?.get("cal.cache");
-    const _shouldServeCache = _cacheParam ? _cacheParam === "true" : undefined;
-    const isBookingDryRun =
-      searchParams?.get("cal.isBookingDryRun")?.toLowerCase() === "true" ||
-      searchParams?.get("cal.sandbox")?.toLowerCase() === "true";
-    setRoutingParams({
-      ...(skipContactOwner ? { skipContactOwner } : {}),
-      ...(routedTeamMemberIds ? { routedTeamMemberIds } : {}),
-      ...(_shouldServeCache ? { _shouldServeCache } : {}),
-      ...(isBookingDryRun ? { isBookingDryRun } : {}),
-    });
-  }, [props.routingFormSearchParams]);
   const bookingData = useBookerStoreContext((state) => state.bookingData);
-  const setBookingData = useBookerStoreContext((state) => state.setBookingData);
-
-  useGetBookingForReschedule({
-    uid: props.rescheduleUid ?? props.bookingUid ?? "",
-    onSuccess: (data) => {
-      setBookingData(data);
-    },
-  });
 
   useInitializeBookerStoreContext({
     ...props,
-    teamMemberEmail,
-    crmAppSlug,
-    crmOwnerRecordType,
-    crmRecordId: props.crmRecordId,
     eventId: event?.data?.id,
-    rescheduleUid: props.rescheduleUid ?? null,
-    bookingUid: props.bookingUid ?? null,
     layout: "week_view",
-    org: props.entity?.orgSlug,
     username,
     bookingData,
     isPlatform: true,
-    allowUpdatingUrlParams,
+    allowUpdatingUrlParams: false,
   });
 
   const schedule = useAvailableSlots({
@@ -160,11 +115,10 @@ const CalendarViewPlatformWrapperComponent = (
     endTime,
     timeZone: timezone,
     duration: selectedDuration ?? undefined,
-    rescheduleUid: props.rescheduleUid,
-    teamMemberEmail: props.teamMemberEmail ?? undefined,
-    ...(props.isTeamEvent
+    teamMemberEmail: undefined,
+    ...(isTeamEvent
       ? {
-          isTeamEvent: props.isTeamEvent,
+          isTeamEvent: isTeamEvent,
           teamId: teamId,
         }
       : {}),
@@ -172,11 +126,10 @@ const CalendarViewPlatformWrapperComponent = (
       Boolean(teamId || username) &&
       Boolean(month) &&
       Boolean(timezone) &&
-      (props.isTeamEvent ? !isTeamPending : !isPending) &&
+      (isTeamEvent ? !isTeamPending : !isPending) &&
       Boolean(event?.data?.id),
-    orgSlug: props.entity?.orgSlug ?? undefined,
-    eventTypeSlug: isDynamic ? "dynamic" : eventSlug || "",
-    ...routingParams,
+    orgSlug: undefined,
+    eventTypeSlug: isDynamic ? "dynamic" : props.eventSlug || "",
   });
 
   return (
@@ -185,7 +138,7 @@ const CalendarViewPlatformWrapperComponent = (
         <Header
           isCalendarView={true}
           isMyLink={true}
-          eventSlug={eventSlug}
+          eventSlug={props.eventSlug}
           enabledLayouts={bookerLayout.bookerLayouts.enabledLayouts}
           extraDays={7}
           isMobile={false}
@@ -204,7 +157,9 @@ const CalendarViewPlatformWrapperComponent = (
 };
 
 export const CalendarViewPlatformWrapper = (
-  props: BookerPlatformWrapperAtomPropsForIndividual | BookerPlatformWrapperAtomPropsForTeam
+  props:
+    | (BookerPlatformWrapperAtomPropsForIndividual & { teamId?: number })
+    | Omit<BookerPlatformWrapperAtomPropsForTeam, "isTeamEvent">
 ) => {
   return (
     <BookerStoreProvider>
diff --git a/packages/platform/atoms/create-schedule/CreateScheduleForm.tsx b/packages/platform/atoms/create-schedule/CreateScheduleForm.tsx
new file mode 100644
index 00000000000000..485e3c5b378b1a
--- /dev/null
+++ b/packages/platform/atoms/create-schedule/CreateScheduleForm.tsx
@@ -0,0 +1,108 @@
+import { useForm } from "react-hook-form";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { ApiErrorResponse } from "@calcom/platform-types";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { InputField } from "@calcom/ui/components/form";
+
+import { useAtomCreateSchedule } from "../hooks/schedules/useAtomCreateSchedule";
+import { AtomsWrapper } from "../src/components/atoms-wrapper";
+import { useToast } from "../src/components/ui/use-toast";
+import { cn } from "../src/lib/utils";
+
+export type ActionButtonsClassNames = {
+  container?: string;
+  continue?: string;
+  close?: string;
+};
+
+export const CreateScheduleForm = ({
+  onSuccess,
+  onError,
+  onCancel,
+  customClassNames,
+  disableToasts = false,
+}: {
+  onSuccess?: (scheduleId: number) => void;
+  onError?: (err: ApiErrorResponse) => void;
+  onCancel?: () => void;
+  customClassNames?: {
+    formWrapper?: string;
+    inputField?: string;
+    actionsButtons?: ActionButtonsClassNames;
+  };
+  disableToasts?: boolean;
+}) => {
+  const { toast } = useToast();
+  const { t } = useLocale();
+  const form = useForm<{
+    name: string;
+  }>();
+  const { register } = form;
+
+  const { mutateAsync: createSchedule, isPending: isCreateSchedulePending } = useAtomCreateSchedule({
+    onSuccess: (res) => {
+      if (!disableToasts) {
+        toast({
+          description: t("schedule_created_successfully", { scheduleName: res.data.schedule.name }),
+        });
+      }
+      form.reset();
+      onSuccess?.(res.data.schedule.id);
+    },
+    onError: (err) => {
+      onError?.(err);
+      if (!disableToasts) {
+        toast({
+          description: `Could not create schedule: ${err.error.message}`,
+        });
+      }
+    },
+  });
+
+  return (
+    <AtomsWrapper>
+      <Form
+        className={customClassNames?.formWrapper}
+        form={form}
+        handleSubmit={async (values) => {
+          await createSchedule(values);
+        }}>
+        <InputField
+          className={customClassNames?.inputField}
+          label={t("name")}
+          type="text"
+          id="name"
+          required
+          placeholder={t("default_schedule_name")}
+          {...register("name", {
+            setValueAs: (v) => (!v || v.trim() === "" ? null : v),
+          })}
+        />
+        <div
+          className={cn(
+            "mt-5 justify-end space-x-2 rtl:space-x-reverse sm:mt-4 sm:flex",
+            customClassNames?.actionsButtons?.container
+          )}>
+          {onCancel && (
+            <Button
+              type="button"
+              color="secondary"
+              onClick={onCancel}
+              className={customClassNames?.actionsButtons?.close}>
+              {t("close")}
+            </Button>
+          )}
+          <Button
+            type="submit"
+            loading={isCreateSchedulePending}
+            className={customClassNames?.actionsButtons?.continue}>
+            {" "}
+            {t("continue")}
+          </Button>
+        </div>
+      </Form>
+    </AtomsWrapper>
+  );
+};
diff --git a/packages/platform/atoms/create-schedule/index.tsx b/packages/platform/atoms/create-schedule/index.tsx
new file mode 100644
index 00000000000000..00eca07d8bbd6d
--- /dev/null
+++ b/packages/platform/atoms/create-schedule/index.tsx
@@ -0,0 +1 @@
+export { CreateSchedulePlatformWrapper } from "./wrappers/CreateSchedulePlatformWrapper";
diff --git a/packages/platform/atoms/create-schedule/wrappers/CreateSchedulePlatformWrapper.tsx b/packages/platform/atoms/create-schedule/wrappers/CreateSchedulePlatformWrapper.tsx
new file mode 100644
index 00000000000000..3ff3cf63161f97
--- /dev/null
+++ b/packages/platform/atoms/create-schedule/wrappers/CreateSchedulePlatformWrapper.tsx
@@ -0,0 +1,69 @@
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
+import { useState } from "react";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { ApiErrorResponse } from "@calcom/platform-types";
+import { Button } from "@calcom/ui/components/button";
+
+import { AtomsWrapper } from "../../src/components/atoms-wrapper";
+import { CreateScheduleForm } from "../CreateScheduleForm";
+import { ActionButtonsClassNames } from "../CreateScheduleForm";
+
+export const CreateSchedulePlatformWrapper = ({
+  name,
+  customClassNames,
+  onSuccess,
+  onError,
+  disableToasts = false,
+}: {
+  name?: string;
+  onSuccess?: (scheduleId: number) => void;
+  onError?: (err: ApiErrorResponse) => void;
+  customClassNames?: {
+    createScheduleButton?: string;
+    inputField?: string;
+    formWrapper?: string;
+    actionsButtons?: ActionButtonsClassNames;
+  };
+  disableToasts?: boolean;
+}) => {
+  const { t } = useLocale();
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+
+  return (
+    <AtomsWrapper>
+      <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+        <DialogTrigger asChild>
+          <Button
+            type="button"
+            data-testid={name}
+            className={customClassNames?.createScheduleButton}
+            StartIcon="plus"
+            onClick={() => setIsDialogOpen(true)}>
+            {name ?? t("new")}
+          </Button>
+        </DialogTrigger>
+        <DialogContent className="bg-default text-default">
+          <CreateScheduleForm
+            customClassNames={{
+              formWrapper: customClassNames?.formWrapper,
+              inputField: customClassNames?.inputField,
+              actionsButtons: {
+                container: customClassNames?.actionsButtons?.container,
+                continue: customClassNames?.actionsButtons?.continue,
+                close: customClassNames?.actionsButtons?.close,
+              },
+            }}
+            onSuccess={(scheduleId) => {
+              setIsDialogOpen(false);
+              onSuccess?.(scheduleId);
+            }}
+            onError={onError}
+            onCancel={() => setIsDialogOpen(false)}
+            disableToasts={disableToasts}
+          />
+        </DialogContent>
+      </Dialog>
+    </AtomsWrapper>
+  );
+};
diff --git a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
index 2fca4b72321c0c..2dcd2f6376d573 100644
--- a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
@@ -2,7 +2,7 @@ import { AtomsWrapper } from "@/components/atoms-wrapper";
 
 import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
 import CreateEventTypeForm from "@calcom/features/eventtypes/components/CreateEventTypeForm";
-import { useCreateEventTypeForm } from "@calcom/lib/hooks/useCreateEventType";
+import { useCreateEventTypeForm } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { EventType } from "@calcom/prisma/client";
 import { Button } from "@calcom/ui/components/button";
diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
index e8a7d125b0d176..7ee712dd328e28 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
@@ -169,7 +169,7 @@ const EventTypeWeb = ({
   const [pendingRoute, setPendingRoute] = useState("");
   const { eventType, locationOptions, team, teamMembers, destinationCalendar } = rest;
   const [slugExistsChildrenDialogOpen, setSlugExistsChildrenDialogOpen] = useState<ChildrenEventType[]>([]);
-  const { data: eventTypeApps } = trpc.viewer.apps.integrations.useQuery({
+  const { data: eventTypeApps, isPending: isPendingApps } = trpc.viewer.apps.integrations.useQuery({
     extendsFeature: "EventType",
     teamId: eventType.team?.id || eventType.parent?.teamId,
     onlyInstalled: true,
@@ -287,7 +287,13 @@ const EventTypeWeb = ({
     ),
     instant: <EventInstantTab eventType={eventType} isTeamEvent={!!team} />,
     recurring: <EventRecurringTab eventType={eventType} />,
-    apps: <EventAppsTab eventType={{ ...eventType, URL: permalink }} />,
+    apps: (
+      <EventAppsTab
+        eventType={{ ...eventType, URL: permalink }}
+        eventTypeApps={eventTypeApps}
+        isPendingApps={isPendingApps}
+      />
+    ),
     workflows:
       allActiveWorkflows && canReadWorkflows ? (
         <EventWorkflowsTab eventType={eventType} workflows={allActiveWorkflows} />
diff --git a/packages/platform/atoms/hooks/schedules/useAtomCreateSchedule.ts b/packages/platform/atoms/hooks/schedules/useAtomCreateSchedule.ts
new file mode 100644
index 00000000000000..ef9d7fac11f003
--- /dev/null
+++ b/packages/platform/atoms/hooks/schedules/useAtomCreateSchedule.ts
@@ -0,0 +1,48 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import type { ApiResponse, ApiErrorResponse, ApiSuccessResponse } from "@calcom/platform-types";
+import type { CreateScheduleHandlerReturn } from "@calcom/trpc/server/routers/viewer/availability/schedule/create.handler";
+import { TCreateInputSchema as CreateScheduleSchema } from "@calcom/trpc/server/routers/viewer/availability/schedule/create.schema";
+
+import http from "../../lib/http";
+import { QUERY_KEY as SchedulesQueryKey } from "./useAtomGetAllSchedules";
+import { QUERY_KEY as ScheduleQueryKey } from "./useAtomSchedule";
+
+interface useAtomCreateScheduleOptions {
+  onSuccess?: (res: ApiSuccessResponse<CreateScheduleHandlerReturn>) => void;
+  onError?: (err: ApiErrorResponse) => void;
+}
+
+export const useAtomCreateSchedule = (
+  { onSuccess, onError }: useAtomCreateScheduleOptions = {
+    onSuccess: () => {
+      return;
+    },
+    onError: () => {
+      return;
+    },
+  }
+) => {
+  const queryClient = useQueryClient();
+
+  return useMutation<ApiResponse<CreateScheduleHandlerReturn>, unknown, CreateScheduleSchema>({
+    mutationFn: async (body: CreateScheduleSchema) => {
+      const url = `atoms/schedules/create`;
+      const response = await http.post<ApiResponse<CreateScheduleHandlerReturn>>(url, body);
+      return response.data;
+    },
+    onSuccess: (data) => {
+      if (data.status === SUCCESS_STATUS) {
+        onSuccess?.(data);
+        queryClient.invalidateQueries({ queryKey: [ScheduleQueryKey] });
+        queryClient.invalidateQueries({ queryKey: [SchedulesQueryKey] });
+      } else {
+        onError?.(data);
+      }
+    },
+    onError: (err) => {
+      onError?.(err as ApiErrorResponse);
+    },
+  });
+};
diff --git a/packages/platform/atoms/hooks/schedules/useAtomDuplicateSchedule.ts b/packages/platform/atoms/hooks/schedules/useAtomDuplicateSchedule.ts
new file mode 100644
index 00000000000000..2d7458485880ac
--- /dev/null
+++ b/packages/platform/atoms/hooks/schedules/useAtomDuplicateSchedule.ts
@@ -0,0 +1,45 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import type { ApiResponse, ApiErrorResponse } from "@calcom/platform-types";
+import type { DuplicateScheduleHandlerReturn } from "@calcom/trpc/server/routers/viewer/availability/schedule/duplicate.handler";
+
+import http from "../../lib/http";
+import { QUERY_KEY as ScheduleQueryKey } from "./useAtomSchedule";
+
+interface useAtomDuplicateScheduleOptions {
+  onSuccess?: (res: ApiResponse<DuplicateScheduleHandlerReturn>) => void;
+  onError?: (err: ApiErrorResponse) => void;
+}
+
+export const useAtomDuplicateSchedule = (
+  { onSuccess, onError }: useAtomDuplicateScheduleOptions = {
+    onSuccess: () => {
+      return;
+    },
+    onError: () => {
+      return;
+    },
+  }
+) => {
+  const queryClient = useQueryClient();
+
+  return useMutation<ApiResponse<DuplicateScheduleHandlerReturn>, unknown, { scheduleId: number }>({
+    mutationFn: async ({ scheduleId }: { scheduleId: number }) => {
+      const url = `atoms/schedules/${scheduleId}/duplicate`;
+      const response = await http.post<ApiResponse<DuplicateScheduleHandlerReturn>>(url);
+      return response.data;
+    },
+    onSuccess: (data) => {
+      if (data.status === SUCCESS_STATUS) {
+        onSuccess?.(data);
+        queryClient.invalidateQueries({ queryKey: [ScheduleQueryKey] });
+      } else {
+        onError?.(data);
+      }
+    },
+    onError: (err) => {
+      onError?.(err as ApiErrorResponse);
+    },
+  });
+};
diff --git a/packages/platform/atoms/hooks/schedules/useAtomGetAllSchedules.ts b/packages/platform/atoms/hooks/schedules/useAtomGetAllSchedules.ts
new file mode 100644
index 00000000000000..f0b1a1327ac7dc
--- /dev/null
+++ b/packages/platform/atoms/hooks/schedules/useAtomGetAllSchedules.ts
@@ -0,0 +1,30 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import type { ApiResponse } from "@calcom/platform-types";
+import type { GetAvailabilityListHandlerReturn } from "@calcom/trpc/server/routers/viewer/availability/list.handler";
+
+import http from "../../lib/http";
+import { useAtomsContext } from "../useAtomsContext";
+
+export const QUERY_KEY = "use-atom-user-schedules";
+
+export const useAtomGetAllSchedules = () => {
+  const pathname = "atoms/schedules/all";
+  const { isInit, accessToken } = useAtomsContext();
+
+  const { isLoading, error, data, refetch } = useQuery({
+    queryKey: [QUERY_KEY],
+    queryFn: () => {
+      return http.get<ApiResponse<GetAvailabilityListHandlerReturn>>(pathname).then((res) => {
+        if (res.data.status === SUCCESS_STATUS) {
+          return res.data.data;
+        }
+        throw new Error(res.data.error?.message);
+      });
+    },
+    enabled: isInit && !!accessToken,
+  });
+
+  return { isLoading, error, data, refetch };
+};
diff --git a/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts b/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts
new file mode 100644
index 00000000000000..ae323785ec8be0
--- /dev/null
+++ b/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts
@@ -0,0 +1,22 @@
+import { useEffect, useRef } from "react";
+
+import { Schedule } from "@calcom/lib/schedules/transformers/getTransformedSchedles";
+
+export function useEnsureDefaultSchedule(
+  schedules: Schedule[],
+  onUpdateSchedule: (scheduleId: number) => void | Promise<void>
+) {
+  const onUpdateRef = useRef(onUpdateSchedule);
+
+  useEffect(() => {
+    onUpdateRef.current = onUpdateSchedule;
+  });
+
+  useEffect(() => {
+    const defaultSchedule = schedules.filter((schedule) => schedule.isDefault);
+
+    if (defaultSchedule.length === 0 && schedules.length > 0) {
+      onUpdateRef.current(schedules[0].id);
+    }
+  }, [schedules]);
+}
diff --git a/packages/platform/atoms/index.ts b/packages/platform/atoms/index.ts
index 7622eb877f3a52..813194487285d4 100644
--- a/packages/platform/atoms/index.ts
+++ b/packages/platform/atoms/index.ts
@@ -41,4 +41,10 @@ export { useCreateTeamEventType } from "./hooks/event-types/private/useCreateTea
 
 export { useOrganizationBookings } from "./hooks/organizations/bookings/useOrganizationBookings";
 export { useOrganizationUserBookings } from "./hooks/organizations/bookings/useOrganizationUserBookings";
+
 export { CalendarViewPlatformWrapper as CalendarView } from "./calendar-view/index";
+
+export { CreateSchedulePlatformWrapper as CreateSchedule } from "./create-schedule/index";
+export { CreateScheduleForm } from "./create-schedule/CreateScheduleForm";
+
+export { ListSchedulesPlatformWrapper as ListSchedules } from "./list-schedules/index";
diff --git a/packages/platform/atoms/list-schedules/index.ts b/packages/platform/atoms/list-schedules/index.ts
new file mode 100644
index 00000000000000..67c749392deb59
--- /dev/null
+++ b/packages/platform/atoms/list-schedules/index.ts
@@ -0,0 +1 @@
+export { ListSchedulesPlatformWrapper } from "./wrappers/ListSchedulesPlatformWrapper";
diff --git a/packages/platform/atoms/list-schedules/wrappers/ListSchedulesPlatformWrapper.tsx b/packages/platform/atoms/list-schedules/wrappers/ListSchedulesPlatformWrapper.tsx
new file mode 100644
index 00000000000000..ea31671adba06e
--- /dev/null
+++ b/packages/platform/atoms/list-schedules/wrappers/ListSchedulesPlatformWrapper.tsx
@@ -0,0 +1,129 @@
+import { AtomsWrapper } from "@/components/atoms-wrapper";
+import { useAutoAnimate } from "@formkit/auto-animate/react";
+
+import { ScheduleListItem } from "@calcom/features/schedules/components/ScheduleListItem";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { getScheduleListItemData } from "@calcom/lib/schedules/transformers/getScheduleListItemData";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+
+import { useAtomDuplicateSchedule } from "../../hooks/schedules/useAtomDuplicateSchedule";
+import { useAtomGetAllSchedules } from "../../hooks/schedules/useAtomGetAllSchedules";
+import { useAtomUpdateSchedule } from "../../hooks/schedules/useAtomUpdateSchedule";
+import useDeleteSchedule from "../../hooks/schedules/useDeleteSchedule";
+import { useEnsureDefaultSchedule } from "../../hooks/schedules/useEnsureDefaultSchedule";
+import { useMe } from "../../hooks/useMe";
+import { useToast } from "../../src/components/ui/use-toast";
+
+interface ListSchedulesPlatformWrapperProps {
+  getScheduleUrl?: (scheduleId: number) => string;
+}
+
+export const ListSchedulesPlatformWrapper = ({ getScheduleUrl }: ListSchedulesPlatformWrapperProps = {}) => {
+  const [animationParentRef] = useAutoAnimate<HTMLUListElement>();
+  const { toast } = useToast();
+  const { t } = useLocale();
+
+  const {
+    data: userSchedules,
+    isLoading: isLoadingSchedules,
+    refetch: refetchSchedules,
+  } = useAtomGetAllSchedules();
+  const { data: user, isLoading: isUserLoading } = useMe();
+
+  const { mutate: updateSchedule } = useAtomUpdateSchedule({
+    onSuccess: () => {
+      toast({
+        description: "Schedule updated successfully",
+      });
+      refetchSchedules();
+    },
+    onError: (err) => {
+      toast({
+        description: `Could not update schedule: ${err.error.message}`,
+      });
+    },
+  });
+
+  const { mutate: duplicateSchedule } = useAtomDuplicateSchedule({
+    onSuccess: () => {
+      toast({
+        description: "Schedule created successfully",
+      });
+      refetchSchedules();
+    },
+    onError: (err) => {
+      toast({
+        description: `Could not duplicate schedule: ${err.error.message}`,
+      });
+    },
+  });
+
+  const { mutate: deleteSchedule } = useDeleteSchedule({
+    onSuccess: () => {
+      toast({
+        description: "Schedule deleted successfully",
+      });
+      refetchSchedules();
+    },
+    onError: (err) => {
+      toast({
+        description: `Could not delete schedule: ${err.error.message}`,
+      });
+    },
+  });
+
+  useEnsureDefaultSchedule(userSchedules?.schedules ?? [], (id) => {
+    updateSchedule({
+      scheduleId: id,
+      body: {
+        isDefault: true,
+      },
+    });
+  });
+
+  const transformedSchedules = userSchedules?.schedules.map((schedule) => getScheduleListItemData(schedule));
+
+  if (isLoadingSchedules || isUserLoading) return <>{t("loading")}</>;
+
+  if (!isLoadingSchedules && transformedSchedules?.length === 0)
+    return (
+      <EmptyScreen
+        Icon="clock"
+        headline={t("no_schedules_present")}
+        description={t("create_new_schedule")}
+        className="w-full"
+      />
+    );
+
+  return (
+    <AtomsWrapper>
+      <div className="border-subtle bg-default overflow-hidden rounded-md border">
+        <ul className="divide-subtle divide-y" data-testid="schedules" ref={animationParentRef}>
+          {transformedSchedules?.map((schedule) => (
+            <ScheduleListItem
+              displayOptions={{
+                hour12: user?.data.timeFormat ? user.data.timeFormat === 12 : undefined,
+                timeZone: user?.data.timeZone,
+                weekStart: user?.data.weekStart || "Sunday",
+              }}
+              key={schedule.id}
+              schedule={schedule}
+              isDeletable={transformedSchedules.length !== 1}
+              redirectUrl={getScheduleUrl ? getScheduleUrl(schedule.id) : "#"}
+              updateDefault={() => {
+                updateSchedule({
+                  scheduleId: schedule.id,
+                  body: {
+                    isDefault: true,
+                  },
+                });
+              }}
+              deleteFunction={async () => await deleteSchedule({ id: schedule.id })}
+              duplicateFunction={() => duplicateSchedule({ scheduleId: schedule.id })}
+            />
+          ))}
+        </ul>
+      </div>
+    </AtomsWrapper>
+  );
+};
diff --git a/packages/platform/atoms/package.json b/packages/platform/atoms/package.json
index 7b74d8c40b90be..d6fd36b99bdb5b 100644
--- a/packages/platform/atoms/package.json
+++ b/packages/platform/atoms/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "description": "Customizable UI components to integrate scheduling into your product.",
   "authors": "Cal.com, Inc.",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "scripts": {
     "dev": "yarn vite build --watch & npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify --watch",
     "build": "NODE_OPTIONS='--max_old_space_size=12288' rm -rf dist && yarn vite build && npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify",
diff --git a/packages/platform/examples/base/src/pages/availability.tsx b/packages/platform/examples/base/src/pages/availability/[scheduleId].tsx
similarity index 93%
rename from packages/platform/examples/base/src/pages/availability.tsx
rename to packages/platform/examples/base/src/pages/availability/[scheduleId].tsx
index 876e2f916bb03b..090b8b5742af59 100644
--- a/packages/platform/examples/base/src/pages/availability.tsx
+++ b/packages/platform/examples/base/src/pages/availability/[scheduleId].tsx
@@ -1,5 +1,7 @@
 import { Navbar } from "@/components/Navbar";
 import { Inter } from "next/font/google";
+// eslint-disable-next-line @calcom/eslint/deprecated-imports-next-router
+import { useRouter } from "next/router";
 import { useRef, useCallback } from "react";
 
 import type { AvailabilitySettingsFormRef } from "@calcom/atoms";
@@ -8,6 +10,7 @@ import { AvailabilitySettings } from "@calcom/atoms";
 const inter = Inter({ subsets: ["latin"] });
 
 export default function Availability(props: { calUsername: string; calEmail: string }) {
+  const router = useRouter();
   const availabilityRef = useRef<AvailabilitySettingsFormRef>(null);
 
   const handleFormStateChange = useCallback((formState: unknown) => {
@@ -50,6 +53,7 @@ export default function Availability(props: { calUsername: string; calEmail: str
         </div>
 
         <AvailabilitySettings
+          id={router.query.scheduleId as string}
           ref={availabilityRef}
           enableOverrides={true}
           customClassNames={{
@@ -82,6 +86,7 @@ export default function Availability(props: { calUsername: string; calEmail: str
           onFormStateChange={handleFormStateChange}
           onUpdateSuccess={() => {
             console.log("Updated successfully");
+            router.push(`/availability`);
           }}
           onUpdateError={() => {
             console.log("update error");
diff --git a/packages/platform/examples/base/src/pages/availability/index.tsx b/packages/platform/examples/base/src/pages/availability/index.tsx
new file mode 100644
index 00000000000000..fc370f28cee7a5
--- /dev/null
+++ b/packages/platform/examples/base/src/pages/availability/index.tsx
@@ -0,0 +1,23 @@
+import { Navbar } from "@/components/Navbar";
+import { Inter } from "next/font/google";
+
+import { ListSchedules, CreateSchedule } from "@calcom/atoms";
+
+const inter = Inter({ subsets: ["latin"] });
+
+export default function Availability(props: { calUsername: string; calEmail: string }) {
+  return (
+    <main className={`flex min-h-screen flex-col ${inter.className}`}>
+      <Navbar username={props.calUsername} />
+      <div className="m-5 flex flex-col gap-4">
+        <div data-testid="create-schedule-atom">
+          <CreateSchedule name="Create new schedule" />
+        </div>
+
+        <div data-testid="list-schedules-atom">
+          <ListSchedules getScheduleUrl={(scheduleId) => `/availability/${scheduleId}`} />
+        </div>
+      </div>
+    </main>
+  );
+}
diff --git a/packages/platform/examples/base/src/pages/booking.tsx b/packages/platform/examples/base/src/pages/booking.tsx
index 14ac3fec91c1b9..01a52fce5e5356 100644
--- a/packages/platform/examples/base/src/pages/booking.tsx
+++ b/packages/platform/examples/base/src/pages/booking.tsx
@@ -1,6 +1,5 @@
 import { Navbar } from "@/components/Navbar";
 import { Inter } from "next/font/google";
-// eslint-disable-next-line @calcom/eslint/deprecated-imports-next-router
 import { useRouter } from "next/router";
 import { useState } from "react";
 
@@ -95,6 +94,7 @@ export default function Bookings(props: { calUsername: string; calEmail: string
               // timeZones={["Europe/London", "Asia/Kolkata"]}
               // isBookingDryRun={true}
               // roundRobinHideOrgAndTeam={true}
+              defaultFormValues={{ name: "Bob the booker", email: "bob@thebooker.com" }}
               bannerUrl="https://i0.wp.com/mahala.co.uk/wp-content/uploads/2014/12/img_banner-thin_mountains.jpg?fit=800%2C258&ssl=1"
               eventSlug={eventTypeSlug}
               onCreateBookingSuccess={(data) => {
diff --git a/packages/platform/examples/base/tests/availability-settings-atom/availability-settings-atom.e2e.ts b/packages/platform/examples/base/tests/availability-settings-atom/availability-settings-atom.e2e.ts
index 70bc6fda8e88a4..2f741fecd2bb1d 100644
--- a/packages/platform/examples/base/tests/availability-settings-atom/availability-settings-atom.e2e.ts
+++ b/packages/platform/examples/base/tests/availability-settings-atom/availability-settings-atom.e2e.ts
@@ -8,11 +8,20 @@ async function selectOption(page: Page, optionNumber: number) {
   await page.keyboard.press("Enter");
 }
 
-test("availability page loads with all components", async ({ page }) => {
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip("availability page loads with all components", async ({ page }) => {
   await page.goto("/availability");
-
   await expect(page).toHaveURL("/availability");
 
+  await expect(page.locator('[data-testid="list-schedules-atom"]')).toBeVisible();
+  await expect(page.locator('[data-testid="schedules"]')).toBeVisible();
+
+  await expect(page.locator('[data-testid="schedules"] li').first()).toBeVisible();
+  await expect(
+    page.locator('[data-testid="schedules"] li').first().locator('[data-testid="schedule-more"]')
+  ).toBeVisible();
+  await page.locator('[data-testid="schedules"] li').first().locator('[data-testid="schedule-more"]').click();
+
   await expect(page.locator('h1:has-text("Availability Settings")')).toBeVisible();
 
   await expect(page.locator('button:has-text("Validate Form")')).toBeVisible();
diff --git a/packages/platform/libraries/app-store.ts b/packages/platform/libraries/app-store.ts
index f1fbbcc37f8229..2b86dcf42a70ae 100644
--- a/packages/platform/libraries/app-store.ts
+++ b/packages/platform/libraries/app-store.ts
@@ -43,7 +43,7 @@ export {
   CalendarAppDelegationCredentialNotSetupError,
 } from "@calcom/lib/CalendarAppError";
 
-export { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+export { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 
 export { OAuth2UniversalSchema } from "@calcom/app-store/_utils/oauth/universalSchema";
 export { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
diff --git a/packages/platform/libraries/bookings.ts b/packages/platform/libraries/bookings.ts
index 8c85e225fb62d4..75b7b23163c93c 100644
--- a/packages/platform/libraries/bookings.ts
+++ b/packages/platform/libraries/bookings.ts
@@ -1,3 +1,10 @@
 export { LuckyUserService } from "@calcom/features/bookings/lib/getLuckyUser";
-export { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
+export { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 export { CheckBookingAndDurationLimitsService } from "@calcom/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
+export { RegularBookingService } from "@calcom/features/bookings/lib/handleNewBooking";
+export { RecurringBookingService } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
+export { InstantBookingCreateService } from "@calcom/features/instant-meeting/handleInstantMeeting";
+export type {
+  InstantBookingCreateResult,
+  RegularBookingCreateResult,
+} from "@calcom/features/bookings/lib/dto/types";
diff --git a/packages/platform/libraries/conferencing.ts b/packages/platform/libraries/conferencing.ts
index 2d1acd5c2a0429..4d0aff0d7f611a 100644
--- a/packages/platform/libraries/conferencing.ts
+++ b/packages/platform/libraries/conferencing.ts
@@ -2,4 +2,4 @@ export {
   getRecordingsOfCalVideoByRoomName,
   getDownloadLinkOfCalVideoByRecordingId,
   getAllTranscriptsAccessLinkFromRoomName,
-} from "@calcom/app-store/videoClient";
+} from "@calcom/features/conferencing/lib/videoClient";
diff --git a/packages/platform/libraries/event-types.ts b/packages/platform/libraries/event-types.ts
index df62d149163606..a67a28c50f67e2 100644
--- a/packages/platform/libraries/event-types.ts
+++ b/packages/platform/libraries/event-types.ts
@@ -18,6 +18,8 @@ export {
   eventTypeLocations,
 } from "@calcom/prisma/zod-utils";
 
+export type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
+
 export { validateCustomEventName } from "@calcom/features/eventtypes/lib/eventNaming";
 export { EventManager };
 export { getEventTypeById } from "@calcom/features/eventtypes/lib/getEventTypeById";
diff --git a/packages/platform/libraries/index.ts b/packages/platform/libraries/index.ts
index 05076e8e3bd152..d1202588093d28 100644
--- a/packages/platform/libraries/index.ts
+++ b/packages/platform/libraries/index.ts
@@ -1,8 +1,8 @@
 import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booking";
+import getAllUserBookings from "@calcom/features/bookings/lib/getAllUserBookings";
 import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
 import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo";
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
-import * as newBookingMethods from "@calcom/features/bookings/lib/handleNewBooking";
 import { getClientSecretFromPayment } from "@calcom/features/ee/payments/pages/getClientSecretFromPayment";
 import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm";
 import {
@@ -11,9 +11,7 @@ import {
 } from "@calcom/features/ee/workflows/lib/reminders/verifyPhoneNumber";
 import { handleCreatePhoneCall } from "@calcom/features/handleCreatePhoneCall";
 import handleMarkNoShow from "@calcom/features/handleMarkNoShow";
-import * as instantMeetingMethods from "@calcom/features/instant-meeting/handleInstantMeeting";
 import { getRoutedUrl } from "@calcom/features/routing-forms/lib/getRoutedUrl";
-import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";
 import { symmetricEncrypt, symmetricDecrypt } from "@calcom/lib/crypto";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import type { Prisma } from "@calcom/prisma/client";
@@ -41,16 +39,9 @@ export {
 
 export { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 
-const handleNewBooking = newBookingMethods.default;
-export { handleNewBooking };
-const handleInstantMeeting = instantMeetingMethods.default;
-export { handleInstantMeeting };
-
 export { handleMarkNoShow };
 export { handleCreatePhoneCall };
 
-export { handleNewRecurringBooking } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
-
 export { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/features/calendars/lib/getConnectedDestinationCalendars";
 
 export { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";
@@ -136,5 +127,5 @@ export { sendEmailVerificationByCode } from "@calcom/features/auth/lib/verifyEma
 
 export { checkEmailVerificationRequired } from "@calcom/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.handler";
 
-export { TeamService } from "@calcom/lib/server/service/teamService";
+export { TeamService } from "@calcom/features/ee/teams/services/teamService";
 export { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
diff --git a/packages/platform/libraries/repositories.ts b/packages/platform/libraries/repositories.ts
index 50d550f270fe24..efc39f817fa272 100644
--- a/packages/platform/libraries/repositories.ts
+++ b/packages/platform/libraries/repositories.ts
@@ -1,12 +1,12 @@
 export { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
 export { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
 export { ScheduleRepository as PrismaScheduleRepository } from "@calcom/lib/server/repository/schedule";
-export { BookingRepository as PrismaBookingRepository } from "@calcom/lib/server/repository/booking";
-export { EventTypeRepository as PrismaEventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+export { BookingRepository as PrismaBookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+export { EventTypeRepository as PrismaEventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 export { RoutingFormResponseRepository as PrismaRoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
 export { PrismaSelectedSlotRepository } from "@calcom/lib/server/repository/PrismaSelectedSlotRepository";
-export { TeamRepository as PrismaTeamRepository } from "@calcom/lib/server/repository/team";
-export { UserRepository as PrismaUserRepository } from "@calcom/lib/server/repository/user";
+export { TeamRepository as PrismaTeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+export { UserRepository as PrismaUserRepository } from "@calcom/features/users/repositories/UserRepository";
 export { FeaturesRepository as PrismaFeaturesRepository } from "@calcom/features/flags/features.repository";
-export { MembershipRepository as PrismaMembershipRepository } from "@calcom/lib/server/repository/membership";
+export { MembershipRepository as PrismaMembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 export { HostRepository as PrismaHostRepository } from "@calcom/lib/server/repository/host";
diff --git a/packages/platform/libraries/schedules.ts b/packages/platform/libraries/schedules.ts
index ba3967e88fdf31..c3c30c73f73a0c 100644
--- a/packages/platform/libraries/schedules.ts
+++ b/packages/platform/libraries/schedules.ts
@@ -5,3 +5,18 @@ export {
 
 export { updateSchedule, type UpdateScheduleResponse } from "@calcom/lib/schedules/updateSchedule";
 export { UserAvailabilityService } from "@calcom/features/availability/lib/getUserAvailability";
+
+export {
+  createHandler as createScheduleHandler,
+  type CreateScheduleHandlerReturn,
+} from "@calcom/trpc/server/routers/viewer/availability/schedule/create.handler";
+export { ZCreateInputSchema as CreateScheduleSchema } from "@calcom/trpc/server/routers/viewer/availability/schedule/create.schema";
+
+export {
+  listHandler as getAvailabilityListHandler,
+  type GetAvailabilityListHandlerReturn,
+} from "@calcom/trpc/server/routers/viewer/availability/list.handler";
+export {
+  duplicateHandler as duplicateScheduleHandler,
+  type DuplicateScheduleHandlerReturn,
+} from "@calcom/trpc/server/routers/viewer/availability/schedule/duplicate.handler";
diff --git a/packages/platform/libraries/slots.ts b/packages/platform/libraries/slots.ts
index 2a1e6ebe3d0fc3..e4679c1e539c41 100644
--- a/packages/platform/libraries/slots.ts
+++ b/packages/platform/libraries/slots.ts
@@ -1,6 +1,7 @@
+import { validateRoundRobinSlotAvailability } from "@calcom/features/ee/round-robin/utils/validateRoundRobinSlotAvailability";
 import { FilterHostsService } from "@calcom/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost";
 import { QualifiedHostsService } from "@calcom/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials";
-import { BusyTimesService } from "@calcom/lib/getBusyTimes";
+import { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
 import { NoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots";
 import { AvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util";
 
@@ -12,3 +13,4 @@ export { QualifiedHostsService };
 
 export { FilterHostsService };
 export { NoSlotsNotificationService };
+export { validateRoundRobinSlotAvailability };
diff --git a/packages/platform/types/bookings/2024-08-13/inputs/cancel-booking.input.ts b/packages/platform/types/bookings/2024-08-13/inputs/cancel-booking.input.ts
index c8f7498e1ba456..9b0f66948431b7 100644
--- a/packages/platform/types/bookings/2024-08-13/inputs/cancel-booking.input.ts
+++ b/packages/platform/types/bookings/2024-08-13/inputs/cancel-booking.input.ts
@@ -24,4 +24,9 @@ export class CancelSeatedBookingInput_2024_08_13 {
   })
   @IsString()
   seatUid!: string;
+
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional({ example: "User requested cancellation" })
+  cancellationReason?: string;
 }
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/booker-active-booking-limit.input.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/booker-active-booking-limit.input.ts
new file mode 100644
index 00000000000000..e2e7f9cda1ba15
--- /dev/null
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/booker-active-booking-limit.input.ts
@@ -0,0 +1,25 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsBoolean, IsInt, IsOptional, Min } from "class-validator";
+
+export class BookerActiveBookingsLimit_2024_06_14 {
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+  @ApiPropertyOptional({
+    description: "The maximum number of active bookings a booker can have for this event type.",
+    example: 3,
+  })
+  maximumActiveBookings?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({
+    description:
+      "Whether to offer rescheduling the last active booking to the chosen time slot when limit is reached.",
+  })
+  offerReschedule?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  disabled?: boolean = false;
+}
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/create-event-type.input.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/create-event-type.input.ts
index e81eb1c9487ad6..63ed7969ba81b3 100644
--- a/packages/platform/types/event-types/event-types_2024_06_14/inputs/create-event-type.input.ts
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/create-event-type.input.ts
@@ -19,9 +19,10 @@ import {
   ArrayUnique,
 } from "class-validator";
 
-
 import { SchedulingType } from "@calcom/platform-enums";
 
+import { RequiresAtLeastOnePropertyWhenNotDisabled } from "../../../utils/RequiresOneOfPropertiesWhenNotDisabled";
+import { BookerActiveBookingsLimit_2024_06_14 } from "./booker-active-booking-limit.input";
 import { BookerLayouts_2024_06_14 } from "./booker-layouts.input";
 import {
   AddressFieldInput_2024_06_14,
@@ -64,6 +65,7 @@ import type { ConfirmationPolicy_2024_06_14 } from "./confirmation-policy.input"
 import { BaseConfirmationPolicy_2024_06_14, ValidateConfirmationPolicy } from "./confirmation-policy.input";
 import { DestinationCalendar_2024_06_14 } from "./destination-calendar.input";
 import { Disabled_2024_06_14 } from "./disabled.input";
+import { EmailSettings_2024_06_14 } from "./email-settings.input";
 import { EventTypeColor_2024_06_14 } from "./event-type-color.input";
 import {
   InputAddressLocation_2024_06_14,
@@ -80,6 +82,7 @@ import {
 import type { InputLocation_2024_06_14, InputTeamLocation_2024_06_14 } from "./locations.input";
 import { Recurrence_2024_06_14 } from "./recurrence.input";
 import { Seats_2024_06_14 } from "./seats.input";
+import { CantHaveRecurrenceAndBookerActiveBookingsLimit } from "./validators/CantHaveRecurrenceAndBookerActiveBookingsLimit";
 
 export const CREATE_EVENT_LENGTH_EXAMPLE = 60;
 export const CREATE_EVENT_TITLE_EXAMPLE = "Learn the secrets of masterchief!";
@@ -108,6 +111,7 @@ export const CREATE_EVENT_SLUG_EXAMPLE = "learn-the-secrets-of-masterchief";
   CalendarDaysWindow_2024_06_14,
   RangeWindow_2024_06_14,
   BaseBookingLimitsCount_2024_06_14,
+  BookerActiveBookingsLimit_2024_06_14,
   Disabled_2024_06_14,
   BaseBookingLimitsDuration_2024_06_14,
   Recurrence_2024_06_14,
@@ -123,7 +127,8 @@ export const CREATE_EVENT_SLUG_EXAMPLE = "learn-the-secrets-of-masterchief";
   NotesDefaultFieldInput_2024_06_14,
   GuestsDefaultFieldInput_2024_06_14,
   RescheduleReasonDefaultFieldInput_2024_06_14,
-  InputOrganizersDefaultApp_2024_06_14
+  InputOrganizersDefaultApp_2024_06_14,
+  EmailSettings_2024_06_14
 )
 export class CalVideoSettings {
   @IsOptional()
@@ -176,7 +181,8 @@ export class CalVideoSettings {
   disableTranscriptionForOrganizer?: boolean;
 }
 
-class BaseCreateEventTypeInput {
+@CantHaveRecurrenceAndBookerActiveBookingsLimit()
+export class BaseCreateEventTypeInput {
   @IsInt()
   @Min(1)
   @DocsProperty({ example: CREATE_EVENT_LENGTH_EXAMPLE })
@@ -297,6 +303,29 @@ class BaseCreateEventTypeInput {
   @Type(() => Object)
   bookingLimitsCount?: BookingLimitsCount_2024_06_14;
 
+  @IsOptional()
+  @RequiresAtLeastOnePropertyWhenNotDisabled()
+  @Transform(({ value }) => {
+    if (value && typeof value === "object") {
+      if ("disabled" in value && value.disabled) {
+        return Object.assign(new Disabled_2024_06_14(), value);
+      } else {
+        return Object.assign(new BookerActiveBookingsLimit_2024_06_14(), value);
+      }
+    }
+    return value;
+  })
+  @ValidateNested()
+  @DocsPropertyOptional({
+    description: "Limit the number of active bookings a booker can make for this event type.",
+    oneOf: [
+      { $ref: getSchemaPath(BookerActiveBookingsLimit_2024_06_14) },
+      { $ref: getSchemaPath(Disabled_2024_06_14) },
+    ],
+  })
+  @Type(() => Object)
+  bookerActiveBookingsLimit?: BookerActiveBookingsLimit_2024_06_14 | Disabled_2024_06_14;
+
   @IsOptional()
   @IsBoolean()
   @DocsPropertyOptional({
@@ -568,7 +597,8 @@ export class CreateTeamEventTypeInput_2024_06_14 extends BaseCreateEventTypeInpu
   @IsBoolean()
   @IsOptional()
   @DocsPropertyOptional({
-    description: "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both",
+    description:
+      "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both",
   })
   assignAllTeamMembers?: boolean;
 
@@ -591,4 +621,20 @@ export class CreateTeamEventTypeInput_2024_06_14 extends BaseCreateEventTypeInpu
   })
   @Type(() => Object)
   locations?: InputTeamLocation_2024_06_14[];
+
+  @IsOptional()
+  @ValidateNested()
+  @DocsPropertyOptional({
+    description: "Email settings for this event type - only available for organization team event types.",
+    type: () => EmailSettings_2024_06_14,
+  })
+  @Type(() => EmailSettings_2024_06_14)
+  emailSettings?: EmailSettings_2024_06_14;
+
+  @IsBoolean()
+  @IsOptional()
+  @DocsPropertyOptional({
+    description: "Rescheduled events will be assigned to the same host as initially scheduled.",
+  })
+  rescheduleWithSameRoundRobinHost?: boolean;
 }
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/email-settings.input.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/email-settings.input.ts
new file mode 100644
index 00000000000000..f9af0587f72054
--- /dev/null
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/email-settings.input.ts
@@ -0,0 +1,20 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsBoolean, IsOptional } from "class-validator";
+
+export class EmailSettings_2024_06_14 {
+  @IsBoolean()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description:
+      "Disables all email communication to attendees for this event type, including booking confirmations, reminders, and cancellations. This DOES NOT include emails sent by custom email workflows.",
+  })
+  disableEmailsToAttendees?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description:
+      "Disables all email communication to hosts for this event type, including booking confirmations, reminders, and cancellations. This DOES NOT include emails sent by custom email workflows.",
+  })
+  disableEmailsToHosts?: boolean;
+}
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/index.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/index.ts
index 4461d87e0b99f0..9f87d63fb7d95c 100644
--- a/packages/platform/types/event-types/event-types_2024_06_14/inputs/index.ts
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/index.ts
@@ -9,6 +9,7 @@ export * from "./update-event-type.input";
 export * from "./get-event-types-query.input";
 export * from "./booker-layouts.input";
 export * from "./confirmation-policy.input";
+export * from "./email-settings.input";
 export * from "./event-type-color.input";
 export * from "./seats.input";
 export * from "./destination-calendar.input";
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/update-event-type.input.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/update-event-type.input.ts
index 8f69ea17178b05..7ac16974780bfa 100644
--- a/packages/platform/types/event-types/event-types_2024_06_14/inputs/update-event-type.input.ts
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/update-event-type.input.ts
@@ -1,9 +1,4 @@
-import {
-  ApiProperty as DocsProperty,
-  ApiPropertyOptional as DocsPropertyOptional,
-  getSchemaPath,
-  ApiExtraModels,
-} from "@nestjs/swagger";
+import { ApiPropertyOptional as DocsPropertyOptional, getSchemaPath, ApiExtraModels } from "@nestjs/swagger";
 import { Type, Transform } from "class-transformer";
 import {
   IsString,
@@ -18,6 +13,8 @@ import {
   IsUrl,
 } from "class-validator";
 
+import { RequiresAtLeastOnePropertyWhenNotDisabled } from "../../../utils/RequiresOneOfPropertiesWhenNotDisabled";
+import { BookerActiveBookingsLimit_2024_06_14 } from "./booker-active-booking-limit.input";
 import { BookerLayouts_2024_06_14 } from "./booker-layouts.input";
 import type { InputBookingField_2024_06_14 } from "./booking-fields.input";
 import {
@@ -67,6 +64,7 @@ import {
 } from "./create-event-type.input";
 import { DestinationCalendar_2024_06_14 } from "./destination-calendar.input";
 import { Disabled_2024_06_14 } from "./disabled.input";
+import { EmailSettings_2024_06_14 } from "./email-settings.input";
 import { EventTypeColor_2024_06_14 } from "./event-type-color.input";
 import {
   InputAddressLocation_2024_06_14,
@@ -83,6 +81,7 @@ import {
 import type { InputLocation_2024_06_14, InputTeamLocation_2024_06_14 } from "./locations.input";
 import { Recurrence_2024_06_14 } from "./recurrence.input";
 import { Seats_2024_06_14 } from "./seats.input";
+import { CantHaveRecurrenceAndBookerActiveBookingsLimit } from "./validators/CantHaveRecurrenceAndBookerActiveBookingsLimit";
 
 @ApiExtraModels(
   InputAddressLocation_2024_06_14,
@@ -118,8 +117,11 @@ import { Seats_2024_06_14 } from "./seats.input";
   LocationDefaultFieldInput_2024_06_14,
   NotesDefaultFieldInput_2024_06_14,
   GuestsDefaultFieldInput_2024_06_14,
-  RescheduleReasonDefaultFieldInput_2024_06_14
+  RescheduleReasonDefaultFieldInput_2024_06_14,
+  BookerActiveBookingsLimit_2024_06_14,
+  EmailSettings_2024_06_14
 )
+@CantHaveRecurrenceAndBookerActiveBookingsLimit()
 class BaseUpdateEventTypeInput {
   @IsOptional()
   @IsInt()
@@ -243,6 +245,29 @@ class BaseUpdateEventTypeInput {
   @Type(() => Object)
   bookingLimitsCount?: BookingLimitsCount_2024_06_14;
 
+  @IsOptional()
+  @Transform(({ value }) => {
+    if (value && typeof value === "object") {
+      if ("disabled" in value && value.disabled) {
+        return Object.assign(new Disabled_2024_06_14(), value);
+      } else {
+        return Object.assign(new BookerActiveBookingsLimit_2024_06_14(), value);
+      }
+    }
+    return value;
+  })
+  @ValidateNested()
+  @RequiresAtLeastOnePropertyWhenNotDisabled()
+  @DocsPropertyOptional({
+    description: "Limit the number of active bookings a booker can make for this event type.",
+    oneOf: [
+      { $ref: getSchemaPath(BookerActiveBookingsLimit_2024_06_14) },
+      { $ref: getSchemaPath(Disabled_2024_06_14) },
+    ],
+  })
+  @Type(() => Object)
+  bookerActiveBookingsLimit?: BookerActiveBookingsLimit_2024_06_14 | Disabled_2024_06_14;
+
   @IsOptional()
   @IsBoolean()
   @DocsPropertyOptional({
@@ -455,16 +480,18 @@ export class UpdateTeamEventTypeInput_2024_06_14 extends BaseUpdateEventTypeInpu
   @Type(() => Host)
   @IsArray()
   @IsOptional()
-  @DocsPropertyOptional({ type: [Host],
+  @DocsPropertyOptional({
+    type: [Host],
     description:
       "Hosts contain specific team members you want to assign to this event type, but if you want to assign all team members, use `assignAllTeamMembers: true` instead and omit this field. For platform customers the hosts can include userIds only of managed users. Provide either hosts or assignAllTeamMembers but not both",
-   })
+  })
   hosts?: Host[];
 
   @IsOptional()
   @IsBoolean()
   @DocsPropertyOptional({
-    description: "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both",
+    description:
+      "If true, all current and future team members will be assigned to this event type. Provide either assignAllTeamMembers or hosts but not both",
   })
   assignAllTeamMembers?: boolean;
 
@@ -487,4 +514,20 @@ export class UpdateTeamEventTypeInput_2024_06_14 extends BaseUpdateEventTypeInpu
   })
   @Type(() => Object)
   locations?: InputTeamLocation_2024_06_14[];
+
+  @IsOptional()
+  @ValidateNested()
+  @DocsPropertyOptional({
+    description: "Email settings for this event type. Only available for organization team event types.",
+    type: () => EmailSettings_2024_06_14,
+  })
+  @Type(() => EmailSettings_2024_06_14)
+  emailSettings?: EmailSettings_2024_06_14;
+
+  @IsBoolean()
+  @IsOptional()
+  @DocsPropertyOptional({
+    description: "Rescheduled events will be assigned to the same host as initially scheduled.",
+  })
+  rescheduleWithSameRoundRobinHost?: boolean;
 }
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit.ts b/packages/platform/types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit.ts
new file mode 100644
index 00000000000000..7d3e8e1ab6e7d3
--- /dev/null
+++ b/packages/platform/types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit.ts
@@ -0,0 +1,40 @@
+import { BadRequestException } from "@nestjs/common";
+import { ValidationOptions, registerDecorator, ValidationArguments } from "class-validator";
+
+import type { BaseCreateEventTypeInput } from "../create-event-type.input";
+
+export const FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE =
+  "Can't have `recurrence` and `bookerActiveBookingsLimit` enabled at the same time - recurring events do not support maximum active bookings limit setting.";
+
+export function CantHaveRecurrenceAndBookerActiveBookingsLimit(validationOptions?: ValidationOptions) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return function (object: any) {
+    registerDecorator({
+      name: "cantHaveRecurrenceAndBookerActiveBookingsLimit",
+      target: object,
+      propertyName: "recurrence or bookerActiveBookingsLimit",
+      options: validationOptions,
+      constraints: [],
+      validator: {
+        validate(_: unknown, args: ValidationArguments) {
+          const obj = args.object as BaseCreateEventTypeInput;
+
+          const hasActiveRecurrence = obj?.recurrence && "interval" in obj.recurrence;
+
+          const hasActiveBookerLimit =
+            obj?.bookerActiveBookingsLimit &&
+            ("maximumActiveBookings" in obj.bookerActiveBookingsLimit ||
+              "offerReschedule" in obj.bookerActiveBookingsLimit);
+
+          if (hasActiveRecurrence && hasActiveBookerLimit) {
+            throw new BadRequestException(FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE);
+          }
+          return true;
+        },
+        defaultMessage(): string {
+          return FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE;
+        },
+      },
+    });
+  };
+}
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/outputs/booker-active-bookings-limit.output.ts b/packages/platform/types/event-types/event-types_2024_06_14/outputs/booker-active-bookings-limit.output.ts
new file mode 100644
index 00000000000000..2b13a7959e3c29
--- /dev/null
+++ b/packages/platform/types/event-types/event-types_2024_06_14/outputs/booker-active-bookings-limit.output.ts
@@ -0,0 +1,21 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsBoolean, IsInt, IsOptional, Min } from "class-validator";
+
+export class BookerActiveBookingsLimitOutput_2024_06_14 {
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+  @ApiPropertyOptional({
+    description: "The maximum number of active bookings a booker can have for this event type.",
+    example: 3,
+  })
+  maximumActiveBookings?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional({
+    description:
+      "Whether to offer rescheduling the last active booking to the chosen time slot when limit is reached.",
+  })
+  offerReschedule?: boolean;
+}
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts b/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts
index 4610cb29597982..240a60f97a57d9 100644
--- a/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts
+++ b/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts
@@ -35,6 +35,7 @@ import type { BookingLimitsCount_2024_06_14 } from "../inputs/booking-limits-cou
 import type { ConfirmationPolicy_2024_06_14 } from "../inputs/confirmation-policy.input";
 import { DestinationCalendar_2024_06_14 } from "../inputs/destination-calendar.input";
 import type { Disabled_2024_06_14 } from "../inputs/disabled.input";
+import { EmailSettings_2024_06_14 } from "../inputs/email-settings.input";
 import {
   EmailDefaultFieldOutput_2024_06_14,
   NameDefaultFieldOutput_2024_06_14,
@@ -56,6 +57,7 @@ import {
   TextFieldOutput_2024_06_14,
   UrlFieldOutput_2024_06_14,
 } from "../outputs/booking-fields.output";
+import { BookerActiveBookingsLimitOutput_2024_06_14 } from "./booker-active-bookings-limit.output";
 import type { OutputBookingField_2024_06_14 } from "./booking-fields.output";
 import { ValidateOutputBookingFields_2024_06_14 } from "./booking-fields.output";
 import type { OutputLocation_2024_06_14 } from "./locations.output";
@@ -178,7 +180,8 @@ class EventTypeTeam {
   BaseBookingLimitsDuration_2024_06_14,
   BusinessDaysWindow_2024_06_14,
   CalendarDaysWindow_2024_06_14,
-  RangeWindow_2024_06_14
+  RangeWindow_2024_06_14,
+  EmailSettings_2024_06_14
 )
 class BaseEventTypeOutput_2024_06_14 {
   @IsInt()
@@ -346,6 +349,11 @@ class BaseEventTypeOutput_2024_06_14 {
   @ApiPropertyOptional()
   bookingLimitsCount?: BookingLimitsCount_2024_06_14;
 
+  @IsOptional()
+  @Type(() => BookerActiveBookingsLimitOutput_2024_06_14)
+  @ApiPropertyOptional({ type: BookerActiveBookingsLimitOutput_2024_06_14 })
+  bookerActiveBookingsLimit?: BookerActiveBookingsLimitOutput_2024_06_14;
+
   @IsOptional()
   @IsBoolean()
   @ApiPropertyOptional()
@@ -526,4 +534,20 @@ export class TeamEventTypeOutput_2024_06_14 extends BaseEventTypeOutput_2024_06_
   @Type(() => EventTypeTeam)
   @DocsProperty()
   team!: EventTypeTeam;
+
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => EmailSettings_2024_06_14)
+  @ApiPropertyOptional({
+    description: "Email settings for this event type. Only available for organization team event types.",
+    type: () => EmailSettings_2024_06_14,
+  })
+  emailSettings?: EmailSettings_2024_06_14;
+
+  @IsBoolean()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "Rescheduled events will be assigned to the same host as initially scheduled.",
+  })
+  rescheduleWithSameRoundRobinHost?: boolean;
 }
diff --git a/packages/platform/types/utils/RequiresOneOfPropertiesWhenNotDisabled.ts b/packages/platform/types/utils/RequiresOneOfPropertiesWhenNotDisabled.ts
new file mode 100644
index 00000000000000..12645f5bdda0fe
--- /dev/null
+++ b/packages/platform/types/utils/RequiresOneOfPropertiesWhenNotDisabled.ts
@@ -0,0 +1,49 @@
+import { BadRequestException } from "@nestjs/common";
+import { ValidationOptions, registerDecorator } from "class-validator";
+
+/**
+ * note(Lauris): See example in event-types_2024_06_14/inputs/create-event-type.input.ts file bookerActiveBookingsLimit property.
+ * This validator is used if type can be SomeClass | Disabled_2024_06_14 to ensure that if {disabled: false} is passed
+ * meaning that the feature is enabled that other properties are provided too.
+ */
+
+export const REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR =
+  "When disabled is false {disabled: false} at least one other property must be provided, because it means that the property is enabled but then other properties must be provided too.";
+
+export function RequiresAtLeastOnePropertyWhenNotDisabled(validationOptions?: ValidationOptions) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return function (object: any, propertyName: string) {
+    registerDecorator({
+      name: "requiresAtLeastOnePropertyWhenNotDisabled",
+      target: object.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      constraints: [],
+      validator: {
+        validate(value: unknown) {
+          if (!value || typeof value !== "object") {
+            return true;
+          }
+
+          const obj = value as Record<string, unknown>;
+
+          if (obj.disabled !== false) {
+            return true;
+          }
+
+          const otherProperties = Object.keys(obj).filter((key) => key !== "disabled");
+          const hasAtLeastOneOtherProperty = otherProperties.length > 0;
+
+          if (!hasAtLeastOneOtherProperty) {
+            throw new BadRequestException(REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR);
+          }
+
+          return true;
+        },
+        defaultMessage(): string {
+          return REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR;
+        },
+      },
+    });
+  };
+}
diff --git a/packages/prisma/migrations/20250909093954_add_form_submitted_workflow_trigger/migration.sql b/packages/prisma/migrations/20250909093954_add_form_submitted_workflow_trigger/migration.sql
new file mode 100644
index 00000000000000..9a16ddd94ba761
--- /dev/null
+++ b/packages/prisma/migrations/20250909093954_add_form_submitted_workflow_trigger/migration.sql
@@ -0,0 +1,26 @@
+-- AlterEnum
+ALTER TYPE "WorkflowTriggerEvents" ADD VALUE 'FORM_SUBMITTED';
+
+-- CreateTable
+CREATE TABLE "WorkflowsOnRoutingForms" (
+    "id" SERIAL NOT NULL,
+    "workflowId" INTEGER NOT NULL,
+    "routingFormId" TEXT NOT NULL,
+
+    CONSTRAINT "WorkflowsOnRoutingForms_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "WorkflowsOnRoutingForms_workflowId_idx" ON "WorkflowsOnRoutingForms"("workflowId");
+
+-- CreateIndex
+CREATE INDEX "WorkflowsOnRoutingForms_routingFormId_idx" ON "WorkflowsOnRoutingForms"("routingFormId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "WorkflowsOnRoutingForms_workflowId_routingFormId_key" ON "WorkflowsOnRoutingForms"("workflowId", "routingFormId");
+
+-- AddForeignKey
+ALTER TABLE "WorkflowsOnRoutingForms" ADD CONSTRAINT "WorkflowsOnRoutingForms_workflowId_fkey" FOREIGN KEY ("workflowId") REFERENCES "Workflow"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "WorkflowsOnRoutingForms" ADD CONSTRAINT "WorkflowsOnRoutingForms_routingFormId_fkey" FOREIGN KEY ("routingFormId") REFERENCES "App_RoutingForms_Form"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/migrations/20250909134440_add_form_submitted_no_event/migration.sql b/packages/prisma/migrations/20250909134440_add_form_submitted_no_event/migration.sql
new file mode 100644
index 00000000000000..856ed82222668c
--- /dev/null
+++ b/packages/prisma/migrations/20250909134440_add_form_submitted_no_event/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "WorkflowTriggerEvents" ADD VALUE 'FORM_SUBMITTED_NO_EVENT';
diff --git a/packages/prisma/migrations/20250930135416_add_type_to_workflow/migration.sql b/packages/prisma/migrations/20250930135416_add_type_to_workflow/migration.sql
new file mode 100644
index 00000000000000..b74c56ebd8ee54
--- /dev/null
+++ b/packages/prisma/migrations/20250930135416_add_type_to_workflow/migration.sql
@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "WorkflowType" AS ENUM ('EVENT_TYPE', 'ROUTING_FORM');
+
+-- AlterTable
+ALTER TABLE "Workflow" ADD COLUMN     "type" "WorkflowType" NOT NULL DEFAULT 'EVENT_TYPE';
diff --git a/packages/prisma/migrations/20251005102651_add_onboarding_v3_feature_flag/migration.sql b/packages/prisma/migrations/20251005102651_add_onboarding_v3_feature_flag/migration.sql
new file mode 100644
index 00000000000000..6aff33cc8fe829
--- /dev/null
+++ b/packages/prisma/migrations/20251005102651_add_onboarding_v3_feature_flag/migration.sql
@@ -0,0 +1,9 @@
+INSERT INTO
+  "Feature" (slug, enabled, description, "type")
+VALUES
+  (
+    'onboarding-v3',
+    false,
+    'Enable onboarding v3 for all users',
+    'EXPERIMENT'
+  ) ON CONFLICT (slug) DO NOTHING;
diff --git a/packages/prisma/migrations/20251006111422_add_requires_booker_email_verification/migration.sql b/packages/prisma/migrations/20251006111422_add_requires_booker_email_verification/migration.sql
new file mode 100644
index 00000000000000..cb8c6e6453923b
--- /dev/null
+++ b/packages/prisma/migrations/20251006111422_add_requires_booker_email_verification/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "users" ADD COLUMN     "requiresBookerEmailVerification" BOOLEAN DEFAULT false;
diff --git a/packages/prisma/migrations/20251007090722_modify_onboarding_table_orgs/migration.sql b/packages/prisma/migrations/20251007090722_modify_onboarding_table_orgs/migration.sql
new file mode 100644
index 00000000000000..a48fbd08f9180d
--- /dev/null
+++ b/packages/prisma/migrations/20251007090722_modify_onboarding_table_orgs/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "OrganizationOnboarding" ADD COLUMN     "bannerUrl" TEXT,
+ADD COLUMN     "brandColor" TEXT;
diff --git a/packages/prisma/migrations/20251010135752_billing_tables_add_dates/migration.sql b/packages/prisma/migrations/20251010135752_billing_tables_add_dates/migration.sql
new file mode 100644
index 00000000000000..6385050c503c97
--- /dev/null
+++ b/packages/prisma/migrations/20251010135752_billing_tables_add_dates/migration.sql
@@ -0,0 +1,9 @@
+-- AlterTable
+ALTER TABLE "OrganizationBilling" ADD COLUMN     "subscriptionEnd" TIMESTAMP(3),
+ADD COLUMN     "subscriptionStart" TIMESTAMP(3),
+ADD COLUMN     "subscriptionTrialEnd" TIMESTAMP(3);
+
+-- AlterTable
+ALTER TABLE "TeamBilling" ADD COLUMN     "subscriptionEnd" TIMESTAMP(3),
+ADD COLUMN     "subscriptionStart" TIMESTAMP(3),
+ADD COLUMN     "subscriptionTrialEnd" TIMESTAMP(3);
diff --git a/packages/prisma/migrations/20251013185902_add_booking_report/migration.sql b/packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
new file mode 100644
index 00000000000000..32635dfd1c2ede
--- /dev/null
+++ b/packages/prisma/migrations/20251013185902_add_booking_report/migration.sql
@@ -0,0 +1,49 @@
+-- CreateEnum
+CREATE TYPE "BookingReportReason" AS ENUM ('SPAM', 'dont_know_person', 'OTHER');
+
+-- CreateTable
+CREATE TABLE "BookingReport" (
+    "id" UUID NOT NULL,
+    "bookingUid" TEXT NOT NULL,
+    "bookerEmail" TEXT NOT NULL,
+    "reportedById" INTEGER,
+    "organizationId" INTEGER,
+    "reason" "BookingReportReason" NOT NULL,
+    "description" TEXT,
+    "cancelled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "watchlistId" UUID,
+
+    CONSTRAINT "BookingReport_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "BookingReport_bookingUid_key" ON "BookingReport"("bookingUid");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_bookerEmail_idx" ON "BookingReport"("bookerEmail");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_reportedById_idx" ON "BookingReport"("reportedById");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_organizationId_idx" ON "BookingReport"("organizationId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_watchlistId_idx" ON "BookingReport"("watchlistId");
+
+-- CreateIndex
+CREATE INDEX "BookingReport_createdAt_idx" ON "BookingReport"("createdAt");
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_bookingUid_fkey" FOREIGN KEY ("bookingUid") REFERENCES "Booking"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_reportedById_fkey" FOREIGN KEY ("reportedById") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "BookingReport" ADD CONSTRAINT "BookingReport_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql b/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
new file mode 100644
index 00000000000000..ee2940b61fb787
--- /dev/null
+++ b/packages/prisma/migrations/20251014143620_add_watchlist_audit_relation/migration.sql
@@ -0,0 +1,2 @@
+-- AddForeignKey
+ALTER TABLE "WatchlistAudit" ADD CONSTRAINT "WatchlistAudit_watchlistId_fkey" FOREIGN KEY ("watchlistId") REFERENCES "Watchlist"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/migrations/20251015211003000_add_watchlist_admin_permissions/migration.sql b/packages/prisma/migrations/20251015211003000_add_watchlist_admin_permissions/migration.sql
new file mode 100644
index 00000000000000..741ead14de34b2
--- /dev/null
+++ b/packages/prisma/migrations/20251015211003000_add_watchlist_admin_permissions/migration.sql
@@ -0,0 +1,14 @@
+INSERT INTO "RolePermission" (id, "roleId", resource, action, "createdAt")
+SELECT
+  gen_random_uuid(),
+  'admin_role',
+  resource,
+  action,
+  NOW()
+FROM (
+  VALUES
+    ('watchlist', 'create'),
+    ('watchlist', 'read'),
+    ('watchlist', 'update'),
+    ('watchlist', 'delete')
+) AS permissions (resource, action);
diff --git a/packages/prisma/migrations/20251017161715_cleanup_future_events/migration.sql b/packages/prisma/migrations/20251017161715_cleanup_future_events/migration.sql
new file mode 100644
index 00000000000000..2f5944a7054815
--- /dev/null
+++ b/packages/prisma/migrations/20251017161715_cleanup_future_events/migration.sql
@@ -0,0 +1,4 @@
+-- Deletes the future (years ahead) events generated by Google Calendar recurring events
+DELETE
+  FROM "CalendarCacheEvent"
+ WHERE start > NOW() + interval '3 months';
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 8f694e2e505313..0b2d04e7e598f6 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -247,7 +247,6 @@ model EventType {
   createdAt DateTime? @default(now())
   updatedAt DateTime? @updatedAt
 
-
   @@unique([userId, slug])
   @@unique([teamId, slug])
   @@unique([userId, parentId])
@@ -403,7 +402,9 @@ model User {
   allowSEOIndexing Boolean? @default(true)
 
   // receive monthly digest email for teams or not
-  receiveMonthlyDigestEmail Boolean? @default(true)
+  receiveMonthlyDigestEmail       Boolean? @default(true)
+  // require email verification when someone books using your email
+  requiresBookerEmailVerification Boolean? @default(false)
 
   /// @zod.import(["import { userMetadata } from '../../zod-utils'"]).custom.use(userMetadata)
   metadata             Json?
@@ -452,6 +453,7 @@ model User {
   updatedAttributeToUsers        AttributeToUser[]             @relation("updatedBy")
   createdTranslations            EventTypeTranslation[]        @relation("CreatedEventTypeTranslations")
   updatedTranslations            EventTypeTranslation[]        @relation("UpdatedEventTypeTranslations")
+  reportedBookings               BookingReport[]               @relation("ReportedBy")
   BookingInternalNote            BookingInternalNote[]
   creationSource                 CreationSource?
   createdOrganizationOnboardings OrganizationOnboarding[]      @relation("CreatedOrganizationOnboardings")
@@ -573,6 +575,7 @@ model Team {
   roles                  Role[] // Added for Role relation
   calAiPhoneNumbers      CalAiPhoneNumber[]
   agents                 Agent[]
+  bookingReports         BookingReport[]
 
   features TeamFeatures[]
 
@@ -849,6 +852,7 @@ model Booking {
   tracking                     Tracking?
   routingFormResponses         RoutingFormResponseDenormalized[]
   expenseLogs                  CreditExpenseLog[]
+  report                       BookingReport?
 
   @@index([eventTypeId])
   @@index([userId])
@@ -1243,6 +1247,7 @@ model App_RoutingForms_Form {
   /// @zod.import(["import { RoutingFormSettings } from '../../zod-utils'"]).custom.use(RoutingFormSettings)
   settings                 Json?
   incompleteBookingActions App_RoutingForms_IncompleteBookingActions[]
+  workflows                WorkflowsOnRoutingForms[]
 
   @@index([userId])
   @@index([disabled])
@@ -1390,6 +1395,8 @@ enum WorkflowTriggerEvents {
   RESCHEDULE_EVENT
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW
+  FORM_SUBMITTED
+  FORM_SUBMITTED_NO_EVENT
   BOOKING_REJECTED
   BOOKING_REQUESTED
   BOOKING_PAYMENT_INITIATED
@@ -1408,6 +1415,11 @@ enum WorkflowActions {
   CAL_AI_PHONE_CALL
 }
 
+enum WorkflowType {
+  EVENT_TYPE
+  ROUTING_FORM
+}
+
 model WorkflowStep {
   id                        Int                @id @default(autoincrement())
   stepNumber                Int
@@ -1427,27 +1439,29 @@ model WorkflowStep {
   agentId                   String?            @unique
   agent                     Agent?             @relation(fields: [agentId], references: [id], onDelete: SetNull)
 
-  inboundAgentId            String?            @unique
-  inboundAgent              Agent?             @relation("WorkflowStepInboundAgent", fields: [inboundAgentId], references: [id], onDelete: SetNull)
+  inboundAgentId String? @unique
+  inboundAgent   Agent?  @relation("WorkflowStepInboundAgent", fields: [inboundAgentId], references: [id], onDelete: SetNull)
 
   @@index([workflowId])
 }
 
 model Workflow {
-  id            Int                     @id @default(autoincrement())
-  position      Int                     @default(0)
-  name          String
-  userId        Int?
-  user          User?                   @relation(fields: [userId], references: [id], onDelete: Cascade)
-  team          Team?                   @relation(fields: [teamId], references: [id], onDelete: Cascade)
-  teamId        Int?
-  activeOn      WorkflowsOnEventTypes[]
-  activeOnTeams WorkflowsOnTeams[]
-  isActiveOnAll Boolean                 @default(false)
-  trigger       WorkflowTriggerEvents
-  time          Int?
-  timeUnit      TimeUnit?
-  steps         WorkflowStep[]
+  id                   Int                       @id @default(autoincrement())
+  position             Int                       @default(0)
+  name                 String
+  userId               Int?
+  user                 User?                     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  team                 Team?                     @relation(fields: [teamId], references: [id], onDelete: Cascade)
+  teamId               Int?
+  activeOn             WorkflowsOnEventTypes[]
+  activeOnTeams        WorkflowsOnTeams[]
+  activeOnRoutingForms WorkflowsOnRoutingForms[]
+  isActiveOnAll        Boolean                   @default(false)
+  trigger              WorkflowTriggerEvents
+  time                 Int?
+  timeUnit             TimeUnit?
+  steps                WorkflowStep[]
+  type                 WorkflowType              @default(EVENT_TYPE)
 
   @@index([userId])
   @@index([teamId])
@@ -1485,6 +1499,18 @@ model WorkflowsOnEventTypes {
   @@index([eventTypeId])
 }
 
+model WorkflowsOnRoutingForms {
+  id            Int                   @id @default(autoincrement())
+  workflow      Workflow              @relation(fields: [workflowId], references: [id], onDelete: Cascade)
+  workflowId    Int
+  routingForm   App_RoutingForms_Form @relation(fields: [routingFormId], references: [id], onDelete: Cascade)
+  routingFormId String
+
+  @@unique([workflowId, routingFormId])
+  @@index([workflowId])
+  @@index([routingFormId])
+}
+
 model WorkflowsOnTeams {
   id         Int      @id @default(autoincrement())
   workflow   Workflow @relation(fields: [workflowId], references: [id], onDelete: Cascade)
@@ -2296,6 +2322,9 @@ model Watchlist {
   source         WatchlistSource @default(MANUAL)
   lastUpdatedAt  DateTime        @default(now())
 
+  bookingReports BookingReport[]
+  audits         WatchlistAudit[]
+
   @@unique([type, value, organizationId])
   @@index([type, value, organizationId, action])
 }
@@ -2311,7 +2340,8 @@ model WatchlistAudit {
   changedAt       DateTime @default(now())
   changedByUserId Int?
 
-  watchlistId String @db.Uuid
+  watchlistId String     @db.Uuid
+  watchlist   Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: Cascade)
 
   @@index([watchlistId, changedAt])
 }
@@ -2324,6 +2354,38 @@ model WatchlistEventAudit {
   timestamp   DateTime        @default(now())
 }
 
+enum BookingReportReason {
+  SPAM
+  DONT_KNOW_PERSON @map("dont_know_person")
+  OTHER
+}
+
+model BookingReport {
+  id             String              @id @default(uuid()) @db.Uuid
+  bookingUid     String              @unique
+  booking        Booking             @relation(fields: [bookingUid], references: [uid], onDelete: Cascade)
+  bookerEmail    String
+  reportedById   Int?
+  organizationId Int?
+  reason         BookingReportReason
+  description    String?
+  cancelled      Boolean             @default(false)
+  createdAt      DateTime            @default(now())
+  updatedAt      DateTime            @updatedAt
+
+  watchlistId String? @db.Uuid
+
+  reportedBy   User?      @relation("ReportedBy", fields: [reportedById], references: [id], onDelete: SetNull)
+  organization Team?      @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  watchlist    Watchlist? @relation(fields: [watchlistId], references: [id], onDelete: SetNull)
+
+  @@index([bookerEmail])
+  @@index([reportedById])
+  @@index([organizationId])
+  @@index([watchlistId])
+  @@index([createdAt])
+}
+
 enum BillingPeriod {
   MONTHLY
   ANNUALLY
@@ -2362,6 +2424,8 @@ model OrganizationOnboarding {
   slug               String
   logo               String?
   bio                String?
+  brandColor         String?
+  bannerUrl          String?
   isDomainConfigured Boolean @default(false)
 
   // Set when payment intent is there.
@@ -2542,7 +2606,6 @@ enum PhoneNumberSubscriptionStatus {
   UNPAID
 }
 
-
 // Cal AI Voice Agent
 model Agent {
   id   String @id @default(uuid())
@@ -2567,7 +2630,7 @@ model Agent {
   inboundPhoneNumbers  CalAiPhoneNumber[] @relation("InboundAgent")
   outboundPhoneNumbers CalAiPhoneNumber[] @relation("OutboundAgent")
   workflowStep         WorkflowStep?
-  inboundWorkflowStep  WorkflowStep?     @relation("WorkflowStepInboundAgent")
+  inboundWorkflowStep  WorkflowStep?      @relation("WorkflowStepInboundAgent")
 
   @@index([userId])
   @@index([teamId])
@@ -2613,11 +2676,14 @@ model TeamBilling {
   teamId Int    @unique
   team   Team?  @relation("TeamBilling", fields: [teamId], references: [id], onDelete: Cascade)
 
-  subscriptionId     String @unique
-  subscriptionItemId String
-  customerId         String
-  status             String
-  planName           String
+  subscriptionId       String    @unique
+  subscriptionItemId   String
+  customerId           String
+  status               String
+  planName             String
+  subscriptionStart    DateTime?
+  subscriptionTrialEnd DateTime?
+  subscriptionEnd      DateTime?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -2628,11 +2694,14 @@ model OrganizationBilling {
   teamId Int    @unique
   team   Team   @relation("OrganizationBilling", fields: [teamId], references: [id], onDelete: Cascade)
 
-  subscriptionId     String @unique
-  subscriptionItemId String
-  customerId         String
-  status             String
-  planName           String
+  subscriptionId       String    @unique
+  subscriptionItemId   String
+  customerId           String
+  status               String
+  planName             String
+  subscriptionStart    DateTime?
+  subscriptionTrialEnd DateTime?
+  subscriptionEnd      DateTime?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index ea992435034080..ad0ee178c9bf76 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -58,7 +58,13 @@ export const bookerLayouts = z
   .nullable();
 
 export const orgOnboardingInvitedMembersSchema = z.array(
-  z.object({ email: z.string().email(), name: z.string().optional() })
+  z.object({
+    email: z.string().email(),
+    name: z.string().optional(),
+    teamId: z.number().optional(),
+    teamName: z.string().optional(),
+    role: z.enum(["MEMBER", "ADMIN"]).optional().default("MEMBER"),
+  })
 );
 
 export const orgOnboardingTeamsSchema = z.array(
@@ -275,6 +281,7 @@ export const bookingCancelSchema = z.object({
   // note(Lauris): cancelSubsequentBookings will cancel all bookings after one specified by id or uid.
   cancelSubsequentBookings: z.boolean().optional(),
   cancellationReason: z.string().optional(),
+  skipCancellationReasonValidation: z.boolean().optional(),
   seatReferenceUid: z.string().optional(),
   cancelledBy: z.string().email({ message: "Invalid email" }).optional(),
   internalNote: z
diff --git a/packages/trpc/server/middlewares/sessionMiddleware.ts b/packages/trpc/server/middlewares/sessionMiddleware.ts
index 98ec403af9256f..d7b9a19f8508dc 100644
--- a/packages/trpc/server/middlewares/sessionMiddleware.ts
+++ b/packages/trpc/server/middlewares/sessionMiddleware.ts
@@ -4,8 +4,8 @@ import type { Session } from "next-auth";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { teamMetadataSchema, userMetadata } from "@calcom/prisma/zod-utils";
 
@@ -56,7 +56,7 @@ export async function getUserFromSession(ctx: TRPCContextInner, session: Maybe<S
 
   const locale = user?.locale ?? ctx.locale;
   const { members = [], ..._organization } = user.profile?.organization || {};
-  const isOrgAdmin = members.some((member: any) => ["OWNER", "ADMIN"].includes(member.role));
+  const isOrgAdmin = members.some((member: { role: string }) => ["OWNER", "ADMIN"].includes(member.role));
 
   if (isOrgAdmin) {
     logger.debug("User is an org admin", safeStringify({ userId: user.id }));
@@ -73,7 +73,7 @@ export async function getUserFromSession(ctx: TRPCContextInner, session: Maybe<S
 
   return {
     ...user,
-    avatar: `${WEBAPP_URL}/${user.username}/avatar.png?${organization.id}` && `orgId=${organization.id}`,
+    avatar: `${WEBAPP_URL}/${user.username}/avatar.png${organization.id ? `?orgId=${organization.id}` : ""}`,
     // TODO: OrgNewSchema - later -  We could consolidate the props in user.profile?.organization as organization is a profile thing now.
     organization,
     organizationId: organization.id,
@@ -82,6 +82,7 @@ export async function getUserFromSession(ctx: TRPCContextInner, session: Maybe<S
     username,
     locale,
     defaultBookerLayouts: userMetaData?.defaultBookerLayouts || null,
+    requiresBookerEmailVerification: user.requiresBookerEmailVerification,
   };
 }
 
diff --git a/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts b/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts
index 07db89f09f09b9..29fe2057bc70cb 100644
--- a/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts
@@ -1,5 +1,5 @@
 import getConnectedForms from "@calcom/app-store/routing-forms/lib/getConnectedForms";
-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts b/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts
index 9668c750234e53..36d66ce286d2e9 100644
--- a/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts
@@ -9,7 +9,7 @@ import isRouterLinkedField from "@calcom/app-store/routing-forms/lib/isRouterLin
 import type { SerializableForm } from "@calcom/app-store/routing-forms/types/types";
 import { zodFields, zodRouterRoute, zodRoutes } from "@calcom/app-store/routing-forms/zod";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts b/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts
index 05a0b9c4185fa0..7e332bde76d45c 100644
--- a/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts
@@ -1,5 +1,5 @@
 import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts b/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts
index d29e291d496268..8501f83a637b29 100644
--- a/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
 import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
 import type { zodFields, zodRoutes } from "@calcom/app-store/routing-forms/zod";
 import { hasFilter } from "@calcom/features/filters/lib/hasFilter";
-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import type { PrismaClient } from "@calcom/prisma";
diff --git a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
index 9d06163d0b4f17..2bf921432fd498 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
@@ -1,4 +1,4 @@
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { getAttributesForTeam } from "@calcom/lib/service/attribute/server/getAttributes";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
index 4c710033519c9d..0359b2a2e55ccd 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
 import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";
 import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
 import type { FormResponse } from "@calcom/app-store/routing-forms/types/types";
-import { canAccessEntity } from "@calcom/lib/entityPermissionUtils.server";
+import { canAccessEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
@@ -82,7 +82,7 @@ async function getResponseWithFormFieldsHandler({ ctx, input }: GetResponseWithF
     });
   }
 
-  const { UserRepository } = await import("@calcom/lib/server/repository/user");
+  const { UserRepository } = await import("@calcom/features/users/repositories/UserRepository");
   const userRepo = new UserRepository(prisma);
   const formWithUserProfile = {
     ...form,
diff --git a/packages/trpc/server/routers/loggedInViewer/stripeCustomer.handler.ts b/packages/trpc/server/routers/loggedInViewer/stripeCustomer.handler.ts
index b65e3f4b9a06aa..c8bc004b4796f4 100644
--- a/packages/trpc/server/routers/loggedInViewer/stripeCustomer.handler.ts
+++ b/packages/trpc/server/routers/loggedInViewer/stripeCustomer.handler.ts
@@ -1,4 +1,4 @@
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { prisma } from "@calcom/prisma";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.handler.ts b/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.handler.ts
index 9cba0d11acdfdc..b6975ad81acde2 100644
--- a/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.handler.ts
+++ b/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.handler.ts
@@ -1,5 +1,7 @@
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { extractBaseEmail } from "@calcom/lib/extract-base-email";
 import logger from "@calcom/lib/logger";
+import { prisma } from "@calcom/prisma";
 
 import type { TUserEmailVerificationRequiredSchema } from "./checkIfUserEmailVerificationRequired.schema";
 
@@ -30,6 +32,15 @@ export const checkEmailVerificationRequired = async ({
     log.warn(`blacklistedEmail: ${blacklistedEmail}`);
     return true;
   }
+
+  const userRepo = new UserRepository(prisma);
+  const user = await userRepo.findByEmailWithEmailVerificationSetting({ email: baseEmail });
+
+  if (user?.requiresBookerEmailVerification && baseEmail.toLowerCase() !== userSessionEmail?.toLowerCase()) {
+    log.warn(`user email requiring verification: ${baseEmail}`);
+    return true;
+  }
+
   return false;
 };
 
diff --git a/packages/trpc/server/routers/publicViewer/event.handler.ts b/packages/trpc/server/routers/publicViewer/event.handler.ts
index 1902468fec0107..20d79444296657 100644
--- a/packages/trpc/server/routers/publicViewer/event.handler.ts
+++ b/packages/trpc/server/routers/publicViewer/event.handler.ts
@@ -1,4 +1,4 @@
-import { EventRepository } from "@calcom/lib/server/repository/event";
+import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
 
 import type { TEventInputSchema } from "./event.schema";
 
diff --git a/packages/trpc/server/routers/viewer/admin/_router.ts b/packages/trpc/server/routers/viewer/admin/_router.ts
index 49580eb947eba0..b2c145727b25b9 100644
--- a/packages/trpc/server/routers/viewer/admin/_router.ts
+++ b/packages/trpc/server/routers/viewer/admin/_router.ts
@@ -1,12 +1,15 @@
 import { authedAdminProcedure } from "../../../procedures/authedProcedure";
 import { router } from "../../../trpc";
+import { ZAdminAssignFeatureToTeamSchema } from "./assignFeatureToTeam.schema";
 import { ZCreateSelfHostedLicenseSchema } from "./createSelfHostedLicenseKey.schema";
+import { ZAdminGetTeamsForFeatureSchema } from "./getTeamsForFeature.schema";
 import { ZListMembersSchema } from "./listPaginated.schema";
 import { ZAdminLockUserAccountSchema } from "./lockUserAccount.schema";
 import { ZAdminRemoveTwoFactor } from "./removeTwoFactor.schema";
 import { ZAdminPasswordResetSchema } from "./sendPasswordReset.schema";
 import { ZSetSMSLockState } from "./setSMSLockState.schema";
 import { toggleFeatureFlag } from "./toggleFeatureFlag.procedure";
+import { ZAdminUnassignFeatureFromTeamSchema } from "./unassignFeatureFromTeam.schema";
 import { ZAdminVerifyWorkflowsSchema } from "./verifyWorkflows.schema";
 import { ZWhitelistUserWorkflows } from "./whitelistUserWorkflows.schema";
 import {
@@ -60,6 +63,24 @@ export const adminRouter = router({
     const { default: handler } = await import("./whitelistUserWorkflows.handler");
     return handler(opts);
   }),
+  getTeamsForFeature: authedAdminProcedure
+    .input(ZAdminGetTeamsForFeatureSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./getTeamsForFeature.handler");
+      return handler(opts);
+    }),
+  assignFeatureToTeam: authedAdminProcedure
+    .input(ZAdminAssignFeatureToTeamSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./assignFeatureToTeam.handler");
+      return handler(opts);
+    }),
+  unassignFeatureFromTeam: authedAdminProcedure
+    .input(ZAdminUnassignFeatureFromTeamSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./unassignFeatureFromTeam.handler");
+      return handler(opts);
+    }),
   workspacePlatform: router({
     list: authedAdminProcedure.query(async () => {
       const { default: handler } = await import("./workspacePlatform/list.handler");
diff --git a/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.handler.ts b/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.handler.ts
new file mode 100644
index 00000000000000..910a3d73900c4d
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.handler.ts
@@ -0,0 +1,36 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TAdminAssignFeatureToTeamSchema } from "./assignFeatureToTeam.schema";
+
+type AssignFeatureOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+    prisma: PrismaClient;
+  };
+  input: TAdminAssignFeatureToTeamSchema;
+};
+
+export const assignFeatureToTeamHandler = async ({ ctx, input }: AssignFeatureOptions) => {
+  const { prisma, user } = ctx;
+  const { teamId, featureId } = input;
+
+  await prisma.teamFeatures.upsert({
+    where: {
+      teamId_featureId: {
+        teamId,
+        featureId,
+      },
+    },
+    create: {
+      teamId,
+      featureId,
+      assignedBy: `user:${user.id}`,
+    },
+    update: {},
+  });
+
+  return { success: true };
+};
+
+export default assignFeatureToTeamHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.schema.ts b/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.schema.ts
new file mode 100644
index 00000000000000..ee008c9c1ed8ec
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/assignFeatureToTeam.schema.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const ZAdminAssignFeatureToTeamSchema = z.object({
+  teamId: z.number(),
+  featureId: z.string(),
+});
+
+export type TAdminAssignFeatureToTeamSchema = z.infer<typeof ZAdminAssignFeatureToTeamSchema>;
diff --git a/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.handler.ts b/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.handler.ts
new file mode 100644
index 00000000000000..302176459133bf
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.handler.ts
@@ -0,0 +1,80 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TAdminGetTeamsForFeatureSchema } from "./getTeamsForFeature.schema";
+
+type GetTeamsOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+    prisma: PrismaClient;
+  };
+  input: TAdminGetTeamsForFeatureSchema;
+};
+
+export const getTeamsForFeatureHandler = async ({ ctx, input }: GetTeamsOptions) => {
+  const { prisma } = ctx;
+  const { featureId, limit = 10, cursor, searchTerm } = input;
+
+  const whereClause = {
+    isPlatform: false,
+    ...(searchTerm
+      ? {
+          OR: [
+            { name: { contains: searchTerm, mode: "insensitive" as const } },
+            { slug: { contains: searchTerm, mode: "insensitive" as const } },
+          ],
+        }
+      : {}),
+  };
+
+  const [teams, assignedTeams] = await Promise.all([
+    prisma.team.findMany({
+      where: whereClause,
+      select: {
+        id: true,
+        name: true,
+        slug: true,
+        logoUrl: true,
+        parentId: true,
+        isOrganization: true,
+        parent: {
+          select: {
+            name: true,
+            logoUrl: true,
+          },
+        },
+      },
+      orderBy: {
+        name: "asc",
+      },
+      take: limit + 1,
+      ...(cursor ? { skip: 1, cursor: { id: cursor } } : {}),
+    }),
+    prisma.teamFeatures.findMany({
+      where: {
+        featureId,
+      },
+      select: {
+        teamId: true,
+      },
+    }),
+  ]);
+
+  const assignedTeamIds = new Set(assignedTeams.map((tf) => tf.teamId));
+
+  let nextCursor: typeof cursor | undefined = undefined;
+  if (teams.length > limit) {
+    const nextItem = teams.pop();
+    nextCursor = nextItem?.id;
+  }
+
+  return {
+    teams: teams.map((team) => ({
+      ...team,
+      hasFeature: assignedTeamIds.has(team.id),
+    })),
+    nextCursor,
+  };
+};
+
+export default getTeamsForFeatureHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.schema.ts b/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.schema.ts
new file mode 100644
index 00000000000000..3c18eb94da659f
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/getTeamsForFeature.schema.ts
@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+export const ZAdminGetTeamsForFeatureSchema = z.object({
+  featureId: z.string(),
+  limit: z.number().min(1).max(100).default(10),
+  cursor: z.number().nullish(),
+  searchTerm: z.string().optional(),
+});
+
+export type TAdminGetTeamsForFeatureSchema = z.infer<typeof ZAdminGetTeamsForFeatureSchema>;
diff --git a/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.handler.ts b/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.handler.ts
new file mode 100644
index 00000000000000..5b4eeb802dc705
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.handler.ts
@@ -0,0 +1,30 @@
+import type { PrismaClient } from "@calcom/prisma";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TAdminUnassignFeatureFromTeamSchema } from "./unassignFeatureFromTeam.schema";
+
+type UnassignFeatureOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+    prisma: PrismaClient;
+  };
+  input: TAdminUnassignFeatureFromTeamSchema;
+};
+
+export const unassignFeatureFromTeamHandler = async ({ ctx, input }: UnassignFeatureOptions) => {
+  const { prisma } = ctx;
+  const { teamId, featureId } = input;
+
+  await prisma.teamFeatures.delete({
+    where: {
+      teamId_featureId: {
+        teamId,
+        featureId,
+      },
+    },
+  });
+
+  return { success: true };
+};
+
+export default unassignFeatureFromTeamHandler;
diff --git a/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.schema.ts b/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.schema.ts
new file mode 100644
index 00000000000000..db68a55725a587
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/admin/unassignFeatureFromTeam.schema.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const ZAdminUnassignFeatureFromTeamSchema = z.object({
+  teamId: z.number(),
+  featureId: z.string(),
+});
+
+export type TAdminUnassignFeatureFromTeamSchema = z.infer<typeof ZAdminUnassignFeatureFromTeamSchema>;
diff --git a/packages/trpc/server/routers/viewer/admin/whitelistUserWorkflows.handler.ts b/packages/trpc/server/routers/viewer/admin/whitelistUserWorkflows.handler.ts
index 0d92a279b5fcf7..8e1ff88e456067 100644
--- a/packages/trpc/server/routers/viewer/admin/whitelistUserWorkflows.handler.ts
+++ b/packages/trpc/server/routers/viewer/admin/whitelistUserWorkflows.handler.ts
@@ -1,4 +1,4 @@
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 
 import type { TrpcSessionUser } from "../../../types";
diff --git a/packages/trpc/server/routers/viewer/aiVoiceAgent/listCalls.handler.ts b/packages/trpc/server/routers/viewer/aiVoiceAgent/listCalls.handler.ts
index 305ca308707285..e66ce00aea96ed 100644
--- a/packages/trpc/server/routers/viewer/aiVoiceAgent/listCalls.handler.ts
+++ b/packages/trpc/server/routers/viewer/aiVoiceAgent/listCalls.handler.ts
@@ -1,7 +1,7 @@
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
 import logger from "@calcom/lib/logger";
 import { CalAiPhoneNumberRepository } from "@calcom/lib/server/repository/calAiPhoneNumber";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { MembershipRole } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/apps/appCredentialsByType.handler.ts b/packages/trpc/server/routers/viewer/apps/appCredentialsByType.handler.ts
index 31463bd8c16dbb..0d1a260356ac66 100644
--- a/packages/trpc/server/routers/viewer/apps/appCredentialsByType.handler.ts
+++ b/packages/trpc/server/routers/viewer/apps/appCredentialsByType.handler.ts
@@ -1,5 +1,5 @@
 import { getAllDelegationCredentialsForUserByAppType } from "@calcom/app-store/delegationCredential";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import { safeCredentialSelect } from "@calcom/prisma/selects/credential";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
index 887509fe1ebec5..026dd06f4a5f16 100644
--- a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
+++ b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
@@ -2,7 +2,7 @@ import type { ServerResponse } from "http";
 import type { NextApiResponse } from "next";
 
 import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/availability/list.handler.ts b/packages/trpc/server/routers/viewer/availability/list.handler.ts
index ba86f2b3607c59..cae273f534673e 100644
--- a/packages/trpc/server/routers/viewer/availability/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/availability/list.handler.ts
@@ -5,10 +5,12 @@ import { getDefaultScheduleId } from "./util";
 
 type ListOptions = {
   ctx: {
-    user: NonNullable<TrpcSessionUser>;
+    user: Pick<NonNullable<TrpcSessionUser>, "id" | "defaultScheduleId">;
   };
 };
 
+export type GetAvailabilityListHandlerReturn = Awaited<ReturnType<typeof listHandler>>;
+
 export const listHandler = async ({ ctx }: ListOptions) => {
   const { user } = ctx;
 
@@ -47,6 +49,7 @@ export const listHandler = async ({ ctx }: ListOptions) => {
         },
       });
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (error) {
     defaultScheduleId = null;
   }
diff --git a/packages/trpc/server/routers/viewer/availability/schedule/create.handler.ts b/packages/trpc/server/routers/viewer/availability/schedule/create.handler.ts
index d5859a3188cb21..083d2cf61c8922 100644
--- a/packages/trpc/server/routers/viewer/availability/schedule/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/availability/schedule/create.handler.ts
@@ -9,11 +9,13 @@ import type { TCreateInputSchema } from "./create.schema";
 
 type CreateOptions = {
   ctx: {
-    user: NonNullable<TrpcSessionUser>;
+    user: Pick<NonNullable<TrpcSessionUser>, "id" | "timeZone" | "defaultScheduleId">;
   };
   input: TCreateInputSchema;
 };
 
+export type CreateScheduleHandlerReturn = Awaited<ReturnType<typeof createHandler>>;
+
 export const createHandler = async ({ input, ctx }: CreateOptions) => {
   const { user } = ctx;
   if (input.eventTypeId) {
diff --git a/packages/trpc/server/routers/viewer/availability/schedule/duplicate.handler.ts b/packages/trpc/server/routers/viewer/availability/schedule/duplicate.handler.ts
index 642c952de23dbc..cfaac9e1f5f61a 100644
--- a/packages/trpc/server/routers/viewer/availability/schedule/duplicate.handler.ts
+++ b/packages/trpc/server/routers/viewer/availability/schedule/duplicate.handler.ts
@@ -8,11 +8,13 @@ import type { TScheduleDuplicateSchema } from "./duplicate.schema";
 
 type DuplicateScheduleOptions = {
   ctx: {
-    user: NonNullable<TrpcSessionUser>;
+    user: Pick<NonNullable<TrpcSessionUser>, "id" | "timeZone">;
   };
   input: TScheduleDuplicateSchema;
 };
 
+export type DuplicateScheduleHandlerReturn = Awaited<ReturnType<typeof duplicateHandler>>;
+
 export const duplicateHandler = async ({ ctx, input }: DuplicateScheduleOptions) => {
   try {
     const { scheduleId } = input;
diff --git a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts
index f9af41c7e1b46c..d8bc42e112770b 100644
--- a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts
+++ b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts
@@ -1,8 +1,8 @@
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
-import type { DateRange } from "@calcom/lib/date-ranges";
-import { buildDateRanges } from "@calcom/lib/date-ranges";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";
+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 
diff --git a/packages/trpc/server/routers/viewer/bookings/_router.tsx b/packages/trpc/server/routers/viewer/bookings/_router.tsx
index d5eaff4f0505c6..6a6bfb6254b67f 100644
--- a/packages/trpc/server/routers/viewer/bookings/_router.tsx
+++ b/packages/trpc/server/routers/viewer/bookings/_router.tsx
@@ -8,6 +8,7 @@ import { ZFindInputSchema } from "./find.schema";
 import { ZGetInputSchema } from "./get.schema";
 import { ZGetBookingAttendeesInputSchema } from "./getBookingAttendees.schema";
 import { ZInstantBookingInputSchema } from "./getInstantBookingLocation.schema";
+import { ZReportBookingInputSchema } from "./reportBooking.schema";
 import { ZRequestRescheduleInputSchema } from "./requestReschedule.schema";
 import { bookingsProcedure } from "./util";
 
@@ -20,6 +21,7 @@ type BookingsRouterHandlerCache = {
   getBookingAttendees?: typeof import("./getBookingAttendees.handler").getBookingAttendeesHandler;
   find?: typeof import("./find.handler").getHandler;
   getInstantBookingLocation?: typeof import("./getInstantBookingLocation.handler").getHandler;
+  reportBooking?: typeof import("./reportBooking.handler").reportBookingHandler;
 };
 
 export const bookingsRouter = router({
@@ -98,4 +100,13 @@ export const bookingsRouter = router({
         input,
       });
     }),
+
+  reportBooking: authedProcedure.input(ZReportBookingInputSchema).mutation(async ({ input, ctx }) => {
+    const { reportBookingHandler } = await import("./reportBooking.handler");
+
+    return reportBookingHandler({
+      ctx,
+      input,
+    });
+  }),
 });
diff --git a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts
index 1abd0682fc27ae..395f86a143f681 100644
--- a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts
@@ -3,6 +3,8 @@ import dayjs from "@calcom/dayjs";
 import { sendAddGuestsEmails } from "@calcom/emails";
 import EventManager from "@calcom/features/bookings/lib/EventManager";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { extractBaseEmail } from "@calcom/lib/extract-base-email";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { prisma } from "@calcom/prisma";
@@ -79,11 +81,36 @@ export const addGuestsHandler = async ({ ctx, input }: AddGuestsOptions) => {
     ? process.env.BLACKLISTED_GUEST_EMAILS.split(",").map((email) => email.toLowerCase())
     : [];
 
-  const uniqueGuests = guests.filter(
-    (guest) =>
-      !booking.attendees.some((attendee) => guest === attendee.email) &&
-      !blacklistedGuestEmails.includes(guest)
-  );
+  const seenBaseEmails = new Set<string>();
+  const deduplicatedGuests = guests.filter((guest) => {
+    const baseEmail = extractBaseEmail(guest).toLowerCase();
+    if (seenBaseEmails.has(baseEmail)) {
+      return false;
+    }
+    seenBaseEmails.add(baseEmail);
+    return true;
+  });
+
+  const guestEmails = deduplicatedGuests.map((email) => extractBaseEmail(email).toLowerCase());
+  const userRepo = new UserRepository(prisma);
+  const guestUsers = await userRepo.findManyByEmailsWithEmailVerificationSettings({ emails: guestEmails });
+
+  const emailToRequiresVerification = new Map<string, boolean>();
+  for (const user of guestUsers) {
+    const matchedBase = extractBaseEmail(user.matchedEmail ?? user.email).toLowerCase();
+    emailToRequiresVerification.set(matchedBase, user.requiresBookerEmailVerification === true);
+  }
+
+  const uniqueGuests = deduplicatedGuests.filter((guest) => {
+    const baseGuestEmail = extractBaseEmail(guest).toLowerCase();
+    return (
+      !booking.attendees.some(
+        (attendee) => extractBaseEmail(attendee.email).toLowerCase() === baseGuestEmail
+      ) &&
+      !blacklistedGuestEmails.includes(baseGuestEmail) &&
+      !emailToRequiresVerification.get(baseGuestEmail)
+    );
+  });
 
   if (uniqueGuests.length === 0)
     throw new TRPCError({ code: "BAD_REQUEST", message: "emails_must_be_unique_valid" });
@@ -182,9 +209,9 @@ export const addGuestsHandler = async ({ ctx, input }: AddGuestsOptions) => {
   await eventManager.updateCalendarAttendees(evt, booking);
 
   try {
-    await sendAddGuestsEmails(evt, guests);
+    await sendAddGuestsEmails(evt, uniqueGuests);
   } catch (err) {
-    console.log("Error sending AddGuestsEmails");
+    console.error("Error sending AddGuestsEmails", err);
   }
 
   return { message: "Guests added" };
diff --git a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts
index 428b0961eae303..f975a7f8d39d0d 100644
--- a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts
@@ -10,13 +10,13 @@ import { processPaymentRefund } from "@calcom/features/bookings/lib/payment/proc
 import { workflowSelect } from "@calcom/features/ee/workflows/lib/getAllWorkflows";
 import type { GetSubscriberOptions } from "@calcom/features/webhooks/lib/getWebhooks";
 import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import { prisma } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
index 35f561ac7f7631..48ab05b92af9f2 100644
--- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts
@@ -10,9 +10,9 @@ import { buildCalEventFromBooking } from "@calcom/lib/buildCalEventFromBooking";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Booking, BookingReference } from "@calcom/prisma/client";
 import type { userMetadata } from "@calcom/prisma/zod-utils";
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 9aea7ee396099d..b52de1681eba5e 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -3,10 +3,10 @@ import { type SelectQueryBuilder } from "kysely";
 import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";
 
 import dayjs from "@calcom/dayjs";
+import getAllUserBookings from "@calcom/features/bookings/lib/getAllUserBookings";
 import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
 import type { DB } from "@calcom/kysely";
 import kysely from "@calcom/kysely";
-import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";
 import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import logger from "@calcom/lib/logger";
@@ -590,6 +590,18 @@ export async function getBookings({
               .orderBy("AssignmentReason.createdAt", "desc")
               .limit(1)
           ).as("assignmentReason"),
+          jsonObjectFrom(
+            eb
+              .selectFrom("BookingReport")
+              .select([
+                "BookingReport.id",
+                "BookingReport.reportedById",
+                "BookingReport.reason",
+                "BookingReport.description",
+                "BookingReport.createdAt",
+              ])
+              .whereRef("BookingReport.bookingUid", "=", "Booking.uid")
+          ).as("report"),
         ])
         .orderBy(orderBy.key, orderBy.order)
         .execute()
@@ -688,6 +700,7 @@ export async function getBookings({
       return hostUser?.id === userId && attendeeEmails.has(hostUser.email);
     });
   };
+
   const bookings = await Promise.all(
     plainBookings.map(async (booking) => {
       // If seats are enabled, the event is not set to show attendees, and the current user is not the host, filter out attendees who are not the current user
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
new file mode 100644
index 00000000000000..3a6f39b304f889
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.test.ts
@@ -0,0 +1,344 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { BookingAccessService } from "@calcom/features/bookings/services/BookingAccessService";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import { BookingStatus, BookingReportReason } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import { reportBookingHandler } from "./reportBooking.handler";
+
+vi.mock("@calcom/lib/server/repository/bookingReport");
+vi.mock("@calcom/features/bookings/lib/handleCancelBooking");
+vi.mock("@calcom/features/bookings/repositories/BookingRepository");
+vi.mock("@calcom/features/bookings/services/BookingAccessService");
+vi.mock("@calcom/lib/logger", () => ({
+  default: {
+    getSubLogger: () => ({
+      warn: vi.fn(),
+      error: vi.fn(),
+    }),
+  },
+}));
+
+describe("reportBookingHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "user@example.com",
+    name: "Test User",
+  };
+
+  const mockBooking = {
+    id: 100,
+    uid: "test-booking-uid",
+    startTime: new Date("2025-12-01T10:00:00Z"),
+    status: BookingStatus.ACCEPTED,
+    recurringEventId: null,
+    attendees: [{ email: "booker@example.com" }],
+    seatsReferences: [],
+    report: null,
+  };
+
+  const mockBookingRepo = {
+    findByUidIncludeReport: vi.fn(),
+    getActiveRecurringBookingsFromDate: vi.fn(),
+  };
+
+  const mockReportRepo = {
+    createReport: vi.fn(),
+    findAllReportedBookings: vi.fn(),
+  };
+
+  const mockBookingAccessService = {
+    doesUserIdHaveAccessToBooking: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    vi.mocked(BookingRepository).mockImplementation(() => mockBookingRepo);
+    vi.mocked(PrismaBookingReportRepository).mockImplementation(() => mockReportRepo);
+    vi.mocked(BookingAccessService).mockImplementation(() => mockBookingAccessService);
+    mockReportRepo.createReport.mockResolvedValue({ id: "new-report" });
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user doesn't have access to booking", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(false);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
+          },
+        })
+      ).rejects.toThrow(TRPCError);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You don't have access to this booking",
+      });
+    });
+
+    it("should throw NOT_FOUND when booking doesn't exist", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue(null);
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Booking not found",
+      });
+    });
+  });
+
+  describe("duplicate report prevention", () => {
+    it("should throw BAD_REQUEST when booking already has a report", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        report: { id: "existing-report" },
+      });
+
+      await expect(
+        reportBookingHandler({
+          ctx: { user: mockUser },
+          input: {
+            bookingUid: "test-booking-uid",
+            reason: BookingReportReason.SPAM,
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "This booking has already been reported",
+      });
+    });
+  });
+
+  describe("successful report creation", () => {
+    it("should successfully create a single booking report and auto-cancel upcoming booking", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000), // Tomorrow
+      });
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingUid: "test-booking-uid",
+      });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+          description: "This is spam",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Booking reported and cancelled successfully");
+      expect(result.reportedCount).toBe(1);
+      expect(mockReportRepo.createReport).toHaveBeenCalledWith({
+        bookingUid: "test-booking-uid",
+        bookerEmail: "booker@example.com",
+        reportedById: mockUser.id,
+        reason: BookingReportReason.SPAM,
+        description: "This is spam",
+        cancelled: true,
+        organizationId: undefined,
+      });
+    });
+
+    it("should create report without description for past booking", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() - 86400000), // Yesterday
+      });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.DONT_KNOW_PERSON,
+        },
+      });
+
+      expect(result.message).toBe("Booking reported successfully");
+      expect(mockReportRepo.createReport).toHaveBeenCalledWith({
+        bookingUid: "test-booking-uid",
+        bookerEmail: "booker@example.com",
+        reportedById: mockUser.id,
+        reason: BookingReportReason.DONT_KNOW_PERSON,
+        description: undefined,
+        cancelled: false,
+        organizationId: undefined,
+      });
+    });
+  });
+
+  describe("cancellation integration", () => {
+    it("should cancel booking when cancelBooking is true", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000), // Tomorrow
+      });
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingUid: "test-booking-uid",
+      });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+          description: "Spam booking",
+        },
+      });
+
+      expect(result.message).toBe("Booking reported and cancelled successfully");
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: {
+          uid: "test-booking-uid",
+          cancelledBy: mockUser.email,
+          skipCancellationReasonValidation: true,
+        },
+        userId: mockUser.id,
+      });
+    });
+
+    it("should not cancel booking if it's in the past", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() - 86400000),
+      });
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+        },
+      });
+
+      expect(handleCancelBooking).not.toHaveBeenCalled();
+      expect(result.message).toBe("Booking reported successfully");
+    });
+
+    it("should handle cancellation failure gracefully", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000),
+      });
+      vi.mocked(handleCancelBooking).mockRejectedValue(new Error("Cancellation failed"));
+
+      const result = await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Booking reported successfully, but cancellation failed");
+      expect(result).not.toHaveProperty("cancellationError");
+    });
+
+    it("should use cancelSubsequentBookings for recurring events", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        recurringEventId: "recurring-123",
+        startTime: new Date(Date.now() + 86400000),
+      });
+      mockBookingRepo.getActiveRecurringBookingsFromDate.mockResolvedValue([
+        { uid: "100" },
+        { uid: "101" },
+        { uid: "102" },
+      ]);
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingUid: "test-booking-uid",
+      });
+
+      await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+        },
+      });
+
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: expect.objectContaining({
+          cancelSubsequentBookings: true,
+        }),
+        userId: mockUser.id,
+      });
+    });
+
+    it("should pass seatReferenceUid for seated events", async () => {
+      mockBookingAccessService.doesUserIdHaveAccessToBooking.mockResolvedValue(true);
+      mockBookingRepo.findByUidIncludeReport.mockResolvedValue({
+        ...mockBooking,
+        startTime: new Date(Date.now() + 86400000),
+        seatsReferences: [
+          { referenceUid: "seat-123", attendee: { email: mockUser.email } },
+          { referenceUid: "seat-456", attendee: { email: "other@example.com" } },
+        ],
+      });
+      vi.mocked(handleCancelBooking).mockResolvedValue({
+        success: true,
+        message: "Cancelled",
+        onlyRemovedAttendee: false,
+        bookingUid: "test-booking-uid",
+      });
+
+      await reportBookingHandler({
+        ctx: { user: mockUser },
+        input: {
+          bookingUid: "test-booking-uid",
+          reason: BookingReportReason.SPAM,
+        },
+      });
+
+      expect(handleCancelBooking).toHaveBeenCalledWith({
+        bookingData: expect.objectContaining({
+          seatReferenceUid: "seat-123",
+        }),
+        userId: mockUser.id,
+      });
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
new file mode 100644
index 00000000000000..99ef5101e39534
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.handler.ts
@@ -0,0 +1,137 @@
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { BookingAccessService } from "@calcom/features/bookings/services/BookingAccessService";
+import logger from "@calcom/lib/logger";
+import { PrismaBookingReportRepository } from "@calcom/lib/server/repository/bookingReport";
+import prisma from "@calcom/prisma";
+import { BookingStatus } from "@calcom/prisma/enums";
+import type { TrpcSessionUser } from "@calcom/trpc/server/types";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TReportBookingInputSchema } from "./reportBooking.schema";
+
+type ReportBookingOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TReportBookingInputSchema;
+};
+
+const log = logger.getSubLogger({ prefix: ["reportBookingHandler"] });
+
+export const reportBookingHandler = async ({ ctx, input }: ReportBookingOptions) => {
+  const { user } = ctx;
+  const { bookingUid, reason, description } = input;
+
+  const bookingRepo = new BookingRepository(prisma);
+  const bookingReportRepo = new PrismaBookingReportRepository(prisma);
+  const bookingAccessService = new BookingAccessService(prisma);
+
+  const hasAccess = await bookingAccessService.doesUserIdHaveAccessToBooking({
+    userId: user.id,
+    bookingUid,
+  });
+
+  if (!hasAccess) {
+    throw new TRPCError({ code: "FORBIDDEN", message: "You don't have access to this booking" });
+  }
+
+  const booking = await bookingRepo.findByUidIncludeReport({ bookingUid });
+
+  if (!booking) {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Booking not found" });
+  }
+
+  if (booking.report) {
+    throw new TRPCError({ code: "BAD_REQUEST", message: "This booking has already been reported" });
+  }
+
+  const bookerEmail = booking.attendees[0]?.email;
+  if (!bookerEmail) {
+    throw new TRPCError({ code: "BAD_REQUEST", message: "Booking has no attendees" });
+  }
+
+  let reportedBookingUids: string[] = [bookingUid];
+
+  if (booking.recurringEventId) {
+    const remainingBookings = await bookingRepo.getActiveRecurringBookingsFromDate({
+      recurringEventId: booking.recurringEventId,
+      fromDate: booking.startTime,
+    });
+    reportedBookingUids = remainingBookings.map((b: { uid: string }) => b.uid);
+  }
+
+  let cancellationError: unknown = null;
+  let cancellationAttempted = false;
+  let didCancel = false;
+  const isUpcoming =
+    (booking.status === BookingStatus.ACCEPTED ||
+      booking.status === BookingStatus.PENDING ||
+      booking.status === BookingStatus.AWAITING_HOST) &&
+    new Date(booking.startTime) > new Date();
+
+  if (isUpcoming) {
+    cancellationAttempted = true;
+    try {
+      const normalizedEmail = user.email.trim().toLowerCase();
+      const userSeat = booking.seatsReferences.find(
+        (seat: { attendee?: { email: string }; referenceUid?: string }) =>
+          seat.attendee?.email && seat.attendee.email.trim().toLowerCase() === normalizedEmail
+      );
+      const seatReferenceUid = userSeat?.referenceUid;
+
+      await handleCancelBooking({
+        bookingData: {
+          uid: booking.uid,
+          cancelledBy: user.email,
+          skipCancellationReasonValidation: true,
+          ...(booking.recurringEventId ? { cancelSubsequentBookings: true } : {}),
+          ...(seatReferenceUid ? { seatReferenceUid } : {}),
+        },
+        userId: user.id,
+      });
+      didCancel = true;
+    } catch (error) {
+      cancellationError = error;
+      log.error("Failed to cancel booking after reporting:", error);
+    }
+  }
+
+  let createdCount = 0;
+  for (const uid of reportedBookingUids) {
+    try {
+      await bookingReportRepo.createReport({
+        bookingUid: uid,
+        bookerEmail,
+        reportedById: user.id,
+        reason,
+        description,
+        cancelled: didCancel,
+        organizationId: user?.organizationId,
+      });
+      createdCount++;
+    } catch (error) {
+      log.warn(`Failed to create report for booking ${uid}:`, error);
+    }
+  }
+
+  const reportedBooking = { uid: reportedBookingUids[0] };
+
+  const isRecurring = Boolean(booking.recurringEventId) && createdCount > 1;
+  const baseMessage = isRecurring ? `${createdCount} recurring bookings reported` : "Booking reported";
+  const success = createdCount > 0;
+
+  return {
+    success,
+    message: success
+      ? cancellationAttempted
+        ? cancellationError
+          ? `${baseMessage} successfully, but cancellation failed`
+          : `${baseMessage} and cancelled successfully`
+        : `${baseMessage} successfully`
+      : "No reports created",
+    bookingUid: reportedBooking.uid,
+    reportedCount: createdCount,
+  };
+};
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
new file mode 100644
index 00000000000000..1fa18d54959f6d
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+import { BookingReportReason } from "@calcom/prisma/enums";
+
+export const ZReportBookingInputSchema = z.object({
+  bookingUid: z.string(),
+  reason: z.nativeEnum(BookingReportReason),
+  description: z.string().optional(),
+});
+
+export type TReportBookingInputSchema = z.infer<typeof ZReportBookingInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts
index 5f9fc171e4f0d7..a41f3048433d4a 100644
--- a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts
@@ -3,10 +3,10 @@ import type { TFunction } from "i18next";
 import { getCalendar } from "@calcom/app-store/_utils/getCalendar";
 import { getDelegationCredentialOrRegularCredential } from "@calcom/app-store/delegationCredential";
 import { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
-import { deleteMeeting } from "@calcom/app-store/videoClient";
 import dayjs from "@calcom/dayjs";
 import { sendRequestRescheduleEmailAndSMS } from "@calcom/emails";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
+import { deleteMeeting } from "@calcom/features/conferencing/lib/videoClient";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import {
   deleteWebhookScheduledTriggers,
@@ -15,13 +15,13 @@ import {
 import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import { CalendarEventBuilder } from "@calcom/lib/builders/CalendarEvent/builder";
 import { CalendarEventDirector } from "@calcom/lib/builders/CalendarEvent/director";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { BookingWebhookFactory } from "@calcom/lib/server/service/BookingWebhookFactory";
 import { prisma } from "@calcom/prisma";
 import type { BookingReference, EventType } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/calVideo/getCalVideoRecordings.handler.ts b/packages/trpc/server/routers/viewer/calVideo/getCalVideoRecordings.handler.ts
index 402eadc7144e7c..3a6a22f93aa4c6 100644
--- a/packages/trpc/server/routers/viewer/calVideo/getCalVideoRecordings.handler.ts
+++ b/packages/trpc/server/routers/viewer/calVideo/getCalVideoRecordings.handler.ts
@@ -1,4 +1,4 @@
-import { getRecordingsOfCalVideoByRoomName } from "@calcom/app-store/videoClient";
+import { getRecordingsOfCalVideoByRoomName } from "@calcom/features/conferencing/lib/videoClient";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/calVideo/getDownloadLinkOfCalVideoRecordings.handler.ts b/packages/trpc/server/routers/viewer/calVideo/getDownloadLinkOfCalVideoRecordings.handler.ts
index a5b71daec05026..6be2f16969ab61 100644
--- a/packages/trpc/server/routers/viewer/calVideo/getDownloadLinkOfCalVideoRecordings.handler.ts
+++ b/packages/trpc/server/routers/viewer/calVideo/getDownloadLinkOfCalVideoRecordings.handler.ts
@@ -1,6 +1,6 @@
 /// <reference types="@calcom/types/next-auth" />
 import { IS_SELF_HOSTED } from "@calcom/lib/constants";
-import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/app-store/videoClient";
+import { getDownloadLinkOfCalVideoByRecordingId } from "@calcom/features/conferencing/lib/videoClient";
 
 import { TRPCError } from "@trpc/server";
 
diff --git a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
index 739081aaa31c8e..e3a61baff28281 100644
--- a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
+++ b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts
@@ -1,9 +1,9 @@
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts b/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
index c88e62e6f46159..2a50b81f107acf 100644
--- a/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
+++ b/packages/trpc/server/routers/viewer/credits/downloadExpenseLog.handler.ts
@@ -1,6 +1,6 @@
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { MembershipRole } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/credits/getAllCredits.handler.ts b/packages/trpc/server/routers/viewer/credits/getAllCredits.handler.ts
index 5f12ac598baf09..a65d56bf3bdb59 100644
--- a/packages/trpc/server/routers/viewer/credits/getAllCredits.handler.ts
+++ b/packages/trpc/server/routers/viewer/credits/getAllCredits.handler.ts
@@ -1,6 +1,6 @@
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts
index 189dda593ad7ea..6d0979db48ca27 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts
@@ -1,6 +1,6 @@
 import type { z } from "zod";
 
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { WorkspacePlatformRepository } from "@calcom/lib/server/repository/workspacePlatform";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts
index b8d7db6beb8f2b..dba3b5ec51ef6e 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts
@@ -1,6 +1,6 @@
 import type z from "zod";
 
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 
 import { TRPCError } from "@trpc/server";
 
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts
index 5dcdbf086e1371..e821fc8f03890e 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts
@@ -1,6 +1,6 @@
 import logger from "@calcom/lib/logger";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 
 import type { TDelegationCredentialGetAffectedMembersForDisableSchema } from "./schema";
 
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts
index e604e8f238b521..66ed7e72f9fc71 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts
@@ -1,4 +1,4 @@
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { encryptedServiceAccountKeySchema } from "@calcom/lib/server/serviceAccountKey";
 import type { PrismaClient } from "@calcom/prisma";
 
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts
index e9b9efec2174a0..44f68fa2c16ba7 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts
@@ -4,8 +4,8 @@ import { sendDelegationCredentialDisabledEmail } from "@calcom/emails/email-mana
 import { checkIfSuccessfullyConfiguredInWorkspace } from "@calcom/app-store/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 
 import { getAffectedMembersForDisable } from "./getAffectedMembersForDisable.handler";
 import type { DelegationCredentialToggleEnabledSchema } from "./schema";
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts
index 0ba2194779c3a2..fc79bf3798a09b 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts
@@ -1,6 +1,6 @@
 import type { z } from "zod";
 
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { WorkspacePlatformRepository } from "@calcom/lib/server/repository/workspacePlatform";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/delegationCredential/utils.ts b/packages/trpc/server/routers/viewer/delegationCredential/utils.ts
index 475bc249c8dbbc..a237225cb05252 100644
--- a/packages/trpc/server/routers/viewer/delegationCredential/utils.ts
+++ b/packages/trpc/server/routers/viewer/delegationCredential/utils.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
 
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import type { Prisma } from "@calcom/prisma/client";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/eventTypes/__tests__/getUserEventGroups.test.ts b/packages/trpc/server/routers/viewer/eventTypes/__tests__/getUserEventGroups.test.ts
index 375e304f920d3f..4ca612ab3edad9 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/__tests__/getUserEventGroups.test.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/__tests__/getUserEventGroups.test.ts
@@ -12,13 +12,13 @@ vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
   checkRateLimitAndThrowError: vi.fn(),
 }));
 
-vi.mock("@calcom/lib/server/repository/membership", () => ({
+vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
   MembershipRepository: {
     findAllByUpIdIncludeTeam: vi.fn(),
   },
 }));
 
-vi.mock("@calcom/lib/server/repository/profile", () => ({
+vi.mock("@calcom/features/profile/repositories/ProfileRepository", () => ({
   ProfileRepository: {
     findByUpId: vi.fn(),
   },
@@ -32,11 +32,11 @@ vi.mock("../teamAccessUseCase", () => ({
   })),
 }));
 
-vi.mock("@calcom/lib/getBookerUrl/server", () => ({
+vi.mock("@calcom/features/ee/organizations/lib/getBookerUrlServer", () => ({
   getBookerBaseUrl: vi.fn().mockResolvedValue("https://cal.com"),
 }));
 
-vi.mock("@calcom/lib/getBookerUrl/client", () => ({
+vi.mock("@calcom/features/ee/organizations/lib/getBookerBaseUrlSync", () => ({
   getBookerBaseUrlSync: vi.fn().mockReturnValue("https://cal.com"),
 }));
 
@@ -68,7 +68,11 @@ describe("getUserEventGroups", () => {
     organizationId: null,
     organization: null,
   } as unknown as NonNullable<
-    Awaited<ReturnType<typeof import("@calcom/lib/server/repository/profile").ProfileRepository.findByUpId>>
+    Awaited<
+      ReturnType<
+        typeof import("@calcom/features/profile/repositories/ProfileRepository").ProfileRepository.findByUpId
+      >
+    >
   >;
 
   const mockCtx = {
@@ -82,7 +86,7 @@ describe("getUserEventGroups", () => {
 
   describe("Basic functionality", () => {
     it("should throw TRPCError when profile is not found", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
       vi.mocked(ProfileRepository.findByUpId).mockResolvedValue(null);
 
       await expect(
@@ -94,8 +98,10 @@ describe("getUserEventGroups", () => {
     });
 
     it("should return user event groups when no filters are applied", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
 
       vi.mocked(ProfileRepository.findByUpId).mockResolvedValue(mockProfile);
       vi.mocked(MembershipRepository.findAllByUpIdIncludeTeam).mockResolvedValue([]);
@@ -122,8 +128,10 @@ describe("getUserEventGroups", () => {
 
   describe("Team memberships", () => {
     it("should include team events when team memberships exist", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
       const { getResourcePermissions } = await import("@calcom/features/pbac/lib/resource-permissions");
 
       const mockTeamMembership = {
@@ -148,7 +156,7 @@ describe("getUserEventGroups", () => {
       } as unknown as NonNullable<
         Awaited<
           ReturnType<
-            typeof import("@calcom/lib/server/repository/membership").MembershipRepository.findAllByUpIdIncludeTeam
+            typeof import("@calcom/features/membership/repositories/MembershipRepository").MembershipRepository.findAllByUpIdIncludeTeam
           >
         >
       >[0];
@@ -182,8 +190,10 @@ describe("getUserEventGroups", () => {
 
   describe("Permissions", () => {
     it("should handle PBAC permissions correctly", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
       const { getResourcePermissions } = await import("@calcom/features/pbac/lib/resource-permissions");
 
       const mockTeamMembership = {
@@ -208,7 +218,7 @@ describe("getUserEventGroups", () => {
       } as unknown as NonNullable<
         Awaited<
           ReturnType<
-            typeof import("@calcom/lib/server/repository/membership").MembershipRepository.findAllByUpIdIncludeTeam
+            typeof import("@calcom/features/membership/repositories/MembershipRepository").MembershipRepository.findAllByUpIdIncludeTeam
           >
         >
       >[0];
@@ -236,8 +246,10 @@ describe("getUserEventGroups", () => {
     });
 
     it("should fallback to role-based permissions when PBAC fails", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
       const { getResourcePermissions } = await import("@calcom/features/pbac/lib/resource-permissions");
 
       const mockTeamMembership = {
@@ -262,7 +274,7 @@ describe("getUserEventGroups", () => {
       } as unknown as NonNullable<
         Awaited<
           ReturnType<
-            typeof import("@calcom/lib/server/repository/membership").MembershipRepository.findAllByUpIdIncludeTeam
+            typeof import("@calcom/features/membership/repositories/MembershipRepository").MembershipRepository.findAllByUpIdIncludeTeam
           >
         >
       >[0];
@@ -288,8 +300,10 @@ describe("getUserEventGroups", () => {
 
   describe("Organization handling", () => {
     it("should handle organization locked event types", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
 
       const mockProfileWithOrg = {
         ...mockProfile,
@@ -300,7 +314,9 @@ describe("getUserEventGroups", () => {
         },
       } as unknown as NonNullable<
         Awaited<
-          ReturnType<typeof import("@calcom/lib/server/repository/profile").ProfileRepository.findByUpId>
+          ReturnType<
+            typeof import("@calcom/features/profile/repositories/ProfileRepository").ProfileRepository.findByUpId
+          >
         >
       >;
 
@@ -319,8 +335,10 @@ describe("getUserEventGroups", () => {
 
   describe("Routing forms", () => {
     it("should handle routing forms slug format", async () => {
-      const { ProfileRepository } = await import("@calcom/lib/server/repository/profile");
-      const { MembershipRepository } = await import("@calcom/lib/server/repository/membership");
+      const { ProfileRepository } = await import("@calcom/features/profile/repositories/ProfileRepository");
+      const { MembershipRepository } = await import(
+        "@calcom/features/membership/repositories/MembershipRepository"
+      );
       const { getResourcePermissions } = await import("@calcom/features/pbac/lib/resource-permissions");
 
       const mockTeamMembership = {
@@ -345,7 +363,7 @@ describe("getUserEventGroups", () => {
       } as unknown as NonNullable<
         Awaited<
           ReturnType<
-            typeof import("@calcom/lib/server/repository/membership").MembershipRepository.findAllByUpIdIncludeTeam
+            typeof import("@calcom/features/membership/repositories/MembershipRepository").MembershipRepository.findAllByUpIdIncludeTeam
           >
         >
       >[0];
diff --git a/packages/trpc/server/routers/viewer/eventTypes/__tests__/util.test.ts b/packages/trpc/server/routers/viewer/eventTypes/__tests__/util.test.ts
index 1bf45f4e5b008e..38d27edc0d9889 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/__tests__/util.test.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/__tests__/util.test.ts
@@ -7,7 +7,7 @@ import { MembershipRole } from "@calcom/prisma/enums";
 import { TRPCError } from "@trpc/server";
 
 import type { authedProcedure } from "../../../procedures/authedProcedure";
-import { createEventPbacProcedure } from "../util";
+import { createEventPbacProcedure, ensureEmailOrPhoneNumberIsPresent } from "../util";
 
 // Mock dependencies
 vi.mock("@calcom/features/pbac/services/permission-check.service");
@@ -513,4 +513,163 @@ describe("createEventPbacProcedure", () => {
       );
     });
   });
+
+  describe("ensureEmailOrPhoneNumberIsPresent", () => {
+    it("should throw error when both email and phone are hidden", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: true,
+          hidden: true,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: true,
+          hidden: true,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(TRPCError);
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(
+        expect.objectContaining({
+          code: "BAD_REQUEST",
+          message: "booking_fields_email_and_phone_both_hidden",
+        })
+      );
+    });
+
+    it("should throw error when neither email nor phone is required", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: false,
+          hidden: false,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: false,
+          hidden: false,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(TRPCError);
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(
+        expect.objectContaining({
+          code: "BAD_REQUEST",
+          message: "booking_fields_email_or_phone_required",
+        })
+      );
+    });
+
+    it("should throw error when email is hidden and phone is not required", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: true,
+          hidden: true,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: false,
+          hidden: false,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(TRPCError);
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(
+        expect.objectContaining({
+          code: "BAD_REQUEST",
+          message: "booking_fields_phone_required_when_email_hidden",
+        })
+      );
+    });
+
+    it("should throw error when phone is hidden and email is not required", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: false,
+          hidden: false,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: true,
+          hidden: true,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(TRPCError);
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).toThrow(
+        expect.objectContaining({
+          code: "BAD_REQUEST",
+          message: "booking_fields_email_required_when_phone_hidden",
+        })
+      );
+    });
+
+    it("should pass when email is visible and required while phone is hidden", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: true,
+          hidden: false,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: false,
+          hidden: true,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).not.toThrow();
+    });
+
+    it("should pass when phone is visible and required while email is hidden", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: false,
+          hidden: true,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: true,
+          hidden: false,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).not.toThrow();
+    });
+
+    it("should pass when both email and phone are visible and required", () => {
+      const fields = [
+        {
+          name: "email",
+          type: "email" as const,
+          required: true,
+          hidden: false,
+        },
+        {
+          name: "attendeePhoneNumber",
+          type: "phone" as const,
+          required: true,
+          hidden: false,
+        },
+      ];
+
+      expect(() => ensureEmailOrPhoneNumberIsPresent(fields)).not.toThrow();
+    });
+  });
 });
diff --git a/packages/trpc/server/routers/viewer/eventTypes/_router.ts b/packages/trpc/server/routers/viewer/eventTypes/_router.ts
index d9e12aca1cb6f6..72364b94dad431 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/_router.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/_router.ts
@@ -6,10 +6,10 @@ import { MembershipRole } from "@calcom/prisma/enums";
 import authedProcedure from "../../../procedures/authedProcedure";
 import { router } from "../../../trpc";
 import { ZDeleteInputSchema } from "./delete.schema";
+import { ZGetActiveOnOptionsSchema } from "./getActiveOnOptions.schema";
 import { ZEventTypeInputSchema, ZGetEventTypesFromGroupSchema } from "./getByViewer.schema";
 import { ZGetHashedLinkInputSchema } from "./getHashedLink.schema";
 import { ZGetHashedLinksInputSchema } from "./getHashedLinks.schema";
-import { ZGetTeamAndEventTypeOptionsSchema } from "./getTeamAndEventTypeOptions.schema";
 import { get } from "./procedures/get";
 import { createEventPbacProcedure } from "./util";
 
@@ -61,22 +61,20 @@ export const eventTypesRouter = router({
       return result;
     }),
 
-  getTeamAndEventTypeOptions: authedProcedure
-    .input(ZGetTeamAndEventTypeOptionsSchema)
-    .query(async ({ ctx, input }) => {
-      const { getTeamAndEventTypeOptions } = await import("./getTeamAndEventTypeOptions.handler");
+  getActiveOnOptions: authedProcedure.input(ZGetActiveOnOptionsSchema).query(async ({ ctx, input }) => {
+    const { getActiveOnOptions } = await import("./getActiveOnOptions.handler");
 
-      const timer = logP(`getTeamAndEventTypeOptions(${ctx.user.id})`);
+    const timer = logP(`getActiveOnOptions(${ctx.user.id})`);
 
-      const result = await getTeamAndEventTypeOptions({
-        ctx,
-        input,
-      });
+    const result = await getActiveOnOptions({
+      ctx,
+      input,
+    });
 
-      timer();
+    timer();
 
-      return result;
-    }),
+    return result;
+  }),
 
   list: authedProcedure.query(async ({ ctx }) => {
     const { listHandler } = await import("./list.handler");
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.handler.ts
new file mode 100644
index 00000000000000..2ca02a0a2010e8
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.handler.ts
@@ -0,0 +1,275 @@
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
+import { PrismaRoutingFormRepository } from "@calcom/lib/server/repository/PrismaRoutingFormRepository";
+import type { PrismaClient } from "@calcom/prisma";
+import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
+import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import { listOtherTeamHandler } from "../organizations/listOtherTeams.handler";
+import type { TGetActiveOnOptionsSchema } from "./getActiveOnOptions.schema";
+
+type GetActiveOnOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+    prisma: PrismaClient;
+  };
+  input: TGetActiveOnOptionsSchema;
+};
+
+type Option = {
+  value: string;
+  label: string;
+};
+
+type MembershipEventType = Awaited<
+  ReturnType<typeof MembershipRepository.findAllByUpIdIncludeMinimalEventTypes>
+>[number]["team"]["eventTypes"][number];
+
+type EventType = Omit<MembershipEventType, "forwardParamsSuccessRedirect"> & {
+  children?: { id: number }[];
+  canSendCalVideoTranscriptionEmails?: boolean;
+};
+
+type EventTypeGroup = {
+  teamId?: number | null;
+  parentId?: number | null;
+  bookerUrl?: string;
+  profile: {
+    slug?: string | null;
+    name: string | null;
+    image?: string;
+    eventTypesLockedByOrg?: boolean;
+  };
+  eventTypes?: EventType[];
+};
+
+const fetchEventTypeGroups = async ({
+  ctx,
+  profile,
+  parentOrgHasLockedEventTypes,
+  skipEventTypes,
+  teamId,
+}: {
+  ctx: { user: NonNullable<TrpcSessionUser>; prisma: PrismaClient };
+  profile: NonNullable<Awaited<ReturnType<typeof ProfileRepository.findByUpId>>>;
+  parentOrgHasLockedEventTypes: boolean | undefined;
+  skipEventTypes: boolean;
+  teamId?: number;
+}): Promise<EventTypeGroup[]> => {
+  const user = ctx.user;
+  const userProfile = ctx.user.profile;
+  const eventTypeRepo = new EventTypeRepository(ctx.prisma);
+
+  const [profileMemberships, profileEventTypes] = await Promise.all([
+    MembershipRepository.findAllByUpIdIncludeMinimalEventTypes(
+      {
+        upId: userProfile.upId,
+      },
+      {
+        where: {
+          accepted: true,
+        },
+        skipEventTypes,
+      }
+    ),
+    teamId
+      ? []
+      : eventTypeRepo.findAllByUpIdWithMinimalData(
+          {
+            upId: userProfile.upId,
+            userId: user.id,
+          },
+          {
+            where: {
+              teamId: null,
+            },
+            orderBy: [
+              {
+                position: "desc",
+              },
+              {
+                id: "asc",
+              },
+            ],
+          }
+        ),
+  ]);
+
+  const memberships = profileMemberships.map((membership) => ({
+    ...membership,
+    team: {
+      ...membership.team,
+      metadata: teamMetadataSchema.parse(membership.team.metadata),
+    },
+  }));
+
+  const eventTypeGroups: EventTypeGroup[] = [];
+
+  // Add user's personal event types
+  eventTypeGroups.push({
+    teamId: null,
+    profile: {
+      slug: profile.username,
+      name: profile.name,
+      eventTypesLockedByOrg: parentOrgHasLockedEventTypes,
+    },
+    eventTypes: profileEventTypes as EventType[],
+  });
+
+  // Add team event types
+  const teamGroups = await Promise.all(
+    memberships
+      .filter((membership) => !membership?.team?.isOrganization)
+      .map(async (membership) => {
+        const team = {
+          ...membership.team,
+          metadata: teamMetadataSchema.parse(membership.team.metadata),
+        };
+
+        const eventTypes = team.eventTypes
+          ?.filter((evType) => evType.userId === null || evType.userId === user.id)
+          ?.filter((evType) =>
+            membership.role === MembershipRole.MEMBER
+              ? evType.schedulingType !== SchedulingType.MANAGED
+              : true
+          );
+
+        return {
+          teamId: team.id,
+          parentId: team.parentId,
+          profile: {
+            name: team.name,
+          },
+          eventTypes,
+        };
+      })
+  );
+
+  return eventTypeGroups.concat(teamGroups);
+};
+
+const fetchTeamOptions = async ({
+  ctx,
+  eventTypeGroups,
+  skipTeamOptions,
+}: {
+  ctx: { user: NonNullable<TrpcSessionUser>; prisma: PrismaClient };
+  eventTypeGroups: EventTypeGroup[];
+  skipTeamOptions: boolean;
+}): Promise<Option[]> => {
+  if (skipTeamOptions) {
+    return [];
+  }
+
+  const profileTeamsOptions = eventTypeGroups
+    .filter((group) => !!group.teamId)
+    .map((group) => ({
+      value: String(group.teamId),
+      label: group.profile.name || group.profile.slug || "",
+    }));
+
+  const otherTeams = await listOtherTeamHandler({ ctx });
+  const otherTeamsOptions = otherTeams
+    ? otherTeams.map((team) => ({
+        value: String(team.id),
+        label: team.name || team.slug || "",
+      }))
+    : [];
+
+  return profileTeamsOptions.concat(otherTeamsOptions);
+};
+
+const fetchRoutingFormOptions = async ({
+  userId,
+  teamId,
+}: {
+  userId: number;
+  teamId?: number;
+}): Promise<Option[]> => {
+  const routingForms = await PrismaRoutingFormRepository.findActiveFormsForUserOrTeam({ userId, teamId });
+
+  return routingForms.map((form) => ({
+    value: form.id,
+    label: form.name,
+  }));
+};
+
+export const getActiveOnOptions = async ({ ctx, input }: GetActiveOnOptions) => {
+  await checkRateLimitAndThrowError({
+    identifier: `eventTypes:getActiveOnOptions.handler:${ctx.user.id}`,
+    rateLimitingType: "common",
+  });
+
+  const user = ctx.user;
+  const teamId = input.teamId;
+  const isOrg = input.isOrg;
+
+  const shouldIncludeTeamOptions = isOrg;
+  const shouldSkipEventTypes = isOrg;
+
+  const userProfile = ctx.user.profile;
+  const profile = await ProfileRepository.findByUpId(userProfile.upId);
+  const parentOrgHasLockedEventTypes =
+    profile?.organization?.organizationSettings?.lockEventTypeCreationForUsers;
+
+  if (!profile) {
+    throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
+  }
+
+  const eventTypeGroups = await fetchEventTypeGroups({
+    ctx,
+    profile,
+    parentOrgHasLockedEventTypes,
+    skipEventTypes: shouldSkipEventTypes,
+    teamId,
+  });
+
+  const teamOptions = await fetchTeamOptions({
+    ctx,
+    eventTypeGroups,
+    skipTeamOptions: !shouldIncludeTeamOptions,
+  });
+
+  const eventTypeOptions = eventTypeGroups.reduce((options, group) => {
+    // Don't show team event types for user workflow
+    if (!teamId && group.teamId) return options;
+    // Only show correct team event types for team workflows
+    if (teamId && teamId !== group.teamId) return options;
+
+    const groupEventTypes =
+      group?.eventTypes
+        ?.filter((evType) => {
+          const metadata = EventTypeMetaDataSchema.parse(evType.metadata);
+          return (
+            !metadata?.managedEventConfig ||
+            !!metadata?.managedEventConfig.unlockedFields?.workflows ||
+            !!teamId
+          );
+        })
+        ?.map((eventType) => ({
+          value: String(eventType.id),
+          label: `${eventType.title}${
+            eventType?.children && eventType.children.length ? ` (+${eventType.children.length})` : ""
+          }`,
+        })) ?? [];
+
+    return [...options, ...groupEventTypes];
+  }, [] as Option[]);
+
+  const routingFormOptions = await fetchRoutingFormOptions({
+    userId: user.id,
+    teamId,
+  });
+
+  return {
+    eventTypeOptions,
+    teamOptions,
+    routingFormOptions,
+  };
+};
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.schema.ts b/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.schema.ts
new file mode 100644
index 00000000000000..6872e87830cd26
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/eventTypes/getActiveOnOptions.schema.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const ZGetActiveOnOptionsSchema = z.object({
+  teamId: z.number().optional(),
+  isOrg: z.boolean().default(false),
+});
+
+export type TGetActiveOnOptionsSchema = z.infer<typeof ZGetActiveOnOptionsSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts
index 853f3edd39c72c..9c92be1b29f8cc 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts
@@ -1,7 +1,7 @@
 import { hasFilter } from "@calcom/features/filters/lib/hasFilter";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import logger from "@calcom/lib/logger";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { prisma } from "@calcom/prisma";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts
index c81374fd115883..25544d25a44781 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts
@@ -1,5 +1,5 @@
-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
 import type { PrismaClient } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts
index 53996fa30af203..7c783b4773d253 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts
@@ -1,5 +1,5 @@
-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
 import type { PrismaClient } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.handler.ts
deleted file mode 100644
index f373329a28c370..00000000000000
--- a/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.handler.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import type { PrismaClient } from "@calcom/prisma";
-import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
-import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
-
-import { TRPCError } from "@trpc/server";
-
-import type { TrpcSessionUser } from "../../../types";
-import { listOtherTeamHandler } from "../organizations/listOtherTeams.handler";
-import type { TGetTeamAndEventTypeOptionsSchema } from "./getTeamAndEventTypeOptions.schema";
-
-type GetTeamAndEventTypeOptions = {
-  ctx: {
-    user: NonNullable<TrpcSessionUser>;
-    prisma: PrismaClient;
-  };
-  input: TGetTeamAndEventTypeOptionsSchema;
-};
-
-type Option = {
-  value: string;
-  label: string;
-};
-
-type res = Awaited<
-  ReturnType<typeof MembershipRepository.findAllByUpIdIncludeMinimalEventTypes>
->[number]["team"]["eventTypes"][number];
-
-type EventType = Omit<res, "forwardParamsSuccessRedirect"> & {
-  children?: { id: number }[];
-  canSendCalVideoTranscriptionEmails?: boolean;
-};
-
-export const getTeamAndEventTypeOptions = async ({ ctx, input }: GetTeamAndEventTypeOptions) => {
-  await checkRateLimitAndThrowError({
-    identifier: `eventTypes:getTeamAndEventTypeOptions.handler:${ctx.user.id}`,
-    rateLimitingType: "common",
-  });
-
-  const user = ctx.user;
-  const teamId = input?.teamId;
-  const isOrg = input?.isOrg;
-
-  const skipTeamOptions = !isOrg;
-  const skipEventTypes = !!isOrg;
-
-  const userProfile = ctx.user.profile;
-  const profile = await ProfileRepository.findByUpId(userProfile.upId);
-  const parentOrgHasLockedEventTypes =
-    profile?.organization?.organizationSettings?.lockEventTypeCreationForUsers;
-
-  const eventTypeRepo = new EventTypeRepository(ctx.prisma);
-  const [profileMemberships, profileEventTypes] = await Promise.all([
-    MembershipRepository.findAllByUpIdIncludeMinimalEventTypes(
-      {
-        upId: userProfile.upId,
-      },
-      {
-        where: {
-          accepted: true,
-        },
-        skipEventTypes,
-      }
-    ),
-    teamId
-      ? []
-      : eventTypeRepo.findAllByUpIdWithMinimalData(
-          {
-            upId: userProfile.upId,
-            userId: user.id,
-          },
-          {
-            where: {
-              teamId: null,
-            },
-            orderBy: [
-              {
-                position: "desc",
-              },
-              {
-                id: "asc",
-              },
-            ],
-          }
-        ),
-  ]);
-
-  if (!profile) {
-    throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
-  }
-
-  const memberships = profileMemberships.map((membership) => ({
-    ...membership,
-    team: {
-      ...membership.team,
-      metadata: teamMetadataSchema.parse(membership.team.metadata),
-    },
-  }));
-
-  type EventTypeGroup = {
-    teamId?: number | null;
-    parentId?: number | null;
-    bookerUrl?: string;
-    profile: {
-      slug?: (typeof profile)["username"] | null;
-      name: (typeof profile)["name"];
-      image?: string;
-      eventTypesLockedByOrg?: boolean;
-    };
-    eventTypes?: EventType[];
-  };
-
-  let eventTypeGroups: EventTypeGroup[] = [];
-
-  eventTypeGroups.push({
-    teamId: null,
-    profile: {
-      slug: profile.username,
-      name: profile.name,
-      eventTypesLockedByOrg: parentOrgHasLockedEventTypes,
-    },
-    eventTypes: profileEventTypes as EventType[],
-  });
-
-  eventTypeGroups = ([] as EventTypeGroup[]).concat(
-    eventTypeGroups,
-    await Promise.all(
-      memberships
-        .filter((mmship) => {
-          if (mmship?.team?.isOrganization) {
-            return false;
-          }
-          return true;
-        })
-        .map(async (membership) => {
-          const team = {
-            ...membership.team,
-            metadata: teamMetadataSchema.parse(membership.team.metadata),
-          };
-
-          const eventTypes = team.eventTypes;
-          return {
-            teamId: team.id,
-            parentId: team.parentId,
-            profile: {
-              name: team.name,
-            },
-            eventTypes: eventTypes
-              ?.filter((evType) => {
-                const res = evType.userId === null || evType.userId === user.id;
-                return res;
-              })
-              ?.filter((evType) =>
-                membership.role === MembershipRole.MEMBER
-                  ? evType.schedulingType !== SchedulingType.MANAGED
-                  : true
-              ),
-          };
-        })
-    )
-  );
-
-  let teamOptions: Option[] = [];
-
-  if (!skipTeamOptions) {
-    const profileTeamsOptions = eventTypeGroups
-      .map((group) => ({
-        ...group.profile,
-        teamId: group.teamId,
-      }))
-      .filter((profile) => !!profile.teamId)
-      .map((profile) => {
-        return {
-          value: String(profile.teamId) || "",
-          label: profile.name || profile.slug || "",
-        };
-      });
-
-    const otherTeams = await listOtherTeamHandler({ ctx });
-    const otherTeamsOptions = otherTeams
-      ? otherTeams.map((team) => {
-          return {
-            value: String(team.id) || "",
-            label: team.name || team.slug || "",
-          };
-        })
-      : [];
-
-    teamOptions = profileTeamsOptions.concat(otherTeamsOptions);
-  }
-
-  const eventTypeOptions =
-    eventTypeGroups.reduce((options, group) => {
-      //       /** don't show team event types for user workflow */
-      if (!teamId && group.teamId) return options;
-      //       /** only show correct team event types for team workflows */
-      if (teamId && teamId !== group.teamId) return options;
-
-      return [
-        ...options,
-        ...(group?.eventTypes
-          ?.filter((evType) => {
-            const metadata = EventTypeMetaDataSchema.parse(evType.metadata);
-            return (
-              !metadata?.managedEventConfig ||
-              !!metadata?.managedEventConfig.unlockedFields?.workflows ||
-              !!teamId
-            );
-          })
-          ?.map((eventType) => ({
-            value: String(eventType.id),
-            label: `${eventType.title} ${
-              eventType?.children && eventType.children.length ? `(+${eventType.children.length})` : ``
-            }`,
-          })) ?? []),
-      ];
-    }, [] as Option[]) || [];
-
-  return {
-    eventTypeOptions,
-    teamOptions,
-  };
-};
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.schema.ts b/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.schema.ts
deleted file mode 100644
index 7119179cfa7e8f..00000000000000
--- a/packages/trpc/server/routers/viewer/eventTypes/getTeamAndEventTypeOptions.schema.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { z } from "zod";
-
-export const ZGetTeamAndEventTypeOptionsSchema = z
-  .object({
-    teamId: z.number().optional(),
-    isOrg: z.boolean().default(false),
-  })
-  .nullish();
-
-export type TGetTeamAndEventTypeOptionsSchema = z.infer<typeof ZGetTeamAndEventTypeOptionsSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getUserEventGroups.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getUserEventGroups.handler.ts
index 26acbfc3fc5778..1d2a82c7b1b2e1 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getUserEventGroups.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getUserEventGroups.handler.ts
@@ -1,7 +1,7 @@
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
index d1ab682fc2a23a..509e7dfa2de62b 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
 import { getDefaultLocations } from "@calcom/app-store/_utils/getDefaultLocations";
 import { DailyLocationType } from "@calcom/app-store/constants";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.test.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.test.ts
index c6b05becd59b69..d99004bf01a7b7 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.test.ts
@@ -10,7 +10,7 @@ import { duplicateHandler } from "./duplicate.handler";
 vi.mock("@calcom/prisma", () => ({
   default: prismaMock,
 }));
-vi.mock("@calcom/lib/server/repository/eventTypeRepository");
+vi.mock("@calcom/features/eventtypes/repositories/eventTypeRepository");
 
 describe("duplicateHandler", () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -24,7 +24,9 @@ describe("duplicateHandler", () => {
   });
 
   it("should throw BAD_REQUEST in case of unique constraint violation", async () => {
-    const { EventTypeRepository } = await import("@calcom/lib/server/repository/eventTypeRepository");
+    const { EventTypeRepository } = await import(
+      "@calcom/features/eventtypes/repositories/eventTypeRepository"
+    );
     vi.mocked(EventTypeRepository).mockImplementation(
       () =>
         ({
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.ts
index 8a1af0bd0e2cec..bf26c9c6c23c19 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/duplicate.handler.ts
@@ -1,6 +1,6 @@
 import { generateHashedLink } from "@calcom/lib/generateHashedLink";
 import { CalVideoSettingsRepository } from "@calcom/lib/server/repository/calVideoSettings";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { prisma } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
index 2868f017ae2d50..ec23c4e1d01366 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
@@ -8,15 +8,15 @@ import {
   allowDisablingAttendeeConfirmationEmails,
   allowDisablingHostConfirmationEmails,
 } from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import tasker from "@calcom/features/tasker";
 import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { CalVideoSettingsRepository } from "@calcom/lib/server/repository/calVideoSettings";
-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
 import { ScheduleRepository } from "@calcom/lib/server/repository/schedule";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
 import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
 import type { PrismaClient } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts b/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
index 0f8c47a3d5cf94..4d4fcf34c48d12 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
@@ -1,5 +1,5 @@
-import type { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import type { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import type { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import type { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
 import type { TeamAccessUseCase } from "../teamAccessUseCase";
diff --git a/packages/trpc/server/routers/viewer/eventTypes/util.ts b/packages/trpc/server/routers/viewer/eventTypes/util.ts
index db92c61e500177..aba7dab84be33c 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/util.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/util.ts
@@ -3,8 +3,8 @@ import { z } from "zod";
 import type { PermissionString } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
-import type { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { MembershipRole } from "@calcom/prisma/enums";
 import { PeriodType } from "@calcom/prisma/enums";
@@ -274,13 +274,25 @@ export function ensureEmailOrPhoneNumberIsPresent(fields: TUpdateInputSchema["bo
   if (emailField?.hidden && attendeePhoneNumberField?.hidden) {
     throw new TRPCError({
       code: "BAD_REQUEST",
-      message: `Both Email and Attendee Phone Number cannot be hidden`,
+      message: "booking_fields_email_and_phone_both_hidden",
     });
   }
   if (!emailField?.required && !attendeePhoneNumberField?.required) {
     throw new TRPCError({
       code: "BAD_REQUEST",
-      message: `At least Email or Attendee Phone Number need to be required field.`,
+      message: "booking_fields_email_or_phone_required",
+    });
+  }
+  if (emailField?.hidden && !attendeePhoneNumberField?.required) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "booking_fields_phone_required_when_email_hidden",
+    });
+  }
+  if (attendeePhoneNumberField?.hidden && !emailField?.required) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "booking_fields_email_required_when_phone_hidden",
     });
   }
 }
diff --git a/packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts b/packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts
index f4dc09403740c0..fc7b32415f6cca 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/utils/transformUtils.ts
@@ -1,7 +1,7 @@
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import type { MembershipRole } from "@calcom/prisma/enums";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
diff --git a/packages/trpc/server/routers/viewer/filterSegments/_router.tsx b/packages/trpc/server/routers/viewer/filterSegments/_router.tsx
index 8d5a4fdb0aa7a3..53a6fefa19898b 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/_router.tsx
+++ b/packages/trpc/server/routers/viewer/filterSegments/_router.tsx
@@ -4,7 +4,7 @@ import {
   ZListFilterSegmentsInputSchema,
   ZSetFilterSegmentPreferenceInputSchema,
   ZUpdateFilterSegmentInputSchema,
-} from "@calcom/lib/server/repository/filterSegment.type";
+} from "@calcom/features/data-table/repositories/filterSegment.type";
 
 import authedProcedure from "../../../procedures/authedProcedure";
 import { router } from "../../../trpc";
diff --git a/packages/trpc/server/routers/viewer/filterSegments/create.handler.ts b/packages/trpc/server/routers/viewer/filterSegments/create.handler.ts
index 2fe0fda16862d3..376efd87760bf9 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/filterSegments/create.handler.ts
@@ -1,5 +1,5 @@
-import { FilterSegmentRepository } from "@calcom/lib/server/repository/filterSegment";
-import type { TCreateFilterSegmentInputSchema } from "@calcom/lib/server/repository/filterSegment.type";
+import { FilterSegmentRepository } from "@calcom/features/data-table/repositories/filterSegment";
+import type { TCreateFilterSegmentInputSchema } from "@calcom/features/data-table/repositories/filterSegment.type";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 export const createFilterSegmentHandler = async ({
diff --git a/packages/trpc/server/routers/viewer/filterSegments/delete.handler.ts b/packages/trpc/server/routers/viewer/filterSegments/delete.handler.ts
index e0bfa97ca9a0e7..be76c93d25d389 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/filterSegments/delete.handler.ts
@@ -1,5 +1,5 @@
-import { FilterSegmentRepository } from "@calcom/lib/server/repository/filterSegment";
-import type { TDeleteFilterSegmentInputSchema } from "@calcom/lib/server/repository/filterSegment.type";
+import { FilterSegmentRepository } from "@calcom/features/data-table/repositories/filterSegment";
+import type { TDeleteFilterSegmentInputSchema } from "@calcom/features/data-table/repositories/filterSegment.type";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 export const deleteFilterSegmentHandler = async ({
diff --git a/packages/trpc/server/routers/viewer/filterSegments/list.handler.ts b/packages/trpc/server/routers/viewer/filterSegments/list.handler.ts
index a70aa1af2a294f..fa1c76c1637b7e 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/filterSegments/list.handler.ts
@@ -1,5 +1,5 @@
-import { FilterSegmentRepository } from "@calcom/lib/server/repository/filterSegment";
-import type { TListFilterSegmentsInputSchema } from "@calcom/lib/server/repository/filterSegment.type";
+import { FilterSegmentRepository } from "@calcom/features/data-table/repositories/filterSegment";
+import type { TListFilterSegmentsInputSchema } from "@calcom/features/data-table/repositories/filterSegment.type";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 export const listHandler = async ({
diff --git a/packages/trpc/server/routers/viewer/filterSegments/preference.handler.ts b/packages/trpc/server/routers/viewer/filterSegments/preference.handler.ts
index 5da5763d2c49c9..0791bd88998eb4 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/preference.handler.ts
+++ b/packages/trpc/server/routers/viewer/filterSegments/preference.handler.ts
@@ -1,5 +1,5 @@
-import { FilterSegmentRepository } from "@calcom/lib/server/repository/filterSegment";
-import type { TSetFilterSegmentPreferenceInputSchema } from "@calcom/lib/server/repository/filterSegment.type";
+import { FilterSegmentRepository } from "@calcom/features/data-table/repositories/filterSegment";
+import type { TSetFilterSegmentPreferenceInputSchema } from "@calcom/features/data-table/repositories/filterSegment.type";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 export const setFilterSegmentPreferenceHandler = async ({
diff --git a/packages/trpc/server/routers/viewer/filterSegments/update.handler.ts b/packages/trpc/server/routers/viewer/filterSegments/update.handler.ts
index 970ccac748f7a6..a4dab51f78242b 100644
--- a/packages/trpc/server/routers/viewer/filterSegments/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/filterSegments/update.handler.ts
@@ -1,5 +1,5 @@
-import { FilterSegmentRepository } from "@calcom/lib/server/repository/filterSegment";
-import type { TUpdateFilterSegmentInputSchema } from "@calcom/lib/server/repository/filterSegment.type";
+import { FilterSegmentRepository } from "@calcom/features/data-table/repositories/filterSegment";
+import type { TUpdateFilterSegmentInputSchema } from "@calcom/features/data-table/repositories/filterSegment.type";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 export const updateFilterSegmentHandler = async ({
diff --git a/packages/trpc/server/routers/viewer/me/deleteMe.handler.ts b/packages/trpc/server/routers/viewer/me/deleteMe.handler.ts
index b3f2c881626c04..170ca94cdbca17 100644
--- a/packages/trpc/server/routers/viewer/me/deleteMe.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/deleteMe.handler.ts
@@ -1,6 +1,6 @@
 import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
 import { verifyPassword } from "@calcom/features/auth/lib/verifyPassword";
-import { deleteUser } from "@calcom/features/users/lib/userDeletionService";
+import { deleteUser } from "@calcom/features/users/lib/deleteUser";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import { HttpError } from "@calcom/lib/http-error";
 import { totpAuthenticatorCheck } from "@calcom/lib/totp";
diff --git a/packages/trpc/server/routers/viewer/me/get.handler.ts b/packages/trpc/server/routers/viewer/me/get.handler.ts
index b25f9228a76924..e860c01a10ba83 100644
--- a/packages/trpc/server/routers/viewer/me/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/get.handler.ts
@@ -1,8 +1,8 @@
 import type { Session } from "next-auth";
 
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums";
 import { userMetadata } from "@calcom/prisma/zod-utils";
@@ -140,6 +140,7 @@ export const getHandler = async ({ ctx, input }: MeOptions) => {
     allowDynamicBooking: user.allowDynamicBooking,
     allowSEOIndexing: user.allowSEOIndexing,
     receiveMonthlyDigestEmail: user.receiveMonthlyDigestEmail,
+    requiresBookerEmailVerification: user.requiresBookerEmailVerification,
     ...profileData,
     secondaryEmails,
     isPremium: userMetadataPrased?.isPremium,
diff --git a/packages/trpc/server/routers/viewer/me/myStats.handler.ts b/packages/trpc/server/routers/viewer/me/myStats.handler.ts
index 40c8ba6dea4910..4238c859893790 100644
--- a/packages/trpc/server/routers/viewer/me/myStats.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/myStats.handler.ts
@@ -1,6 +1,6 @@
 import type { Session } from "next-auth";
 
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/me/platformMe.handler.ts b/packages/trpc/server/routers/viewer/me/platformMe.handler.ts
index ea771010acfd62..15436e296cb7cd 100644
--- a/packages/trpc/server/routers/viewer/me/platformMe.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/platformMe.handler.ts
@@ -1,6 +1,6 @@
 import type { Session } from "next-auth";
 
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 type MeOptions = {
diff --git a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
index b6ba852f8fc8b0..2056a038dc21eb 100644
--- a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
@@ -4,15 +4,15 @@ import type { GetServerSidePropsContext, NextApiResponse } from "next";
 
 import { getPremiumMonthlyPlanPriceId } from "@calcom/app-store/stripepayment/lib/utils";
 import { sendChangeOfEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
-import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billling-service";
+import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
+import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { uploadAvatar } from "@calcom/lib/server/avatar";
-import { checkUsername } from "@calcom/lib/server/checkUsername";
+import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";
 import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
 import slugify from "@calcom/lib/slugify";
 import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
diff --git a/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts b/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
index c3c75b1b625d81..9fd19441e44f45 100644
--- a/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
+++ b/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
@@ -21,6 +21,7 @@ export const ZUpdateProfileInputSchema = z.object({
   allowDynamicBooking: z.boolean().optional(),
   allowSEOIndexing: z.boolean().optional(),
   receiveMonthlyDigestEmail: z.boolean().optional(),
+  requiresBookerEmailVerification: z.boolean().optional(),
   brandColor: z.string().optional(),
   darkBrandColor: z.string().optional(),
   theme: z.string().optional().nullable(),
diff --git a/packages/trpc/server/routers/viewer/organizations/__tests__/createTeams.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/__tests__/createTeams.handler.test.ts
index 0f96c23825cfff..4d826925c84fcf 100644
--- a/packages/trpc/server/routers/viewer/organizations/__tests__/createTeams.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/__tests__/createTeams.handler.test.ts
@@ -311,7 +311,6 @@ describe("createTeams handler", () => {
     // Verify platform team was not moved
     const platformTeam = await prismock.team.findFirst({
       where: { name: "Platform Team" },
-      // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
       include: { parent: true },
     });
 
@@ -423,4 +422,55 @@ describe("createTeams handler", () => {
     const redirectsWithNullFrom = redirects.filter((redirect) => redirect.from === null);
     expect(redirectsWithNullFrom).toHaveLength(0);
   });
+
+  it("should transfer credits from team to organization when moving team", async () => {
+    const { owner, organization, teams } = await createScenario({
+      teams: [{ name: "Team With Credits", slug: "team-with-credits", addToParentId: null }],
+    });
+
+    const teamToMove = teams[0];
+
+    // Add credits to the team before moving
+    await prismock.creditBalance.create({
+      data: {
+        teamId: teamToMove.id,
+        additionalCredits: 500,
+        limitReachedAt: null,
+        warningSentAt: null,
+      },
+    });
+
+    const result = await createTeamsHandler({
+      ctx: {
+        user: {
+          id: owner.id,
+          organizationId: organization.id,
+        },
+      },
+      input: {
+        teamNames: [],
+        orgId: organization.id,
+        moveTeams: [
+          {
+            id: teamToMove.id,
+            shouldMove: true,
+            newSlug: "moved-team-with-credits",
+          },
+        ],
+        creationSource: CreationSource.WEBAPP,
+      },
+    });
+
+    expect(result).toEqual({ duplicatedSlugs: [] });
+
+    const teamCreditBalance = await prismock.creditBalance.findFirst({
+      where: { teamId: teamToMove.id },
+    });
+    expect(teamCreditBalance?.additionalCredits).toBe(0);
+
+    const orgCreditBalance = await prismock.creditBalance.findFirst({
+      where: { teamId: organization.id },
+    });
+    expect(orgCreditBalance?.additionalCredits).toBe(500);
+  });
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/_router.tsx b/packages/trpc/server/routers/viewer/organizations/_router.tsx
index 87f29de4ffeb76..e049e041e20b2e 100644
--- a/packages/trpc/server/routers/viewer/organizations/_router.tsx
+++ b/packages/trpc/server/routers/viewer/organizations/_router.tsx
@@ -17,14 +17,18 @@ import { ZBulkUsersDelete } from "./bulkDeleteUsers.schema.";
 import { ZCreateInputSchema } from "./create.schema";
 import { ZCreateSelfHostedInputSchema } from "./createSelfHosted.schema";
 import { ZCreateTeamsSchema } from "./createTeams.schema";
+import { ZCreateWatchlistEntryInputSchema } from "./createWatchlistEntry.schema";
 import { ZCreateWithPaymentIntentInputSchema } from "./createWithPaymentIntent.schema";
 import { ZDeleteTeamInputSchema } from "./deleteTeam.schema";
+import { ZDeleteWatchlistEntryInputSchema } from "./deleteWatchlistEntry.schema";
 import { ZGetMembersInput } from "./getMembers.schema";
 import { ZGetOtherTeamInputSchema } from "./getOtherTeam.handler";
 import { ZGetUserInput } from "./getUser.schema";
+import { ZGetWatchlistEntryDetailsInputSchema } from "./getWatchlistEntryDetails.schema";
 import { ZIntentToCreateOrgInputSchema } from "./intentToCreateOrg.schema";
 import { ZListMembersInputSchema } from "./listMembers.schema";
 import { ZListOtherTeamMembersSchema } from "./listOtherTeamMembers.handler";
+import { ZListWatchlistEntriesInputSchema } from "./listWatchlistEntries.schema";
 import { ZRemoveHostsFromEventTypes } from "./removeHostsFromEventTypes.schema";
 import { ZSetPasswordSchema } from "./setPassword.schema";
 import { ZUpdateInputSchema } from "./update.schema";
@@ -163,4 +167,29 @@ export const viewerOrganizationsRouter = router({
     const { default: handler } = await import("./createSelfHosted.handler");
     return handler(opts);
   }),
+  listWatchlistEntries: authedOrgAdminProcedure
+    .input(ZListWatchlistEntriesInputSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./listWatchlistEntries.handler");
+      return handler(opts);
+    }),
+  createWatchlistEntry: authedOrgAdminProcedure
+    .input(ZCreateWatchlistEntryInputSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./createWatchlistEntry.handler");
+      return handler(opts);
+    }),
+  deleteWatchlistEntry: authedOrgAdminProcedure
+    .input(ZDeleteWatchlistEntryInputSchema)
+    .mutation(async (opts) => {
+      const { default: handler } = await import("./deleteWatchlistEntry.handler");
+      return handler(opts);
+    }),
+  getWatchlistEntryDetails: authedOrgAdminProcedure
+    .input(ZGetWatchlistEntryDetailsInputSchema)
+    .query(async (opts) => {
+      const { default: handler } = await import("./getWatchlistEntryDetails.handler");
+      return handler(opts);
+    }),
+
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
index 7f23ab6b04bf25..9fb740b782d22c 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminGet.handler.ts
@@ -1,4 +1,4 @@
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
 import type { TrpcSessionUser } from "../../../types";
 import type { TAdminGet } from "./adminGet.schema";
diff --git a/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts b/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
index d6ed73327c43a0..8444e4d5e784eb 100644
--- a/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/adminVerify.handler.ts
@@ -1,4 +1,4 @@
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/organizations/bulkDeleteUsers.handler.ts b/packages/trpc/server/routers/viewer/organizations/bulkDeleteUsers.handler.ts
index 694cede6bc4c95..79010b0ab9b46f 100644
--- a/packages/trpc/server/routers/viewer/organizations/bulkDeleteUsers.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/bulkDeleteUsers.handler.ts
@@ -1,7 +1,7 @@
 import { TeamBilling } from "@calcom/ee/billing/teams";
 import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/packages/trpc/server/routers/viewer/organizations/create.handler.ts b/packages/trpc/server/routers/viewer/organizations/create.handler.ts
index b4bb25507cac20..5b0f09d929beb4 100644
--- a/packages/trpc/server/routers/viewer/organizations/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/create.handler.ts
@@ -1,6 +1,7 @@
 import { lookup } from "dns";
 
 import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
+import { isNotACompanyEmail } from "@calcom/ee/organizations/lib/server/orgCreationUtils";
 import { sendAdminOrganizationNotification, sendOrganizationCreationEmail } from "@calcom/emails";
 import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
 import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
@@ -12,8 +13,8 @@ import {
 } from "@calcom/lib/constants";
 import { createDomain } from "@calcom/lib/domainManager/organization";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import { UserPermissionRole } from "@calcom/prisma/enums";
 
@@ -23,47 +24,6 @@ import type { TrpcSessionUser } from "../../../types";
 import { BillingPeriod } from "./create.schema";
 import type { TCreateInputSchema } from "./create.schema";
 
-/**
- * We can only say for sure that the email is not a company email. We can't say for sure if it is a company email.
- */
-function isNotACompanyEmail(email: string) {
-  // A list of popular @domains that can't be used to allow automatic acceptance of memberships to organization
-  const emailProviders = [
-    "gmail.com",
-    "yahoo.com",
-    "outlook.com",
-    "hotmail.com",
-    "aol.com",
-    "icloud.com",
-    "mail.com",
-    "protonmail.com",
-    "zoho.com",
-    "yandex.com",
-    "gmx.com",
-    "fastmail.com",
-    "inbox.com",
-    "me.com",
-    "hushmail.com",
-    "live.com",
-    "rediffmail.com",
-    "tutanota.com",
-    "mail.ru",
-    "usa.com",
-    "qq.com",
-    "163.com",
-    "web.de",
-    "rocketmail.com",
-    "excite.com",
-    "lycos.com",
-    "outlook.co",
-    "hotmail.co.uk",
-  ];
-
-  const emailParts = email.split("@");
-  if (emailParts.length < 2) return true;
-  return emailProviders.includes(emailParts[1]);
-}
-
 type CreateOptions = {
   ctx: {
     user: NonNullable<TrpcSessionUser>;
diff --git a/packages/trpc/server/routers/viewer/organizations/createSelfHosted.handler.ts b/packages/trpc/server/routers/viewer/organizations/createSelfHosted.handler.ts
index 5374315d9f20f9..6a3b418be6da94 100644
--- a/packages/trpc/server/routers/viewer/organizations/createSelfHosted.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/createSelfHosted.handler.ts
@@ -1,4 +1,4 @@
-import { createOrganizationFromOnboarding } from "@calcom/features/ee/organizations/lib/server/createOrganizationFromOnboarding";
+import { SelfHostedOrganizationOnboardingService } from "@calcom/features/ee/organizations/lib/service/onboarding/SelfHostedOnboardingService";
 import { IS_SELF_HOSTED } from "@calcom/lib/constants";
 import { OrganizationOnboardingRepository } from "@calcom/lib/server/repository/organizationOnboarding";
 
@@ -45,24 +45,32 @@ export const createSelfHostedHandler = async ({ input, ctx }: CreateSelfHostedOp
     });
   }
 
-  const { organization } = await createOrganizationFromOnboarding({
-    organizationOnboarding: {
-      id: input.onboardingId,
-      logo: input.logo ?? null,
-      bio: input.bio ?? null,
-      invitedMembers: input.invitedMembers ?? [],
-      teams: input.teams ?? [],
-      orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
-      slug: organizationOnboarding.slug,
-      name: organizationOnboarding.name,
-      billingPeriod: organizationOnboarding.billingPeriod,
-      seats: organizationOnboarding.seats,
-      pricePerSeat: organizationOnboarding.pricePerSeat,
-      stripeCustomerId: organizationOnboarding.stripeCustomerId,
-      isPlatform: organizationOnboarding.isPlatform,
-      isDomainConfigured: organizationOnboarding.isDomainConfigured,
-      organizationId: organizationOnboarding.organizationId,
-    },
+  const userContext = {
+    id: ctx.user.id,
+    email: ctx.user.email,
+    role: ctx.user.role as "ADMIN" | "USER",
+    name: ctx.user.name || undefined,
+  };
+
+  const onboardingService = new SelfHostedOrganizationOnboardingService(userContext);
+  const { organization } = await onboardingService.createOrganization({
+    id: input.onboardingId,
+    logo: input.logo ?? null,
+    bio: input.bio ?? null,
+    brandColor: input.brandColor ?? null,
+    bannerUrl: input.bannerUrl ?? null,
+    invitedMembers: input.invitedMembers ?? [],
+    teams: input.teams ?? [],
+    orgOwnerEmail: organizationOnboarding.orgOwnerEmail,
+    slug: organizationOnboarding.slug,
+    name: organizationOnboarding.name,
+    billingPeriod: organizationOnboarding.billingPeriod,
+    seats: organizationOnboarding.seats,
+    pricePerSeat: organizationOnboarding.pricePerSeat,
+    stripeCustomerId: organizationOnboarding.stripeCustomerId,
+    isPlatform: organizationOnboarding.isPlatform,
+    isDomainConfigured: organizationOnboarding.isDomainConfigured,
+    organizationId: organizationOnboarding.organizationId,
   });
 
   await OrganizationOnboardingRepository.markAsComplete(organizationOnboarding.id);
diff --git a/packages/trpc/server/routers/viewer/organizations/createTeams.handler.ts b/packages/trpc/server/routers/viewer/organizations/createTeams.handler.ts
index a6a93a7792ec8e..b008162c38acf3 100644
--- a/packages/trpc/server/routers/viewer/organizations/createTeams.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/createTeams.handler.ts
@@ -1,9 +1,10 @@
 import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
+import { CreditService } from "@calcom/features/ee/billing/credit-service";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
@@ -230,6 +231,9 @@ async function moveTeam({
         parentId: org.id,
       },
     });
+
+    const creditService = new CreditService();
+    await creditService.moveCreditsFromTeamToOrg({ teamId, orgId: org.id });
   } catch (error) {
     log.error(
       "Error while moving team to organization",
diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
new file mode 100644
index 00000000000000..90ab3552234e26
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.test.ts
@@ -0,0 +1,303 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { WatchlistType, WatchlistAction, MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import { createWatchlistEntryHandler } from "./createWatchlistEntry.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("createWatchlistEntryHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    createEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: { ...(mockUser as any), organizationId: undefined, profile: null } },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "spam@example.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to manage blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser as any },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "spam@example.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to create blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.create",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw BAD_REQUEST for invalid email format", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser as any },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "invalid-email",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid email address format",
+      });
+
+      expect(mockWatchlistRepo.createEntry).not.toHaveBeenCalled();
+    });
+
+    it("should throw BAD_REQUEST for email missing @ symbol", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser as any },
+          input: {
+            type: WatchlistType.EMAIL,
+            value: "notanemail.com",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "BAD_REQUEST",
+        message: "Invalid email address format",
+      });
+    });
+
+    it("should accept valid domain format without @", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.DOMAIN,
+          value: "example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalled();
+    });
+
+    it("should throw BAD_REQUEST for domain with invalid format", async () => {
+      await expect(
+        createWatchlistEntryHandler({
+          ctx: { user: mockUser as any },
+          input: {
+            type: WatchlistType.DOMAIN,
+            value: "invalid..domain",
+          },
+        })
+      ).rejects.toStrictEqual(
+        new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Invalid domain format (e.g., example.com)",
+        })
+      );
+    });
+
+    it("should accept valid email format", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "valid@example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalled();
+    });
+
+    it("should accept valid domain format and normalize it", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-1" });
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.DOMAIN,
+          value: "example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith(
+        expect.objectContaining({
+          value: "example.com",
+        })
+      );
+    });
+  });
+
+  describe("successful creation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should create watchlist entry for EMAIL type", async () => {
+      const mockEntry = {
+        id: "watchlist-1",
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+      };
+      mockWatchlistRepo.createEntry.mockResolvedValue(mockEntry);
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "spam@example.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.entry).toEqual(mockEntry);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should create watchlist entry for DOMAIN type and normalize it", async () => {
+      const mockEntry = {
+        id: "watchlist-2",
+        type: WatchlistType.DOMAIN,
+        value: "spammer.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+      };
+      mockWatchlistRepo.createEntry.mockResolvedValue(mockEntry);
+
+      const result = await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.DOMAIN,
+          value: "spammer.com",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.entry).toEqual(mockEntry);
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.DOMAIN,
+        value: "spammer.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should convert value to lowercase", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-4" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "SPAM@EXAMPLE.COM",
+        },
+      });
+
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith({
+        type: WatchlistType.EMAIL,
+        value: "spam@example.com",
+        organizationId: 100,
+        action: WatchlistAction.BLOCK,
+        description: undefined,
+        userId: 1,
+      });
+    });
+
+    it("should always set action to BLOCK", async () => {
+      mockWatchlistRepo.createEntry.mockResolvedValue({ id: "watchlist-5" });
+
+      await createWatchlistEntryHandler({
+        ctx: { user: mockUser as any },
+        input: {
+          type: WatchlistType.EMAIL,
+          value: "test@example.com",
+        },
+      });
+
+      expect(mockWatchlistRepo.createEntry).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action: WatchlistAction.BLOCK,
+        })
+      );
+    });
+  });
+});
diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
new file mode 100644
index 00000000000000..8b9acabc7203b5
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.handler.ts
@@ -0,0 +1,86 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { domainRegex, emailRegex } from "@calcom/lib/emailSchema";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole, WatchlistAction } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TCreateWatchlistEntryInputSchema } from "./createWatchlistEntry.schema";
+
+type CreateWatchlistEntryOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TCreateWatchlistEntryInputSchema;
+};
+
+export const createWatchlistEntryHandler = async ({ ctx, input }: CreateWatchlistEntryOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.create",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to create blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  if (input.type === "EMAIL" && !emailRegex.test(input.value)) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "Invalid email address format",
+    });
+  }
+
+  if (input.type === "DOMAIN" && !domainRegex.test(input.value)) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: "Invalid domain format (e.g., example.com)",
+    });
+  }
+
+  try {
+    const entry = await watchlistRepo.createEntry({
+      type: input.type,
+      value: input.value.toLowerCase(),
+      organizationId,
+      action: WatchlistAction.BLOCK,
+      description: input.description,
+      userId: user.id,
+    });
+
+    return {
+      success: true,
+      entry,
+    };
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("already exists")) {
+      throw new TRPCError({
+        code: "BAD_REQUEST",
+        message: "This entry already exists in the blocklist for your organization",
+      });
+    }
+    throw error;
+  }
+};
+
+export default createWatchlistEntryHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
new file mode 100644
index 00000000000000..763f803e001d47
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/createWatchlistEntry.schema.ts
@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+export const ZCreateWatchlistEntryInputSchema = z.object({
+  type: z.nativeEnum(WatchlistType),
+  value: z.string().min(1).max(255),
+  description: z.string().optional(),
+});
+
+export type TCreateWatchlistEntryInputSchema = z.infer<typeof ZCreateWatchlistEntryInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.handler.ts b/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.handler.ts
index 3bc6fff30d88de..03303d271a8e4d 100644
--- a/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.handler.ts
@@ -1,3 +1,12 @@
+/**
+ * @deprecated This endpoint is deprecated. Use `intentToCreateOrg` instead, which now handles
+ * teams and invites in a single mutation call. This endpoint will be removed in a future release.
+ *
+ * Migration guide:
+ * - Instead of calling `intentToCreateOrg` followed by `createWithPaymentIntent`,
+ *   pass teams and invitedMembers directly to `intentToCreateOrg`
+ * - The new endpoint returns checkoutUrl directly in the response
+ */
 import { OrganizationPaymentService } from "@calcom/features/ee/organizations/lib/OrganizationPaymentService";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
@@ -15,8 +24,20 @@ type CreateOptions = {
   input: TCreateWithPaymentIntentInputSchema;
 };
 const log = logger.getSubLogger({ prefix: ["viewer", "organizations", "createWithPaymentIntent"] });
+
+/**
+ * @deprecated Use intentToCreateOrg with teams and invitedMembers instead
+ */
 export const createHandler = async ({ input, ctx }: CreateOptions) => {
-  const paymentService = new OrganizationPaymentService(ctx.user);
+  log.warn(
+    "DEPRECATED: createWithPaymentIntent is deprecated. Use intentToCreateOrg with teams and invitedMembers instead."
+  );
+  const paymentService = new OrganizationPaymentService({
+    id: ctx.user.id,
+    email: ctx.user.email,
+    role: ctx.user.role,
+    name: ctx.user.name ?? undefined,
+  });
   const isAdmin = ctx.user.role === "ADMIN";
   // Regular user can send onboardingId if the onboarding was started by ADMIN/someone else and they shared the link with them.
   // ADMIN flow doesn't send onboardingId
@@ -57,6 +78,8 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {
       ...input,
       logo: input.logo ?? null,
       bio: input.bio ?? null,
+      brandColor: input.brandColor ?? null,
+      bannerUrl: input.bannerUrl ?? null,
     },
     organizationOnboarding
   );
diff --git a/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.schema.ts b/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.schema.ts
index b3c674723613fb..7ee2074d523d81 100644
--- a/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/createWithPaymentIntent.schema.ts
@@ -1,3 +1,8 @@
+/**
+ * @deprecated This schema is deprecated. Use ZIntentToCreateOrgInputSchema instead.
+ * See createWithPaymentIntent.handler.ts for migration guide.
+ */
+
 import type { z } from "zod";
 
 import { createOrganizationSchema } from "@calcom/features/ee/organizations/types/schemas";
@@ -7,6 +12,9 @@ export enum BillingPeriod {
   ANNUALLY = "ANNUALLY",
 }
 
+/**
+ * @deprecated Use ZIntentToCreateOrgInputSchema instead
+ */
 export const ZCreateWithPaymentIntentInputSchema = createOrganizationSchema;
 
 export type TCreateWithPaymentIntentInputSchema = z.infer<typeof ZCreateWithPaymentIntentInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
new file mode 100644
index 00000000000000..596468ef1de7dc
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.test.ts
@@ -0,0 +1,194 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { MembershipRole, WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+
+import { deleteWatchlistEntryHandler } from "./deleteWatchlistEntry.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("deleteWatchlistEntryHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockEntry = {
+    id: "entry-123",
+    type: WatchlistType.EMAIL,
+    value: "spam@example.com",
+    organizationId: 100,
+    action: WatchlistAction.BLOCK,
+    description: null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    findEntryWithAudit: vi.fn(),
+    deleteEntry: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined, profile: null } },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to manage blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to delete blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.findEntryWithAudit).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      await deleteWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.delete",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw NOT_FOUND when entry does not exist", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: null,
+        auditHistory: [],
+      });
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "non-existent-id",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Blocklist entry not found",
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).not.toHaveBeenCalled();
+    });
+
+    it("should throw FORBIDDEN when entry belongs to different organization", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 999 },
+        auditHistory: [],
+      });
+
+      await expect(
+        deleteWatchlistEntryHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You can only delete blocklist entries from your organization",
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("successful deletion", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should successfully delete entry when authorized", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      const result = await deleteWatchlistEntryHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.success).toBe(true);
+      expect(result.message).toBe("Blocklist entry deleted successfully");
+      expect(mockWatchlistRepo.deleteEntry).toHaveBeenCalledWith("entry-123", 1);
+    });
+
+    it("should pass correct userId to deleteEntry", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+      mockWatchlistRepo.deleteEntry.mockResolvedValue(undefined);
+
+      await deleteWatchlistEntryHandler({
+        ctx: { user: { ...mockUser, id: 42 } },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockWatchlistRepo.deleteEntry).toHaveBeenCalledWith("entry-123", 42);
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
new file mode 100644
index 00000000000000..b488fb4ee870ab
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.handler.ts
@@ -0,0 +1,77 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TDeleteWatchlistEntryInputSchema } from "./deleteWatchlistEntry.schema";
+
+type DeleteWatchlistEntryOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TDeleteWatchlistEntryInputSchema;
+};
+
+export const deleteWatchlistEntryHandler = async ({ ctx, input }: DeleteWatchlistEntryOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.delete",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to delete blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+
+  const { entry } = await watchlistRepo.findEntryWithAudit(input.id);
+
+  if (!entry) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: "Blocklist entry not found",
+    });
+  }
+
+  if (entry.organizationId !== organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You can only delete blocklist entries from your organization",
+    });
+  }
+
+  try {
+    await watchlistRepo.deleteEntry(input.id, user.id);
+
+    return {
+      success: true,
+      message: "Blocklist entry deleted successfully",
+    };
+  } catch (error) {
+    throw new TRPCError({
+      code: "INTERNAL_SERVER_ERROR",
+      message: "Failed to delete blocklist entry",
+    });
+  }
+};
+
+export default deleteWatchlistEntryHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
new file mode 100644
index 00000000000000..65377da9f04887
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/deleteWatchlistEntry.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZDeleteWatchlistEntryInputSchema = z.object({
+  id: z.string().uuid(),
+});
+
+export type TDeleteWatchlistEntryInputSchema = z.infer<typeof ZDeleteWatchlistEntryInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/getBrand.handler.ts b/packages/trpc/server/routers/viewer/organizations/getBrand.handler.ts
index f1828cd99cb75b..4c62f9f30cb993 100644
--- a/packages/trpc/server/routers/viewer/organizations/getBrand.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/getBrand.handler.ts
@@ -1,4 +1,4 @@
-import { getBrand } from "@calcom/lib/server/getBrand";
+import { getBrand } from "@calcom/features/ee/organizations/lib/getBrand";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 type VerifyCodeOptions = {
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts
new file mode 100644
index 00000000000000..26e72a4a2d4f60
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.test.ts
@@ -0,0 +1,357 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { MembershipRole, WatchlistType, WatchlistAction } from "@calcom/prisma/enums";
+
+import { getWatchlistEntryDetailsHandler } from "./getWatchlistEntryDetails.handler";
+
+vi.mock("@calcom/features/pbac/services/permission-check.service");
+vi.mock("@calcom/features/users/repositories/UserRepository");
+vi.mock("@calcom/lib/server/repository/watchlist.repository");
+
+describe("getWatchlistEntryDetailsHandler", () => {
+  const mockUser = {
+    id: 1,
+    email: "admin@example.com",
+    organizationId: 100,
+    profile: null,
+  };
+
+  const mockEntry = {
+    id: "entry-123",
+    type: WatchlistType.EMAIL,
+    value: "spam@example.com",
+    organizationId: 100,
+    action: WatchlistAction.BLOCK,
+    description: "Known spammer",
+    createdAt: new Date("2025-01-01"),
+    updatedAt: new Date("2025-01-02"),
+  };
+
+  const mockAuditHistory = [
+    {
+      id: "audit-1",
+      watchlistId: "entry-123",
+      action: "CREATED" as const,
+      changedByUserId: 1,
+      timestamp: new Date("2025-01-01"),
+      previousValue: null,
+      newValue: "spam@example.com",
+    },
+    {
+      id: "audit-2",
+      watchlistId: "entry-123",
+      action: "UPDATED" as const,
+      changedByUserId: 2,
+      timestamp: new Date("2025-01-02"),
+      previousValue: null,
+      newValue: "Known spammer",
+    },
+  ];
+
+  const mockUsers = [
+    { id: 1, name: "Admin", email: "admin@example.com" },
+    { id: 2, name: "Editor", email: "editor@example.com" },
+  ];
+
+  const mockPermissionCheckService = {
+    checkPermission: vi.fn(),
+  };
+
+  const mockWatchlistRepo = {
+    findEntryWithAudit: vi.fn(),
+  };
+
+  const mockUserRepo = {
+    findUsersByIds: vi.fn(),
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(PermissionCheckService).mockImplementation(() => mockPermissionCheckService as any);
+    vi.mocked(WatchlistRepository).mockImplementation(() => mockWatchlistRepo as any);
+    vi.mocked(UserRepository).mockImplementation(() => mockUserRepo as any);
+  });
+
+  describe("access control", () => {
+    it("should throw FORBIDDEN when user is not part of an organization", async () => {
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: { ...mockUser, organizationId: undefined, profile: null } },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You must be part of an organization to view blocklist",
+      });
+
+      expect(mockPermissionCheckService.checkPermission).not.toHaveBeenCalled();
+    });
+
+    it("should use profile.organizationId when available", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 200 },
+        auditHistory: [],
+      });
+
+      await getWatchlistEntryDetailsHandler({
+        ctx: {
+          user: {
+            ...mockUser,
+            organizationId: undefined,
+            profile: { organizationId: 200 },
+          },
+        },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 200,
+        permission: "watchlist.read",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+
+    it("should throw UNAUTHORIZED when user lacks permission", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(false);
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "UNAUTHORIZED",
+        message: "You are not authorized to view blocklist entries",
+      });
+
+      expect(mockWatchlistRepo.findEntryWithAudit).not.toHaveBeenCalled();
+    });
+
+    it("should check permission with correct parameters", async () => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+
+      await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockPermissionCheckService.checkPermission).toHaveBeenCalledWith({
+        userId: 1,
+        teamId: 100,
+        permission: "watchlist.read",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      });
+    });
+  });
+
+  describe("validation", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should throw NOT_FOUND when entry does not exist", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: null,
+        auditHistory: [],
+      });
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "non-existent-id",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "NOT_FOUND",
+        message: "Blocklist entry not found",
+      });
+    });
+
+    it("should throw FORBIDDEN when entry belongs to different organization", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: { ...mockEntry, organizationId: 999 },
+        auditHistory: [],
+      });
+
+      await expect(
+        getWatchlistEntryDetailsHandler({
+          ctx: { user: mockUser },
+          input: {
+            id: "entry-123",
+          },
+        })
+      ).rejects.toMatchObject({
+        code: "FORBIDDEN",
+        message: "You can only view blocklist entries from your organization",
+      });
+    });
+  });
+
+  describe("successful retrieval", () => {
+    beforeEach(() => {
+      mockPermissionCheckService.checkPermission.mockResolvedValue(true);
+    });
+
+    it("should return entry and audit history when authorized", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: mockAuditHistory,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue(mockUsers);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.entry).toEqual(mockEntry);
+      expect(result.auditHistory).toHaveLength(2);
+      expect(mockWatchlistRepo.findEntryWithAudit).toHaveBeenCalledWith("entry-123");
+    });
+
+    it("should enrich audit history with user details", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: mockAuditHistory,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue(mockUsers);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory[0].changedByUser).toEqual(mockUsers[0]);
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([1, 2]);
+    });
+
+    it("should handle audit history with duplicate user IDs", async () => {
+      const auditWithDuplicates = [
+        { ...mockAuditHistory[0], changedByUserId: 1 },
+        { ...mockAuditHistory[1], changedByUserId: 1 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithDuplicates,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[0]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([1]);
+      expect(result.auditHistory[0].changedByUser).toEqual(mockUsers[0]);
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[0]);
+    });
+
+    it("should handle audit history with null user IDs", async () => {
+      const auditWithNulls = [
+        { ...mockAuditHistory[0], changedByUserId: null },
+        { ...mockAuditHistory[1], changedByUserId: 2 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithNulls,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[1]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([2]);
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+    });
+
+    it("should handle audit history with undefined user IDs", async () => {
+      const auditWithUndefined = [
+        { ...mockAuditHistory[0], changedByUserId: undefined },
+        { ...mockAuditHistory[1], changedByUserId: 2 },
+      ];
+
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: auditWithUndefined,
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([mockUsers[1]]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(mockUserRepo.findUsersByIds).toHaveBeenCalledWith([2]);
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+      expect(result.auditHistory[1].changedByUser).toEqual(mockUsers[1]);
+    });
+
+    it("should not call findUsersByIds when audit history is empty", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [],
+      });
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory).toHaveLength(0);
+      expect(mockUserRepo.findUsersByIds).not.toHaveBeenCalled();
+    });
+
+    it("should handle when user is not found in user map", async () => {
+      mockWatchlistRepo.findEntryWithAudit.mockResolvedValue({
+        entry: mockEntry,
+        auditHistory: [mockAuditHistory[0]],
+      });
+      mockUserRepo.findUsersByIds.mockResolvedValue([]);
+
+      const result = await getWatchlistEntryDetailsHandler({
+        ctx: { user: mockUser },
+        input: {
+          id: "entry-123",
+        },
+      });
+
+      expect(result.auditHistory[0].changedByUser).toBeUndefined();
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
new file mode 100644
index 00000000000000..f95ab1926216e0
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.handler.ts
@@ -0,0 +1,85 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TGetWatchlistEntryDetailsInputSchema } from "./getWatchlistEntryDetails.schema";
+
+type GetWatchlistEntryDetailsOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TGetWatchlistEntryDetailsInputSchema;
+};
+
+export const getWatchlistEntryDetailsHandler = async ({ ctx, input }: GetWatchlistEntryDetailsOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to view blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.read",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to view blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+  const userRepo = new UserRepository(prisma);
+
+  const result = await watchlistRepo.findEntryWithAudit(input.id);
+
+  if (!result.entry) {
+    throw new TRPCError({
+      code: "NOT_FOUND",
+      message: "Blocklist entry not found",
+    });
+  }
+
+  if (result.entry.organizationId !== organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You can only view blocklist entries from your organization",
+    });
+  }
+
+  const userIds = result.auditHistory
+    .map((audit) => audit.changedByUserId)
+    .filter((id): id is number => id !== null && id !== undefined);
+
+  const uniqueUserIds = Array.from(new Set(userIds));
+
+  const users = uniqueUserIds.length > 0 ? await userRepo.findUsersByIds(uniqueUserIds) : [];
+
+  const userMap = new Map(users.map((u) => [u.id, u]));
+
+  const auditHistoryWithUsers = result.auditHistory.map((audit) => ({
+    ...audit,
+    changedByUser: audit.changedByUserId ? userMap.get(audit.changedByUserId) : undefined,
+  }));
+
+  return {
+    entry: result.entry,
+    auditHistory: auditHistoryWithUsers,
+  };
+};
+
+export default getWatchlistEntryDetailsHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
new file mode 100644
index 00000000000000..be3f4643c53c17
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/getWatchlistEntryDetails.schema.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+export const ZGetWatchlistEntryDetailsInputSchema = z.object({
+  id: z.string().uuid(),
+});
+
+export type TGetWatchlistEntryDetailsInputSchema = z.infer<typeof ZGetWatchlistEntryDetailsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.test.ts
index e7753efa265df8..f1d5834c5a319c 100644
--- a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.test.ts
@@ -3,7 +3,8 @@ import prismock from "../../../../../../tests/libs/__mocks__/prisma";
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
 import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
-import { UserPermissionRole } from "@calcom/prisma/enums";
+import { OrganizationPaymentService } from "@calcom/features/ee/organizations/lib/OrganizationPaymentService";
+import { BillingPeriod, UserPermissionRole, CreationSource } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
@@ -15,6 +16,8 @@ vi.mock("@calcom/ee/common/server/LicenseKeyService", () => ({
   },
 }));
 
+vi.mock("@calcom/features/ee/organizations/lib/OrganizationPaymentService");
+
 const mockInput = {
   name: "Test Org",
   slug: "test-org",
@@ -23,6 +26,7 @@ const mockInput = {
   seats: 5,
   pricePerSeat: 20,
   isPlatform: false,
+  creationSource: "WEBAPP",
 };
 
 // Helper functions for creating test data
@@ -49,8 +53,37 @@ async function createTestUser(data: {
 describe("intentToCreateOrgHandler", () => {
   beforeEach(async () => {
     vi.resetAllMocks();
-    // @ts-expect-error reset is a method on Prismock
     await prismock.reset();
+
+    vi.mocked(OrganizationPaymentService).mockImplementation(() => {
+      return {
+        createOrganizationOnboarding: vi.fn().mockImplementation(async (data: any) => {
+          return await prismock.organizationOnboarding.create({
+            data: {
+              id: "onboarding-123",
+              name: data.name,
+              slug: data.slug,
+              orgOwnerEmail: data.orgOwnerEmail,
+              seats: data.seats ?? 10,
+              pricePerSeat: data.pricePerSeat ?? 15,
+              billingPeriod: data.billingPeriod ?? BillingPeriod.MONTHLY,
+              isComplete: false,
+              stripeCustomerId: null,
+              createdById: data.createdByUserId,
+              teams: data.teams ?? [],
+              invitedMembers: data.invitedMembers ?? [],
+              isPlatform: data.isPlatform ?? false,
+            },
+          });
+        }),
+        createPaymentIntent: vi.fn().mockResolvedValue({
+          checkoutUrl: "https://stripe.com/checkout/session",
+          organizationOnboarding: {},
+          subscription: {},
+          sessionId: "session-123",
+        }),
+      } as any;
+    });
   });
 
   describe("hosted", () => {
@@ -64,7 +97,10 @@ describe("intentToCreateOrgHandler", () => {
       });
       vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
         checkLicense: vi.fn().mockResolvedValue(true),
+        incrementUsage: vi.fn().mockResolvedValue(undefined),
       });
+      process.env.STRIPE_ORG_PRODUCT_ID = "prod_test123";
+      process.env.STRIPE_ORG_MONTHLY_PRICE_ID = "price_test123";
     });
 
     it("should allow admin user to create org for another user", async () => {
@@ -88,7 +124,7 @@ describe("intentToCreateOrgHandler", () => {
         },
       });
 
-      // Verify the result shape
+      // Admin creating for different user with no teams/invites triggers handover
       expect(result).toEqual({
         userId: expect.any(Number),
         orgOwnerEmail: mockInput.orgOwnerEmail,
@@ -99,6 +135,9 @@ describe("intentToCreateOrgHandler", () => {
         billingPeriod: mockInput.billingPeriod,
         isPlatform: mockInput.isPlatform,
         organizationOnboardingId: expect.any(String),
+        checkoutUrl: null,
+        organizationId: null, // Not created yet - handover flow
+        handoverUrl: expect.stringContaining("/settings/organizations/new/resume?onboardingId="),
       });
 
       // Verify organization onboarding was created
@@ -193,7 +232,7 @@ describe("intentToCreateOrgHandler", () => {
       );
     });
 
-    it("should throw error when organization onboarding already exists", async () => {
+    it("should throw error when organization onboarding already exists and is complete", async () => {
       // Create admin user
       const adminUser = await createTestUser({
         email: "admin@example.com",
@@ -207,7 +246,7 @@ describe("intentToCreateOrgHandler", () => {
         emailVerified: new Date(),
       });
 
-      // Create existing organization onboarding
+      // Create existing COMPLETE organization onboarding
       await prismock.organizationOnboarding.create({
         data: {
           name: mockInput.name,
@@ -217,6 +256,7 @@ describe("intentToCreateOrgHandler", () => {
           seats: mockInput.seats,
           pricePerSeat: mockInput.pricePerSeat,
           createdById: adminUser.id,
+          isComplete: true, // Must be complete to throw error
         },
       });
 
@@ -249,6 +289,7 @@ describe("intentToCreateOrgHandler", () => {
     it("should throw error when license is not valid", async () => {
       vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
         checkLicense: vi.fn().mockResolvedValue(false),
+        incrementUsage: vi.fn().mockResolvedValue(undefined),
       });
       const adminUser = await createTestUser({
         email: "admin@example.com",
@@ -268,6 +309,7 @@ describe("intentToCreateOrgHandler", () => {
     it("should allow admin user to create org for another user", async () => {
       vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
         checkLicense: vi.fn().mockResolvedValue(true),
+        incrementUsage: vi.fn().mockResolvedValue(undefined),
       });
       // Create admin user
       const adminUser = await createTestUser({
@@ -289,7 +331,7 @@ describe("intentToCreateOrgHandler", () => {
         },
       });
 
-      // Verify the result shape
+      // Admin creating for different user with no teams/invites triggers handover (same as hosted)
       expect(result).toEqual({
         userId: expect.any(Number),
         orgOwnerEmail: mockInput.orgOwnerEmail,
@@ -300,6 +342,9 @@ describe("intentToCreateOrgHandler", () => {
         billingPeriod: mockInput.billingPeriod,
         isPlatform: mockInput.isPlatform,
         organizationOnboardingId: expect.any(String),
+        checkoutUrl: null,
+        organizationId: null, // Not created yet - handover flow
+        handoverUrl: expect.stringContaining("/settings/organizations/new/resume?onboardingId="),
       });
 
       // Verify organization onboarding was created
@@ -314,5 +359,119 @@ describe("intentToCreateOrgHandler", () => {
       expect(organizationOnboarding?.slug).toBe(mockInput.slug);
       expect(organizationOnboarding?.orgOwnerEmail).toBe(mockInput.orgOwnerEmail);
     });
+
+    it("should handle teams and invites in the request", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+        incrementUsage: vi.fn().mockResolvedValue(undefined),
+      });
+      const adminUser = await createTestUser({
+        email: "admin@example.com",
+        role: UserPermissionRole.ADMIN,
+      });
+
+      await createTestUser({
+        email: mockInput.orgOwnerEmail,
+        completedOnboarding: true,
+        emailVerified: new Date(),
+      });
+
+      const inputWithTeamsAndInvites = {
+        ...mockInput,
+        teams: [
+          { id: -1, name: "Engineering", isBeingMigrated: false, slug: null },
+          { id: -1, name: "Sales", isBeingMigrated: false, slug: null },
+        ],
+        invitedMembers: [
+          { email: "member1@example.com", name: "Member 1" },
+          { email: "member2@example.com", name: "Member 2" },
+        ],
+      };
+
+      const result = await intentToCreateOrgHandler({
+        input: inputWithTeamsAndInvites,
+        ctx: {
+          user: adminUser,
+        },
+      });
+
+      expect(result.organizationOnboardingId).toBeDefined();
+
+      const organizationOnboarding = await prismock.organizationOnboarding.findFirst({
+        where: {
+          slug: mockInput.slug,
+        },
+      });
+
+      expect(organizationOnboarding).toBeDefined();
+      expect(organizationOnboarding?.teams).toEqual(inputWithTeamsAndInvites.teams);
+      expect(organizationOnboarding?.invitedMembers).toEqual(inputWithTeamsAndInvites.invitedMembers);
+    });
+
+    it("should preserve teamName, teamId, and role in invites payload", async () => {
+      vi.mocked(LicenseKeySingleton.getInstance).mockResolvedValue({
+        checkLicense: vi.fn().mockResolvedValue(true),
+        incrementUsage: vi.fn().mockResolvedValue(undefined),
+      });
+      const adminUser = await createTestUser({
+        email: "admin@example.com",
+        role: UserPermissionRole.ADMIN,
+      });
+
+      await createTestUser({
+        email: mockInput.orgOwnerEmail,
+        completedOnboarding: true,
+        emailVerified: new Date(),
+      });
+
+      // This matches the exact payload from the frontend
+      const inputWithTeamsAndInvites = {
+        ...mockInput,
+        teams: [
+          { id: -1, name: "New", isBeingMigrated: false, slug: null },
+          { id: -1, name: "team", isBeingMigrated: false, slug: null },
+        ],
+        invitedMembers: [
+          { email: "new@new.com", teamName: "new", teamId: -1, role: "ADMIN" },
+          { email: "team@new.com", teamName: "team", teamId: -1, role: "ADMIN" },
+        ],
+      };
+
+      const result = await intentToCreateOrgHandler({
+        input: inputWithTeamsAndInvites,
+        ctx: {
+          user: adminUser,
+        },
+      });
+
+      expect(result.organizationOnboardingId).toBeDefined();
+
+      const organizationOnboarding = await prismock.organizationOnboarding.findFirst({
+        where: {
+          slug: mockInput.slug,
+        },
+      });
+
+      expect(organizationOnboarding).toBeDefined();
+      expect(organizationOnboarding?.teams).toEqual(inputWithTeamsAndInvites.teams);
+
+      // Verify invitedMembers are stored with all fields including teamName, teamId, and role
+      expect(organizationOnboarding?.invitedMembers).toBeDefined();
+      expect(organizationOnboarding?.invitedMembers).toHaveLength(2);
+
+      const invitedMembers = organizationOnboarding?.invitedMembers as any[];
+      expect(invitedMembers[0]).toMatchObject({
+        email: "new@new.com",
+        teamName: "new",
+        teamId: -1,
+        role: "ADMIN",
+      });
+      expect(invitedMembers[1]).toMatchObject({
+        email: "team@new.com",
+        teamName: "team",
+        teamId: -1,
+        role: "ADMIN",
+      });
+    });
   });
 });
diff --git a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.ts b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.ts
index b61500d9260d6a..50ac1a837fe98f 100644
--- a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.handler.ts
@@ -1,5 +1,5 @@
 import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
-import { OrganizationPaymentService } from "@calcom/features/ee/organizations/lib/OrganizationPaymentService";
+import { OrganizationOnboardingFactory } from "@calcom/ee/organizations/lib/service/onboarding/OrganizationOnboardingFactory";
 import {
   assertCanCreateOrg,
   findUserToBeOrgOwner,
@@ -27,7 +27,7 @@ type CreateOptions = {
 };
 
 export const intentToCreateOrgHandler = async ({ input, ctx }: CreateOptions) => {
-  const { slug, name, orgOwnerEmail, seats, pricePerSeat, billingPeriod, isPlatform } = input;
+  const { slug, name, orgOwnerEmail, isPlatform } = input;
   log.debug(
     "Starting organization creation intent",
     safeStringify({ slug, name, orgOwnerEmail, isPlatform })
@@ -41,7 +41,6 @@ export const intentToCreateOrgHandler = async ({ input, ctx }: CreateOptions) =>
     if (!hasValidLicense) {
       throw new TRPCError({
         code: "BAD_REQUEST",
-        // TODO: We need to send translation keys from here and frontend should translate it
         message: "License is not valid",
       });
     }
@@ -75,9 +74,24 @@ export const intentToCreateOrgHandler = async ({ input, ctx }: CreateOptions) =>
   }
   log.debug("Found organization owner", safeStringify({ orgOwnerId: orgOwner.id, email: orgOwner.email }));
 
-  let organizationOnboarding = await OrganizationOnboardingRepository.findByOrgOwnerEmail(orgOwner.email);
+  const organizationOnboarding = await OrganizationOnboardingRepository.findByOrgOwnerEmail(orgOwner.email);
+
+  // If onboarding exists and is incomplete, this is a resume flow (e.g., admin handover)
+  // Allow proceeding with the existing onboarding record
   if (organizationOnboarding) {
-    throw new Error("organization_onboarding_already_exists");
+    if (organizationOnboarding.isComplete) {
+      // Organization already created - shouldn't create another one
+      throw new Error("organization_onboarding_already_exists");
+    }
+
+    // Incomplete onboarding exists - this is expected for resume/handover flows
+    log.debug(
+      "Found incomplete onboarding record - proceeding with resume flow",
+      safeStringify({ onboardingId: organizationOnboarding.id, slug })
+    );
+
+    // Use existing onboarding ID for the resume flow
+    input.onboardingId = organizationOnboarding.id;
   }
 
   await assertCanCreateOrg({
@@ -87,24 +101,16 @@ export const intentToCreateOrgHandler = async ({ input, ctx }: CreateOptions) =>
     restrictBasedOnMinimumPublishedTeams: !IS_USER_ADMIN,
   });
 
-  const paymentService = new OrganizationPaymentService(ctx.user);
-  organizationOnboarding = await paymentService.createOrganizationOnboarding({
-    ...input,
-    createdByUserId: loggedInUser.id,
+  const onboardingService = OrganizationOnboardingFactory.create({
+    id: ctx.user.id,
+    email: ctx.user.email,
+    role: ctx.user.role,
   });
+  const result = await onboardingService.createOnboardingIntent(input);
 
   log.debug("Organization creation intent successful", safeStringify({ slug, orgOwnerId: orgOwner.id }));
-  return {
-    userId: orgOwner.id,
-    orgOwnerEmail,
-    name,
-    slug,
-    seats,
-    pricePerSeat,
-    billingPeriod,
-    isPlatform,
-    organizationOnboardingId: organizationOnboarding.id,
-  };
+
+  return result;
 };
 
 export default intentToCreateOrgHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.schema.ts b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.schema.ts
index 3c4a9fdd24d5da..874c2379202384 100644
--- a/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/intentToCreateOrg.schema.ts
@@ -2,12 +2,8 @@ import { z } from "zod";
 
 import { emailSchema } from "@calcom/lib/emailSchema";
 import slugify from "@calcom/lib/slugify";
-import { CreationSource } from "@calcom/prisma/enums";
-
-export enum BillingPeriod {
-  MONTHLY = "MONTHLY",
-  ANNUALLY = "ANNUALLY",
-}
+import { BillingPeriod, CreationSource } from "@calcom/prisma/enums";
+import { orgOnboardingInvitedMembersSchema, orgOnboardingTeamsSchema } from "@calcom/prisma/zod-utils";
 
 export const ZIntentToCreateOrgInputSchema = z.object({
   name: z.string(),
@@ -19,6 +15,16 @@ export const ZIntentToCreateOrgInputSchema = z.object({
   isPlatform: z.boolean().default(false),
   billingPeriod: z.nativeEnum(BillingPeriod).default(BillingPeriod.MONTHLY),
   creationSource: z.nativeEnum(CreationSource),
+  // Brand fields
+  logo: z.string().nullish(),
+  bio: z.string().nullish(),
+  brandColor: z.string().nullish(),
+  bannerUrl: z.string().nullish(),
+  // Teams and invites (new)
+  teams: orgOnboardingTeamsSchema.optional(),
+  invitedMembers: orgOnboardingInvitedMembersSchema.optional(),
+  // Optional onboarding ID for resume flows (admin handover)
+  onboardingId: z.string().optional(),
 });
 
 export type TIntentToCreateOrgInputSchema = z.infer<typeof ZIntentToCreateOrgInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/list.handler.ts b/packages/trpc/server/routers/viewer/organizations/list.handler.ts
index b6e64b0e69c162..924adc517b65d2 100644
--- a/packages/trpc/server/routers/viewer/organizations/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/list.handler.ts
@@ -1,5 +1,5 @@
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import prisma from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts
index 1b09e367eca4dd..75604a1cba2a2e 100644
--- a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts
@@ -36,7 +36,7 @@ vi.mock("@calcom/features/pbac/services/permission-check.service", () => ({
 }));
 
 // Mock UserRepository
-vi.mock("@calcom/lib/server/repository/user", () => ({
+vi.mock("@calcom/features/users/repositories/UserRepository", () => ({
   UserRepository: vi.fn().mockImplementation(() => ({
     enrichUserWithItsProfile: vi.fn().mockImplementation(({ user }) => user),
   })),
diff --git a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts
index dea80c632c85cb..e158a017d5bf1d 100644
--- a/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listMembers.handler.ts
@@ -4,7 +4,7 @@ import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts
index f465fa8f1ba6f1..4a46250455f15e 100644
--- a/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts
@@ -1,7 +1,7 @@
 import z from "zod";
 
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
diff --git a/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts b/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
index 48722d00e21ece..e45d51a3089f36 100644
--- a/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listOtherTeams.handler.ts
@@ -1,4 +1,4 @@
-import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 
 import type { TrpcSessionUser } from "../../../types";
 
diff --git a/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
new file mode 100644
index 00000000000000..486b1e469dcab9
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.handler.ts
@@ -0,0 +1,89 @@
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { WatchlistRepository } from "@calcom/lib/server/repository/watchlist.repository";
+import { prisma } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { TRPCError } from "@trpc/server";
+
+import type { TrpcSessionUser } from "../../../types";
+import type { TListWatchlistEntriesInputSchema } from "./listWatchlistEntries.schema";
+
+type ListWatchlistEntriesOptions = {
+  ctx: {
+    user: NonNullable<TrpcSessionUser>;
+  };
+  input: TListWatchlistEntriesInputSchema;
+};
+
+export const listWatchlistEntriesHandler = async ({ ctx, input }: ListWatchlistEntriesOptions) => {
+  const { user } = ctx;
+
+  const organizationId = user.profile?.organizationId || user.organizationId;
+  if (!organizationId) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "You must be part of an organization to manage blocklist",
+    });
+  }
+
+  const permissionCheckService = new PermissionCheckService();
+  const hasPermission = await permissionCheckService.checkPermission({
+    userId: user.id,
+    teamId: organizationId,
+    permission: "watchlist.read",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You are not authorized to view blocklist entries",
+    });
+  }
+
+  const watchlistRepo = new WatchlistRepository(prisma);
+  const userRepo = new UserRepository(prisma);
+
+  const result = await watchlistRepo.findAllEntries({
+    organizationId,
+    limit: input.limit,
+    offset: input.offset,
+    searchTerm: input.searchTerm,
+    filters: input.filters,
+  });
+
+  const userIds = result.rows
+    .map((entry) => entry.audits?.[0]?.changedByUserId)
+    .filter((id): id is number => id !== null && id !== undefined);
+
+  const uniqueUserIds = Array.from(new Set(userIds));
+
+  const users = uniqueUserIds.length > 0 ? await userRepo.findUsersByIds(uniqueUserIds) : [];
+
+  const userMap = new Map(users.map((u) => [u.id, u]));
+
+  const rowsWithCreators = result.rows.map((entry) => {
+    const audit = entry.audits?.[0];
+    if (audit?.changedByUserId) {
+      const changedByUser = userMap.get(audit.changedByUserId);
+      return {
+        ...entry,
+        audits: [
+          {
+            ...audit,
+            changedByUser,
+          },
+        ],
+      };
+    }
+    return entry;
+  });
+
+  return {
+    rows: rowsWithCreators,
+    meta: result.meta,
+  };
+};
+
+export default listWatchlistEntriesHandler;
diff --git a/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts
new file mode 100644
index 00000000000000..4e08b7c37601e5
--- /dev/null
+++ b/packages/trpc/server/routers/viewer/organizations/listWatchlistEntries.schema.ts
@@ -0,0 +1,16 @@
+import { z } from "zod";
+
+import { WatchlistType } from "@calcom/prisma/enums";
+
+export const ZListWatchlistEntriesInputSchema = z.object({
+  limit: z.number().min(1).max(100).default(25),
+  offset: z.number().min(0).default(0),
+  searchTerm: z.string().optional(),
+  filters: z
+    .object({
+      type: z.nativeEnum(WatchlistType).optional(),
+    })
+    .optional(),
+});
+
+export type TListWatchlistEntriesInputSchema = z.infer<typeof ZListWatchlistEntriesInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/updateUser.handler.ts b/packages/trpc/server/routers/viewer/organizations/updateUser.handler.ts
index f699486bfcb26f..3cc26caac7393e 100644
--- a/packages/trpc/server/routers/viewer/organizations/updateUser.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/updateUser.handler.ts
@@ -2,8 +2,8 @@ import { ensureOrganizationIsReviewed } from "@calcom/ee/organizations/lib/ensur
 import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { RoleManagementError } from "@calcom/features/pbac/domain/errors/role-management.error";
 import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
+import { checkRegularUsername } from "@calcom/features/profile/lib/checkRegularUsername";
 import { uploadAvatar } from "@calcom/lib/server/avatar";
-import { checkRegularUsername } from "@calcom/lib/server/checkRegularUsername";
 import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
 import { prisma } from "@calcom/prisma";
 import type { Prisma, PrismaPromise, User, Membership, Profile } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/payments/chargeCard.handler.ts b/packages/trpc/server/routers/viewer/payments/chargeCard.handler.ts
index f221cd0d9af463..359ef8355dd0bc 100644
--- a/packages/trpc/server/routers/viewer/payments/chargeCard.handler.ts
+++ b/packages/trpc/server/routers/viewer/payments/chargeCard.handler.ts
@@ -1,5 +1,5 @@
 import { handleNoShowFee } from "@calcom/features/bookings/lib/payment/handleNoShowFee";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { PrismaClient } from "@calcom/prisma";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/pbac/_router.tsx b/packages/trpc/server/routers/viewer/pbac/_router.tsx
index 819f90443fda7e..692ac3a032873c 100644
--- a/packages/trpc/server/routers/viewer/pbac/_router.tsx
+++ b/packages/trpc/server/routers/viewer/pbac/_router.tsx
@@ -5,7 +5,7 @@ import { isValidPermissionString } from "@calcom/features/pbac/domain/types/perm
 import type { PermissionString } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { RoleService } from "@calcom/features/pbac/services/role.service";
-import prisma from "@calcom/prisma";
+import { prisma } from "@calcom/prisma";
 import { RoleType, MembershipRole } from "@calcom/prisma/enums";
 
 import authedProcedure from "../../../procedures/authedProcedure";
@@ -173,6 +173,7 @@ export const permissionsRouter = router({
     .input(
       z.object({
         teamId: z.number(),
+        includeSystemRolesOnly: z.boolean().optional(),
       })
     )
     .query(async ({ ctx, input }) => {
@@ -183,6 +184,14 @@ export const permissionsRouter = router({
       const featureRepo = new FeaturesRepository(prisma);
       const teamHasPBACFeature = await featureRepo.checkIfTeamHasFeature(input.teamId, "pbac");
 
+      // If PBAC is not enabled but caller wants system roles only (for preview), allow it
+      if (!teamHasPBACFeature && input.includeSystemRolesOnly) {
+        const roleService = new RoleService();
+        const allRoles = await roleService.getTeamRoles(input.teamId);
+        // Filter to only return system roles for preview
+        return allRoles.filter((role) => role.type === "SYSTEM");
+      }
+
       if (!teamHasPBACFeature) {
         throw new Error("PBAC is not enabled for this team");
       }
@@ -203,4 +212,45 @@ export const permissionsRouter = router({
       const roleService = new RoleService();
       return roleService.getTeamRoles(input.teamId);
     }),
+
+  enablePbac: authedProcedure.mutation(async ({ ctx }) => {
+    if (!ctx.user?.id) {
+      throw new Error("Unauthorized");
+    }
+
+    // Check for organization ID
+    const orgId = ctx.user.organizationId;
+    if (!orgId) {
+      throw new Error("No organization found for user");
+    }
+
+    // Check if user is ADMIN or OWNER of the organization
+    const membership = await prisma.membership.findFirst({
+      where: {
+        userId: ctx.user.id,
+        teamId: orgId,
+        accepted: true,
+        role: {
+          in: [MembershipRole.ADMIN, MembershipRole.OWNER],
+        },
+      },
+    });
+
+    if (!membership) {
+      throw new Error("You must be an ADMIN or OWNER to enable PBAC for this organization");
+    }
+
+    // Check if PBAC is already enabled for this org
+    const featureRepo = new FeaturesRepository(prisma);
+    const pbacAlreadyEnabled = await featureRepo.checkIfTeamHasFeature(orgId, "pbac");
+
+    if (pbacAlreadyEnabled) {
+      return { success: true, message: "PBAC is already enabled for this organization" };
+    }
+
+    // Enable PBAC feature for the organization
+    await featureRepo.enableFeatureForTeam(orgId, "pbac", "opt-in by user: " + ctx.user.id);
+
+    return { success: true, message: "PBAC enabled successfully" };
+  }),
 });
diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts
index a39b2df7ed1500..e71d5950ebbf38 100644
--- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts
+++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts
@@ -10,11 +10,11 @@ import { enrichHostsWithDelegationCredentials } from "@calcom/app-store/delegati
 import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";
 import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser";
 import { getUrlSearchParamsToForwardForTestPreview } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward";
-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import { fromEntriesWithDuplicateKeys } from "@calcom/lib/fromEntriesWithDuplicateKeys";
 import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";
 import { getAbsoluteEventTypeRedirectUrl } from "@calcom/routing-forms/getEventTypeRedirectUrl";
diff --git a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
index 76aeeaf40d462e..a44fb895672740 100644
--- a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
+++ b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
@@ -29,6 +29,8 @@ export const responseHandler = async ({ ctx, input }: ResponseHandlerOptions) =>
         select: {
           id: true,
           email: true,
+          timeFormat: true,
+          locale: true,
         },
       },
     },
diff --git a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts
index abadbba087bd95..e0027751b1dee1 100644
--- a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts
+++ b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts
@@ -3,8 +3,8 @@ import { sendOrganizationAdminNoSlotsNotification } from "@calcom/emails";
 import type { IRedisService } from "@calcom/features/redis/IRedisService";
 import { IS_PRODUCTION, WEBAPP_URL } from "@calcom/lib/constants";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import type { MembershipRepository } from "@calcom/lib/server/repository/membership";
-import type { TeamRepository } from "@calcom/lib/server/repository/team";
+import type { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import type { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 
 type EventDetails = {
   username: string;
diff --git a/packages/trpc/server/routers/viewer/slots/isAvailable.handler.ts b/packages/trpc/server/routers/viewer/slots/isAvailable.handler.ts
index d970dbc2ebfc6b..1be3c06711adc8 100644
--- a/packages/trpc/server/routers/viewer/slots/isAvailable.handler.ts
+++ b/packages/trpc/server/routers/viewer/slots/isAvailable.handler.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest } from "next";
 import { HttpError } from "@calcom/lib/http-error";
 import { getPastTimeAndMinimumBookingNoticeBoundsStatus } from "@calcom/lib/isOutOfBounds";
 import { PrismaSelectedSlotRepository } from "@calcom/lib/server/repository/PrismaSelectedSlotRepository";
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import type { PrismaClient } from "@calcom/prisma";
 
 import type { TIsAvailableInputSchema, TIsAvailableOutputSchema } from "./isAvailable.schema";
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 9023a40d4ada19..5f5e369ecef08f 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -5,6 +5,7 @@ import { v4 as uuid } from "uuid";
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
 import { orgDomainConfig } from "@calcom/ee/organizations/lib/orgDomains";
+import { getAggregatedAvailability } from "@calcom/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability";
 import type {
   CurrentSeats,
   EventType,
@@ -13,26 +14,31 @@ import type {
   IFromUser,
   IToUser,
 } from "@calcom/features/availability/lib/getUserAvailability";
+import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 import { checkForConflicts } from "@calcom/features/bookings/lib/conflictChecker/checkForConflicts";
 import type { QualifiedHostsService } from "@calcom/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials";
 import { isEventTypeLoggingEnabled } from "@calcom/features/bookings/lib/isEventTypeLoggingEnabled";
+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import type { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
 import type { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
 import type { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";
+import type { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
+import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import type { IRedisService } from "@calcom/features/redis/IRedisService";
+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";
+import getSlots from "@calcom/features/schedules/lib/slots";
+import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
 import { shouldIgnoreContactOwner } from "@calcom/lib/bookings/routing/utils";
 import { RESERVED_SUBDOMAINS } from "@calcom/lib/constants";
-import { buildDateRanges } from "@calcom/lib/date-ranges";
 import { getUTCOffsetByTimezone } from "@calcom/lib/dayjs";
-import { getAggregatedAvailability } from "@calcom/lib/getAggregatedAvailability";
-import type { BusyTimesService } from "@calcom/lib/getBusyTimes";
 import { descendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
 import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
 import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";
 import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits";
 import LimitManager from "@calcom/lib/intervalLimits/limitManager";
-import type { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
 import { isBookingWithinPeriod } from "@calcom/lib/intervalLimits/utils";
 import {
   calculatePeriodLimits,
@@ -44,15 +50,9 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import type { ISelectedSlotRepository } from "@calcom/lib/server/repository/ISelectedSlotRepository";
-import type { BookingRepository } from "@calcom/lib/server/repository/booking";
-import type { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
 import type { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
 import type { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
 import type { ScheduleRepository } from "@calcom/lib/server/repository/schedule";
-import type { TeamRepository } from "@calcom/lib/server/repository/team";
-import type { UserRepository } from "@calcom/lib/server/repository/user";
-import { withSelectedCalendars } from "@calcom/lib/server/repository/user";
-import getSlots from "@calcom/lib/slots";
 import { SchedulingType, PeriodType } from "@calcom/prisma/enums";
 import type { EventBusyDate, EventBusyDetails } from "@calcom/types/Calendar";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";
diff --git a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts
index a8f7678cc23373..7c6fcfec265db8 100644
--- a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts
@@ -1,4 +1,4 @@
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import type { TAcceptOrLeaveInputSchema } from "./acceptOrLeave.schema";
diff --git a/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts b/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts
index 4c04ab20f17466..850b652993d89b 100644
--- a/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts
@@ -1,5 +1,5 @@
 import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/teams/create.handler.ts b/packages/trpc/server/routers/viewer/teams/create.handler.ts
index 96f0e551cc11da..e5cc55ce138c7f 100644
--- a/packages/trpc/server/routers/viewer/teams/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/create.handler.ts
@@ -1,7 +1,7 @@
 import { generateTeamCheckoutSession } from "@calcom/features/ee/teams/lib/payments";
 import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { uploadLogo } from "@calcom/lib/server/avatar";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
index 8bd7feec72f298..03a68a8c561e55 100644
--- a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts
@@ -1,5 +1,5 @@
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/teams/delete.handler.ts b/packages/trpc/server/routers/viewer/teams/delete.handler.ts
index b3ea0c3174d6bd..9d460b4beb2eb3 100644
--- a/packages/trpc/server/routers/viewer/teams/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/delete.handler.ts
@@ -1,5 +1,5 @@
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
diff --git a/packages/trpc/server/routers/viewer/teams/get.handler.test.ts b/packages/trpc/server/routers/viewer/teams/get.handler.test.ts
index 76ff6b87a58258..282007fb6d5a00 100644
--- a/packages/trpc/server/routers/viewer/teams/get.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/teams/get.handler.test.ts
@@ -1,12 +1,12 @@
 import { describe, it, beforeEach, vi, expect } from "vitest";
 
 import { getTeamWithoutMembers } from "@calcom/features/ee/teams/lib/queries";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 
 import type { TrpcSessionUser } from "../../../types";
 import getTeam from "./get.handler";
 
-vi.mock("@calcom/lib/server/repository/membership", () => ({
+vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
   MembershipRepository: {
     findUniqueByUserIdAndTeamId: vi.fn(),
   },
diff --git a/packages/trpc/server/routers/viewer/teams/get.handler.ts b/packages/trpc/server/routers/viewer/teams/get.handler.ts
index 9590d107efffa2..615fbd6cea26b2 100644
--- a/packages/trpc/server/routers/viewer/teams/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/get.handler.ts
@@ -1,5 +1,5 @@
 import { getTeamWithoutMembers } from "@calcom/features/ee/teams/lib/queries";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 
 import { TRPCError } from "@trpc/server";
 
diff --git a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts
index dbdbb0839ab912..6252c6c2031342 100644
--- a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts
@@ -1,7 +1,7 @@
 import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";
 import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability";
 import { isTeamMember } from "@calcom/features/ee/teams/lib/queries";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/teams/hasActiveTeamPlan.handler.ts b/packages/trpc/server/routers/viewer/teams/hasActiveTeamPlan.handler.ts
index a1ecfaa31fc77a..69db80c7c82ae2 100644
--- a/packages/trpc/server/routers/viewer/teams/hasActiveTeamPlan.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/hasActiveTeamPlan.handler.ts
@@ -1,6 +1,6 @@
 import { InternalTeamBilling } from "@calcom/ee/billing/teams/internal-team-billing";
 import { IS_SELF_HOSTED } from "@calcom/lib/constants";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/teams/hasTeamPlan.handler.ts b/packages/trpc/server/routers/viewer/teams/hasTeamPlan.handler.ts
index ac5e2be89d1f24..e705285d93f2df 100644
--- a/packages/trpc/server/routers/viewer/teams/hasTeamPlan.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/hasTeamPlan.handler.ts
@@ -1,5 +1,5 @@
 import { BillingPlanService } from "@calcom/features/ee/billing/domain/billing-plans";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { prisma } from "@calcom/prisma";
 
 type HasTeamPlanOptions = {
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
index f210d63ae46c33..554aa56d58e56c 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
@@ -6,7 +6,7 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { isOrganisationOwner } from "@calcom/lib/server/queries/organisations";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { CreationSource } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
index 4ced2955c97862..f9b78a438bde8d 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
@@ -8,13 +8,13 @@ import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/que
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
 import { ENABLE_PROFILE_SWITCHER, WEBAPP_URL } from "@calcom/lib/constants";
-import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser";
+import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { ProfileRepository } from "@calcom/lib/server/repository/profile";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
 import type { Membership, OrganizationSettings, Team } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.handler.ts b/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.handler.ts
index e9f4efd4e54c72..7648b18d8573fb 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.handler.ts
@@ -1,4 +1,4 @@
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import type { TInviteMemberByTokenSchemaInputSchema } from "./inviteMemberByToken.schema";
diff --git a/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts
index 24df19a53f259f..f64589a5de056a 100644
--- a/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts
@@ -1,7 +1,7 @@
 import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/teams/list.handler.ts b/packages/trpc/server/routers/viewer/teams/list.handler.ts
index de41749d3ef7f2..c1e6b4e92552ae 100644
--- a/packages/trpc/server/routers/viewer/teams/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/list.handler.ts
@@ -1,4 +1,4 @@
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";
 
 import type { TrpcSessionUser } from "../../../types";
diff --git a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
index dbcb26670b8554..5ae0aef261b5da 100644
--- a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
@@ -6,9 +6,9 @@ import {
 import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { UserRepository } from "@calcom/lib/server/repository/user";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/teams/publish.handler.ts b/packages/trpc/server/routers/viewer/teams/publish.handler.ts
index 5b353e6902261b..5d7a12daa5d6c7 100644
--- a/packages/trpc/server/routers/viewer/teams/publish.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/publish.handler.ts
@@ -2,7 +2,7 @@ import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/pay
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { Redirect } from "@calcom/lib/redirect";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/trpc/server/routers/viewer/teams/removeMember/BaseRemoveMemberService.ts b/packages/trpc/server/routers/viewer/teams/removeMember/BaseRemoveMemberService.ts
index a814d01e1b9c28..8e7a2a29414c20 100644
--- a/packages/trpc/server/routers/viewer/teams/removeMember/BaseRemoveMemberService.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeMember/BaseRemoveMemberService.ts
@@ -1,4 +1,4 @@
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 
 import type {
   IRemoveMemberService,
diff --git a/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/LegacyRemoveMemberService.test.ts b/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/LegacyRemoveMemberService.test.ts
index e22f4b2b509c72..d35d6d74ce7ef2 100644
--- a/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/LegacyRemoveMemberService.test.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/LegacyRemoveMemberService.test.ts
@@ -1,12 +1,10 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
 import * as teamQueries from "@calcom/features/ee/teams/lib/queries";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { TRPCError } from "@trpc/server";
-
 import { LegacyRemoveMemberService } from "../LegacyRemoveMemberService";
 
 vi.mock("@calcom/prisma", () => ({
@@ -17,7 +15,7 @@ vi.mock("@calcom/prisma", () => ({
   },
 }));
 
-vi.mock("@calcom/lib/server/service/teamService");
+vi.mock("@calcom/features/ee/teams/services/teamService");
 vi.mock("@calcom/features/ee/teams/lib/queries");
 
 describe("LegacyRemoveMemberService", () => {
diff --git a/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/PBACRemoveMemberService.test.ts b/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/PBACRemoveMemberService.test.ts
index a030fdbef7bb7c..b0b23023404a04 100644
--- a/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/PBACRemoveMemberService.test.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeMember/__tests__/PBACRemoveMemberService.test.ts
@@ -4,7 +4,7 @@ import * as teamQueries from "@calcom/features/ee/teams/lib/queries";
 import { PermissionMapper } from "@calcom/features/pbac/domain/mappers/PermissionMapper";
 import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { TeamService } from "@calcom/lib/server/service/teamService";
+import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
@@ -18,7 +18,7 @@ vi.mock("@calcom/prisma", () => ({
   },
 }));
 
-vi.mock("@calcom/lib/server/service/teamService");
+vi.mock("@calcom/features/ee/teams/services/teamService");
 vi.mock("@calcom/features/ee/teams/lib/queries");
 vi.mock("@calcom/features/pbac/services/permission-check.service");
 vi.mock("@calcom/features/pbac/domain/mappers/PermissionMapper");
diff --git a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
index 001d8946bdd577..12603c88c6505f 100644
--- a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
@@ -1,7 +1,9 @@
 import { sendTeamInviteEmail } from "@calcom/emails";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { VerificationTokenRepository } from "@calcom/lib/server/repository/verificationToken";
+import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import { ensureAtleastAdminPermissions, getTeamOrThrow } from "./inviteMember/utils";
@@ -37,15 +39,24 @@ export const resendInvitationHandler = async ({ ctx, input }: InviteMemberOption
   }
 
   const inviteTeamOptions = {
-    joinLink: `${WEBAPP_URL}/teams?token=${verificationToken?.token}&autoAccept=true`,
+    joinLink: `${WEBAPP_URL}/auth/login?callbackUrl=/settings/teams`,
     isCalcomMember: true,
     isAutoJoin: false,
   };
 
   if (verificationToken) {
-    // Token only exists if user is CAL user but hasn't completed onboarding.
-    inviteTeamOptions.joinLink = `${WEBAPP_URL}/signup?token=${verificationToken.token}&callbackUrl=/getting-started`;
-    inviteTeamOptions.isCalcomMember = false;
+    try {
+      const user = await new UserRepository(prisma).findByEmail({ email: input.email });
+
+      if (user?.completedOnboarding) {
+        inviteTeamOptions.joinLink = `${WEBAPP_URL}/teams?token=${verificationToken.token}&autoAccept=true`;
+      } else {
+        inviteTeamOptions.joinLink = `${WEBAPP_URL}/signup?token=${verificationToken.token}&callbackUrl=/getting-started`;
+        inviteTeamOptions.isCalcomMember = false;
+      }
+    } catch (error) {
+      console.error("[resendInvitationHandler] Error fetching user: ", error);
+    }
   }
 
   const translation = await getTranslation(input.language ?? "en", "common");
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.handler.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.handler.ts
index 534b954528eb9a..3e51fa5e9b3806 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.handler.ts
@@ -4,7 +4,7 @@ import type { IsFixedAwareUser } from "@calcom/features/bookings/lib/handleNewBo
 import { enrichUsersWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import logger from "@calcom/lib/logger";
-import { withSelectedCalendars } from "@calcom/lib/server/repository/user";
+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";
 import type { PrismaClient } from "@calcom/prisma";
 import { userSelect } from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.handler.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.handler.ts
index f1f26b48fe1200..587c45a0ede30c 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.handler.ts
@@ -1,5 +1,5 @@
 import { roundRobinManualReassignment } from "@calcom/features/ee/round-robin/roundRobinManualReassignment";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.handler.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.handler.ts
index 4e49dbc3851964..f0d8c2fed3fc31 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.handler.ts
@@ -1,5 +1,5 @@
 import { roundRobinReassignment } from "@calcom/features/ee/round-robin/roundRobinReassignment";
-import { BookingRepository } from "@calcom/lib/server/repository/booking";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/teams/skipTeamTrials.handler.ts b/packages/trpc/server/routers/viewer/teams/skipTeamTrials.handler.ts
index 6ac8b7372b21ea..fae063d4c40b1e 100644
--- a/packages/trpc/server/routers/viewer/teams/skipTeamTrials.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/skipTeamTrials.handler.ts
@@ -1,7 +1,7 @@
 import { InternalTeamBilling } from "@calcom/ee/billing/teams/internal-team-billing";
 import { IS_SELF_HOSTED } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/teams/skipTeamTrials.test.ts b/packages/trpc/server/routers/viewer/teams/skipTeamTrials.test.ts
index dd56a9549e031b..b9b25d0b802137 100644
--- a/packages/trpc/server/routers/viewer/teams/skipTeamTrials.test.ts
+++ b/packages/trpc/server/routers/viewer/teams/skipTeamTrials.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
 import { InternalTeamBilling } from "@calcom/ee/billing/teams/internal-team-billing";
-import { MembershipRepository } from "@calcom/lib/server/repository/membership";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { prisma } from "@calcom/prisma";
 
 import { skipTeamTrialsHandler } from "./skipTeamTrials.handler";
@@ -44,7 +44,7 @@ vi.mock("@calcom/lib/logger", () => ({
   },
 }));
 
-vi.mock("@calcom/lib/server/repository/membership", () => ({
+vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => ({
   MembershipRepository: {
     findAllAcceptedTeamMemberships: vi.fn(),
   },
diff --git a/packages/trpc/server/routers/viewer/teams/update.handler.ts b/packages/trpc/server/routers/viewer/teams/update.handler.ts
index 7096e52617bdab..9d3cec5adc408b 100644
--- a/packages/trpc/server/routers/viewer/teams/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/update.handler.ts
@@ -4,7 +4,7 @@ import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
 import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
 import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";
 import { uploadLogo } from "@calcom/lib/server/avatar";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole, RedirectType, RRTimestampBasis } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/webhook/get.handler.ts b/packages/trpc/server/routers/viewer/webhook/get.handler.ts
index b8f49728f5d050..a1275fcc2a07af 100644
--- a/packages/trpc/server/routers/viewer/webhook/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/get.handler.ts
@@ -1,4 +1,4 @@
-import { WebhookRepository } from "@calcom/lib/server/repository/webhook";
+import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import type { TGetInputSchema } from "./get.schema";
@@ -11,5 +11,6 @@ type GetOptions = {
 };
 
 export const getHandler = async ({ ctx: _ctx, input }: GetOptions) => {
-  return await WebhookRepository.findByWebhookId(input.webhookId);
+  const webhookRepository = WebhookRepository.getInstance();
+  return await webhookRepository.findByWebhookId(input.webhookId);
 };
diff --git a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
index 785abbde4fcce0..0d78f55f4def69 100644
--- a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
@@ -1,4 +1,4 @@
-import { WebhookRepository } from "@calcom/lib/server/repository/webhook";
+import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";
 import type { Webhook } from "@calcom/prisma/client";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
@@ -33,9 +33,9 @@ export type WebhooksByViewer = {
 };
 
 export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
-  // Use the new PBAC-aware method for fetching webhooks
-
-  return await WebhookRepository.getFilteredWebhooksForUser({
+  // Use the singleton instance to avoid creating new instances repeatedly
+  const webhookRepository = WebhookRepository.getInstance();
+  return await webhookRepository.getFilteredWebhooksForUser({
     userId: ctx.user.id,
     userRole: ctx.user.role,
   });
diff --git a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts
index 6e6f32988ff08b..52ee9bce61216a 100644
--- a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts
@@ -2,8 +2,8 @@ import { scheduleEmailReminder } from "@calcom/features/ee/workflows/lib/reminde
 import { scheduleSMSReminder } from "@calcom/features/ee/workflows/lib/reminders/smsReminderManager";
 import { scheduleWhatsappReminder } from "@calcom/features/ee/workflows/lib/reminders/whatsappReminderManager";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import { prisma } from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/enums";
diff --git a/packages/trpc/server/routers/viewer/workflows/delete.handler.test.ts b/packages/trpc/server/routers/viewer/workflows/delete.handler.test.ts
index febd4d72ef734f..955f63c2dcc491 100644
--- a/packages/trpc/server/routers/viewer/workflows/delete.handler.test.ts
+++ b/packages/trpc/server/routers/viewer/workflows/delete.handler.test.ts
@@ -3,7 +3,7 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { WorkflowActions } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
@@ -23,7 +23,7 @@ vi.mock("@calcom/features/calAIPhone", () => ({
   createDefaultAIPhoneServiceProvider: vi.fn(),
 }));
 
-vi.mock("@calcom/lib/server/repository/workflow", () => ({
+vi.mock("@calcom/features/ee/workflows/repositories/WorkflowRepository", () => ({
   WorkflowRepository: {
     deleteAllWorkflowReminders: vi.fn(),
   },
diff --git a/packages/trpc/server/routers/viewer/workflows/delete.handler.ts b/packages/trpc/server/routers/viewer/workflows/delete.handler.ts
index 94e727cbde145b..1d8e6e89df8462 100644
--- a/packages/trpc/server/routers/viewer/workflows/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/delete.handler.ts
@@ -1,5 +1,5 @@
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { prisma } from "@calcom/prisma";
 import { WorkflowActions } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/workflows/filteredList.handler.tsx b/packages/trpc/server/routers/viewer/workflows/filteredList.handler.tsx
index 85076a2ca53d89..32eb0de8bc8a33 100644
--- a/packages/trpc/server/routers/viewer/workflows/filteredList.handler.tsx
+++ b/packages/trpc/server/routers/viewer/workflows/filteredList.handler.tsx
@@ -1,4 +1,4 @@
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { addPermissionsToWorkflows } from "@calcom/lib/server/repository/workflow-permissions";
 import type { PrismaClient } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
diff --git a/packages/trpc/server/routers/viewer/workflows/get.handler.ts b/packages/trpc/server/routers/viewer/workflows/get.handler.ts
index f9f794f5c63113..73a004cede3888 100644
--- a/packages/trpc/server/routers/viewer/workflows/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/get.handler.ts
@@ -1,4 +1,4 @@
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { addPermissionsToWorkflow } from "@calcom/lib/server/repository/workflow-permissions";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
diff --git a/packages/trpc/server/routers/viewer/workflows/get.schema.ts b/packages/trpc/server/routers/viewer/workflows/get.schema.ts
index 6141ec4a6f556d..9f8500f578c0b6 100644
--- a/packages/trpc/server/routers/viewer/workflows/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/get.schema.ts
@@ -1,2 +1,2 @@
-export { ZGetInputSchema } from "@calcom/lib/server/repository/workflow";
-export type { TGetInputSchema } from "@calcom/lib/server/repository/workflow";
+export { ZGetInputSchema } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
+export type { TGetInputSchema } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
diff --git a/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts b/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
index bab48b3ab99022..432dbec879062a 100644
--- a/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
@@ -8,7 +8,7 @@ import {
 } from "@calcom/ee/workflows/lib/constants";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 
-const ZWorkflow = z.object({
+export const ZWorkflow = z.object({
   id: z.number(),
   name: z.string(),
   trigger: z.enum(WORKFLOW_TRIGGER_EVENTS),
@@ -28,6 +28,7 @@ const ZWorkflow = z.object({
       sender: z.string().nullable(),
       includeCalendarEvent: z.boolean(),
       numberVerificationPending: z.boolean(),
+      verifiedAt: z.coerce.date().nullable().optional(),
     })
     .array(),
 });
diff --git a/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.handler.ts b/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.handler.ts
index 0abfc47e3d8970..67abc21a79f116 100644
--- a/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.handler.ts
@@ -1,4 +1,4 @@
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import type { TGetVerifiedEmailsInputSchema } from "./getVerifiedEmails.schema";
diff --git a/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.handler.ts b/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.handler.ts
index b0e98882c05235..967266e78e0290 100644
--- a/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.handler.ts
@@ -1,4 +1,4 @@
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
 import type { TGetVerifiedNumbersInputSchema } from "./getVerifiedNumbers.schema";
diff --git a/packages/trpc/server/routers/viewer/workflows/list.handler.ts b/packages/trpc/server/routers/viewer/workflows/list.handler.ts
index ba2a159f666325..82118b0d88eafb 100644
--- a/packages/trpc/server/routers/viewer/workflows/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/list.handler.ts
@@ -1,8 +1,9 @@
 import type { WorkflowType } from "@calcom/features/ee/workflows/components/WorkflowListPage";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 // import dayjs from "@calcom/dayjs";
 // import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { addPermissionsToWorkflows } from "@calcom/lib/server/repository/workflow-permissions";
-import { prisma } from "@calcom/prisma";
 import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
@@ -19,85 +20,19 @@ type ListOptions = {
 
 export const listHandler = async ({ ctx, input }: ListOptions) => {
   const workflows: WorkflowType[] = [];
+  const teamRepository = new TeamRepository(ctx.prisma);
 
-  const org = await prisma.team.findFirst({
-    where: {
-      isOrganization: true,
-      children: {
-        some: {
-          id: input?.teamId,
-        },
-      },
-      members: {
-        some: {
-          userId: input?.userId || ctx.user.id,
-          accepted: true,
-        },
-      },
-    },
-    select: {
-      id: true,
-    },
+  const org = await teamRepository.findOrganization({
+    teamId: input.teamId,
+    userId: input.userId || ctx.user.id,
   });
 
   if (org) {
-    const activeOrgWorkflows = await prisma.workflow.findMany({
-      where: {
-        team: {
-          id: org.id,
-          members: {
-            some: {
-              userId: ctx.user.id,
-              accepted: true,
-            },
-          },
-        },
-        OR: [
-          {
-            isActiveOnAll: true,
-          },
-          {
-            activeOnTeams: {
-              some: {
-                team: {
-                  OR: [
-                    { id: input?.teamId },
-                    {
-                      members: {
-                        some: {
-                          userId: ctx.user.id,
-                          accepted: true,
-                        },
-                      },
-                    },
-                  ],
-                },
-              },
-            },
-          },
-        ],
-      },
-      include: {
-        team: {
-          select: {
-            id: true,
-            slug: true,
-            name: true,
-            members: true,
-          },
-        },
-        activeOnTeams: {
-          select: {
-            team: {
-              select: {
-                id: true,
-                name: true,
-              },
-            },
-          },
-        },
-        steps: true,
-      },
+    const activeOrgWorkflows = await WorkflowRepository.findActiveOrgWorkflows({
+      orgId: org.id,
+      userId: ctx.user.id,
+      teamId: input.teamId!,
+      excludeFormTriggers: input.includeOnlyEventTypeWorkflows,
     });
     workflows.push(
       ...activeOrgWorkflows.map((workflow) => {
@@ -107,48 +42,10 @@ export const listHandler = async ({ ctx, input }: ListOptions) => {
   }
 
   if (input && input.teamId) {
-    const teamWorkflows: WorkflowType[] = await prisma.workflow.findMany({
-      where: {
-        team: {
-          id: input.teamId,
-          members: {
-            some: {
-              userId: ctx.user.id,
-              accepted: true,
-            },
-          },
-        },
-      },
-      include: {
-        team: {
-          select: {
-            id: true,
-            slug: true,
-            name: true,
-            members: true,
-          },
-        },
-        activeOn: {
-          select: {
-            eventType: {
-              select: {
-                id: true,
-                title: true,
-                parentId: true,
-                _count: {
-                  select: {
-                    children: true,
-                  },
-                },
-              },
-            },
-          },
-        },
-        steps: true,
-      },
-      orderBy: {
-        id: "asc",
-      },
+    const teamWorkflows: WorkflowType[] = await WorkflowRepository.findTeamWorkflows({
+      teamId: input.teamId,
+      userId: ctx.user.id,
+      excludeFormTriggers: input.includeOnlyEventTypeWorkflows,
     });
     const workflowsWithReadOnly = teamWorkflows.map((workflow) => {
       const readOnly = !!workflow.team?.members?.find(
@@ -169,40 +66,9 @@ export const listHandler = async ({ ctx, input }: ListOptions) => {
   }
 
   if (input && input.userId) {
-    const userWorkflows: WorkflowType[] = await prisma.workflow.findMany({
-      where: {
-        userId: ctx.user.id,
-      },
-      include: {
-        activeOn: {
-          select: {
-            eventType: {
-              select: {
-                id: true,
-                title: true,
-                parentId: true,
-                _count: {
-                  select: {
-                    children: true,
-                  },
-                },
-              },
-            },
-          },
-        },
-        steps: true,
-        team: {
-          select: {
-            id: true,
-            slug: true,
-            name: true,
-            members: true,
-          },
-        },
-      },
-      orderBy: {
-        id: "asc",
-      },
+    const userWorkflows: WorkflowType[] = await WorkflowRepository.findUserWorkflows({
+      userId: ctx.user.id,
+      excludeFormTriggers: input.includeOnlyEventTypeWorkflows,
     });
 
     workflows.push(...userWorkflows);
@@ -216,52 +82,9 @@ export const listHandler = async ({ ctx, input }: ListOptions) => {
     return { workflows: filteredWorkflows };
   }
 
-  const allWorkflows = await prisma.workflow.findMany({
-    where: {
-      OR: [
-        { userId: ctx.user.id },
-        {
-          team: {
-            members: {
-              some: {
-                userId: ctx.user.id,
-                accepted: true,
-              },
-            },
-          },
-        },
-      ],
-    },
-    include: {
-      activeOn: {
-        select: {
-          eventType: {
-            select: {
-              id: true,
-              title: true,
-              parentId: true,
-              _count: {
-                select: {
-                  children: true,
-                },
-              },
-            },
-          },
-        },
-      },
-      steps: true,
-      team: {
-        select: {
-          id: true,
-          slug: true,
-          name: true,
-          members: true,
-        },
-      },
-    },
-    orderBy: {
-      id: "asc",
-    },
+  const allWorkflows = await WorkflowRepository.findAllWorkflows({
+    userId: ctx.user.id,
+    excludeFormTriggers: input.includeOnlyEventTypeWorkflows,
   });
 
   const workflowsWithReadOnly: WorkflowType[] = allWorkflows.map((workflow) => {
diff --git a/packages/trpc/server/routers/viewer/workflows/list.schema.ts b/packages/trpc/server/routers/viewer/workflows/list.schema.ts
index e78497d03d3251..e02dd529c2e7dd 100644
--- a/packages/trpc/server/routers/viewer/workflows/list.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/list.schema.ts
@@ -1,10 +1,9 @@
 import { z } from "zod";
 
-export const ZListInputSchema = z
-  .object({
-    teamId: z.number().optional(),
-    userId: z.number().optional(),
-  })
-  .optional();
+export const ZListInputSchema = z.object({
+  teamId: z.number().optional(),
+  userId: z.number().optional(),
+  includeOnlyEventTypeWorkflows: z.boolean(),
+});
 
 export type TListInputSchema = z.infer<typeof ZListInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/update.handler.ts b/packages/trpc/server/routers/viewer/workflows/update.handler.ts
index f235bfc09bfc7f..935bf7259e58d4 100755
--- a/packages/trpc/server/routers/viewer/workflows/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/update.handler.ts
@@ -1,12 +1,18 @@
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
-import { isEmailAction } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import { isEmailAction, isFormTrigger } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
+import { WorkflowReminderRepository } from "@calcom/features/ee/workflows/lib/repository/workflowReminder";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import tasker from "@calcom/features/tasker";
 import { IS_SELF_HOSTED, SCANNING_WORKFLOW_STEPS } from "@calcom/lib/constants";
 import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
 import logger from "@calcom/lib/logger";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { PrismaAgentRepository } from "@calcom/lib/server/repository/PrismaAgentRepository";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { addPermissionsToWorkflow } from "@calcom/lib/server/repository/workflow-permissions";
-import type { PrismaClient } from "@calcom/prisma";
+import { WorkflowRelationsRepository } from "@calcom/lib/server/repository/workflowRelations";
+import { WorkflowStepRepository } from "@calcom/lib/server/repository/workflowStep";
+import { prisma, type PrismaClient } from "@calcom/prisma";
 import { WorkflowActions, WorkflowTemplates } from "@calcom/prisma/enums";
 import { PhoneNumberSubscriptionStatus } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
@@ -41,35 +47,19 @@ const log = logger.getSubLogger({ prefix: ["[Workflows.update] "] });
 
 export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
   const { user } = ctx;
-  const { id, name, activeOn, steps, trigger, time, timeUnit, isActiveOnAll } = input;
-
-  const userWorkflow = await ctx.prisma.workflow.findUnique({
-    where: {
-      id,
-    },
-    select: {
-      id: true,
-      userId: true,
-      isActiveOnAll: true,
-      trigger: true,
-      time: true,
-      timeUnit: true,
-      team: {
-        select: {
-          isOrganization: true,
-        },
-      },
-      teamId: true,
-      user: {
-        select: {
-          teams: true,
-        },
-      },
-      steps: true,
-      activeOn: true,
-      activeOnTeams: true,
-    },
-  });
+  const {
+    id,
+    name,
+    activeOnEventTypeIds,
+    activeOnRoutingFormIds,
+    steps,
+    trigger,
+    time,
+    timeUnit,
+    isActiveOnAll,
+  } = input;
+
+  const userWorkflow = await WorkflowRepository.findUniqueForUpdate(id);
 
   const isOrg = !!userWorkflow?.team?.isOrganization;
 
@@ -94,192 +84,156 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
 
   let removedActiveOnIds: number[] = [];
 
-  let activeOnWithChildren: number[] = activeOn;
+  let activeOnWithChildren: number[] = activeOnEventTypeIds;
 
   let oldActiveOnIds: number[] = [];
 
-  if (!isOrg) {
-    // activeOn are event types ids
-    const activeOnEventTypes = await ctx.prisma.eventType.findMany({
-      where: {
-        id: {
-          in: activeOn,
-        },
-        ...(userWorkflow.teamId && { parentId: null }), //all children managed event types are added after
-      },
-      select: {
-        id: true,
-        children: {
-          select: {
-            id: true,
-          },
-        },
-      },
-    });
+  const workflowRelationsRepository = new WorkflowRelationsRepository(ctx.prisma);
 
-    activeOnWithChildren = activeOnEventTypes
-      .map((eventType) => [eventType.id].concat(eventType.children.map((child) => child.id)))
-      .flat();
-
-    let oldActiveOnEventTypes: { id: number; children: { id: number }[] }[];
+  if (isOrg) {
+    // activeOn are team ids
     if (userWorkflow.isActiveOnAll) {
-      oldActiveOnEventTypes = await ctx.prisma.eventType.findMany({
-        where: {
-          ...(userWorkflow.teamId ? { teamId: userWorkflow.teamId } : { userId: userWorkflow.userId }),
-        },
-        select: {
-          id: true,
-          children: {
-            select: {
-              id: true,
-            },
-          },
-        },
-      });
+      const teamRepo = new TeamRepository(ctx.prisma);
+      oldActiveOnIds = (
+        await teamRepo.findAllByParentId({ parentId: userWorkflow.teamId ?? 0, select: { id: true } })
+      ).map((team) => team.id);
     } else {
-      oldActiveOnEventTypes = (
-        await ctx.prisma.workflowsOnEventTypes.findMany({
-          where: {
-            workflowId: id,
-          },
-          select: {
-            eventTypeId: true,
-            eventType: {
-              select: {
-                children: {
-                  select: {
-                    id: true,
-                  },
-                },
-              },
-            },
-          },
-        })
-      ).map((eventTypeRel) => {
-        return { id: eventTypeRel.eventTypeId, children: eventTypeRel.eventType.children };
-      });
+      oldActiveOnIds = (await workflowRelationsRepository.findActiveOnTeams(id)).map(
+        (teamRel) => teamRel.teamId
+      );
     }
 
-    oldActiveOnIds = oldActiveOnEventTypes.flatMap((eventType) => [
-      eventType.id,
-      ...eventType.children.map((child) => child.id),
-    ]);
+    newActiveOn = activeOnEventTypeIds.filter((teamId) => !oldActiveOnIds.includes(teamId));
 
-    newActiveOn = activeOn.filter((eventTypeId) => !oldActiveOnIds.includes(eventTypeId));
-
-    const isAuthorizedToAddIds = await isAuthorizedToAddActiveOnIds(
-      newActiveOn,
-      isOrg,
-      userWorkflow?.teamId,
-      userWorkflow?.userId
-    );
+    const isAuthorizedToAddIds = await isAuthorizedToAddActiveOnIds({
+      newEventTypeIds: [], // No event type IDs for team workflows
+      newRoutingFormIds: [], // No routing form IDs for team workflows
+      newTeamIds: newActiveOn,
+      teamId: userWorkflow?.teamId,
+      userId: userWorkflow?.userId,
+    });
 
     if (!isAuthorizedToAddIds) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
 
-    //remove all scheduled Email and SMS reminders for eventTypes that are not active any more
-    removedActiveOnIds = oldActiveOnIds.filter((eventTypeId) => !activeOnWithChildren.includes(eventTypeId));
-
-    await deleteRemindersOfActiveOnIds({ removedActiveOnIds, workflowSteps: userWorkflow.steps, isOrg });
+    removedActiveOnIds = oldActiveOnIds.filter((teamId) => !activeOnEventTypeIds.includes(teamId));
 
-    //update active on
-    await ctx.prisma.workflowsOnEventTypes.deleteMany({
-      where: {
-        workflowId: id,
-      },
+    await deleteRemindersOfActiveOnIds({
+      removedActiveOnIds,
+      workflowSteps: userWorkflow.steps,
+      isOrg,
+      activeOnIds: activeOnEventTypeIds.filter((activeOn) => !newActiveOn.includes(activeOn)),
     });
 
-    //create all workflow - eventtypes relationships
-    await ctx.prisma.workflowsOnEventTypes.createMany({
-      data: activeOnWithChildren.map((eventTypeId) => ({
-        workflowId: id,
-        eventTypeId,
-      })),
+    // clean up any old active on values
+    await workflowRelationsRepository.deleteAllActiveOnRelations(id);
+
+    // create all new active on relationships
+    await workflowRelationsRepository.createActiveOnTeams(id, activeOnEventTypeIds);
+  } else if (isFormTrigger(trigger)) {
+    // activeOnRoutingFormIds are routing form ids
+    const routingFormIds = activeOnRoutingFormIds;
+
+    const isAuthorizedToAddIds = await isAuthorizedToAddActiveOnIds({
+      newEventTypeIds: [], // No event type IDs for form triggers
+      newRoutingFormIds: routingFormIds ?? [],
+      newTeamIds: [], // No team IDs for form triggers
+      teamId: userWorkflow?.teamId,
+      userId: userWorkflow?.userId,
     });
+
+    if (!isAuthorizedToAddIds) {
+      throw new TRPCError({ code: "UNAUTHORIZED" });
+    }
+
+    // clean up any old active on values
+    await workflowRelationsRepository.deleteAllActiveOnRelations(id);
+
+    // Create new workflow - routing forms relationships
+    await workflowRelationsRepository.createActiveOnRoutingForms(id, routingFormIds ?? []);
   } else {
-    // activeOn are team ids
+    const eventTypeRepo = new EventTypeRepository(ctx.prisma);
+    const activeOnEventTypes = await eventTypeRepo.findEventTypesWithoutChildren(
+      activeOnEventTypeIds,
+      userWorkflow.teamId
+    );
+
+    activeOnWithChildren = activeOnEventTypes
+      .map((eventType) => [eventType.id].concat(eventType.children.map((child) => child.id)))
+      .flat();
+
+    let oldActiveOnEventTypes: { id: number; children: { id: number }[] }[];
     if (userWorkflow.isActiveOnAll) {
-      oldActiveOnIds = (
-        await ctx.prisma.team.findMany({
-          where: {
-            parent: {
-              id: userWorkflow.teamId ?? 0,
-            },
-          },
-          select: {
-            id: true,
-          },
-        })
-      ).map((team) => team.id);
+      oldActiveOnEventTypes = userWorkflow.teamId
+        ? await eventTypeRepo.findAllIncludingChildrenByTeamId({
+            teamId: userWorkflow.teamId,
+          })
+        : await eventTypeRepo.findAllIncludingChildrenByUserId({
+            userId: userWorkflow.userId,
+          });
     } else {
-      oldActiveOnIds = (
-        await ctx.prisma.workflowsOnTeams.findMany({
-          where: {
-            workflowId: id,
-          },
-          select: {
-            teamId: true,
-          },
-        })
-      ).map((teamRel) => teamRel.teamId);
+      oldActiveOnEventTypes = (await workflowRelationsRepository.findActiveOnEventTypes(id)).map(
+        (eventTypeRel) => {
+          return { id: eventTypeRel.eventTypeId, children: eventTypeRel.eventType.children };
+        }
+      );
     }
 
-    newActiveOn = activeOn.filter((teamId) => !oldActiveOnIds.includes(teamId));
+    oldActiveOnIds = oldActiveOnEventTypes.flatMap((eventType) => [
+      eventType.id,
+      ...eventType.children.map((child) => child.id),
+    ]);
 
-    const isAuthorizedToAddIds = await isAuthorizedToAddActiveOnIds(
-      newActiveOn,
-      isOrg,
-      userWorkflow?.teamId,
-      userWorkflow?.userId
-    );
+    newActiveOn = activeOnEventTypeIds.filter((eventTypeId) => !oldActiveOnIds.includes(eventTypeId));
+    const isAuthorizedToAddIds = await isAuthorizedToAddActiveOnIds({
+      newEventTypeIds: newActiveOn,
+      newRoutingFormIds: [],
+      newTeamIds: [],
+      teamId: userWorkflow?.teamId,
+      userId: userWorkflow?.userId,
+    });
 
     if (!isAuthorizedToAddIds) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
 
-    removedActiveOnIds = oldActiveOnIds.filter((teamId) => !activeOn.includes(teamId));
+    //remove all scheduled Email and SMS reminders for eventTypes that are not active any more
+    removedActiveOnIds = oldActiveOnIds.filter((eventTypeId) => !activeOnWithChildren.includes(eventTypeId));
 
-    await deleteRemindersOfActiveOnIds({
-      removedActiveOnIds,
-      workflowSteps: userWorkflow.steps,
-      isOrg,
-      activeOnIds: activeOn.filter((activeOn) => !newActiveOn.includes(activeOn)),
-    });
+    // clean up any old active on values
+    await deleteRemindersOfActiveOnIds({ removedActiveOnIds, workflowSteps: userWorkflow.steps, isOrg });
 
-    //update active on
-    await ctx.prisma.workflowsOnTeams.deleteMany({
-      where: {
-        workflowId: id,
-      },
-    });
+    // clean up an old relationships
+    await workflowRelationsRepository.deleteAllActiveOnRelations(id);
 
-    await ctx.prisma.workflowsOnTeams.createMany({
-      data: activeOn.map((teamId) => ({
-        workflowId: id,
-        teamId,
-      })),
-    });
+    //create all workflow - eventtypes relationships
+    await workflowRelationsRepository.createActiveOnEventTypes(id, activeOnWithChildren);
   }
 
   if (userWorkflow.trigger !== trigger || userWorkflow.time !== time || userWorkflow.timeUnit !== timeUnit) {
-    //if trigger changed, delete all reminders from steps before change
-    await deleteRemindersOfActiveOnIds({
-      removedActiveOnIds: oldActiveOnIds,
-      workflowSteps: userWorkflow.steps,
-      isOrg,
-    });
+    if (!isFormTrigger(userWorkflow.trigger)) {
+      // Delete all existing reminders before rescheduling
+      await deleteRemindersOfActiveOnIds({
+        removedActiveOnIds: oldActiveOnIds,
+        workflowSteps: userWorkflow.steps,
+        isOrg,
+      });
+    }
 
-    await scheduleWorkflowNotifications({
-      activeOn, // schedule for activeOn that stayed the same + new active on (old reminders were deleted)
-      isOrg,
-      workflowSteps: userWorkflow.steps, // use old steps here, edited and deleted steps are handled below
-      time,
-      timeUnit,
-      trigger,
-      userId: user.id,
-      teamId: userWorkflow.teamId,
-    });
+    if (!isFormTrigger(trigger)) {
+      // Schedule new reminders for all activeOn
+      await scheduleWorkflowNotifications({
+        activeOn: activeOnWithChildren, // schedule for activeOn that stayed the same + new active on (old reminders were deleted)
+        isOrg,
+        workflowSteps: userWorkflow.steps, // use old steps here, edited and deleted steps are handled below
+        time,
+        timeUnit,
+        trigger,
+        userId: user.id,
+        teamId: userWorkflow.teamId,
+      });
+    }
   } else {
     // if trigger didn't change, only schedule reminders for all new activeOn
     await scheduleWorkflowNotifications({
@@ -291,10 +245,14 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
       trigger,
       userId: user.id,
       teamId: userWorkflow.teamId,
-      alreadyScheduledActiveOnIds: activeOn.filter((activeOn) => !newActiveOn.includes(activeOn)), // alreadyScheduledActiveOnIds
+      alreadyScheduledActiveOnIds: activeOnEventTypeIds.filter((activeOn) => !newActiveOn.includes(activeOn)), // alreadyScheduledActiveOnIds
     });
   }
 
+  const workflowStepRepository = new WorkflowStepRepository(ctx.prisma);
+
+  const agentRepo = new PrismaAgentRepository(prisma);
+
   // handle deleted and edited workflow steps
   await Promise.all(
     userWorkflow.steps.map(async (oldStep) => {
@@ -302,7 +260,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
       let newStep;
 
       if (foundStep) {
-        const { senderName, ...rest } = {
+        newStep = {
           ...foundStep,
           numberVerificationPending: false,
           sender: getSender({
@@ -311,40 +269,13 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
             senderName: foundStep.senderName,
           }),
         };
-        newStep = rest;
       }
 
-      const remindersFromStep = await ctx.prisma.workflowReminder.findMany({
-        where: {
-          workflowStepId: oldStep.id,
-        },
-        select: {
-          id: true,
-          referenceId: true,
-          method: true,
-          booking: {
-            select: {
-              eventTypeId: true,
-            },
-          },
-        },
-      });
+      const remindersFromStep = await WorkflowReminderRepository.findWorkflowRemindersByStepId(oldStep.id);
       //step was deleted
       if (!newStep) {
         if (oldStep.action === WorkflowActions.CAL_AI_PHONE_CALL && !!oldStep.agentId) {
-          const agent = await ctx.prisma.agent.findUnique({
-            where: { id: oldStep.agentId ?? undefined },
-            select: {
-              id: true,
-              outboundPhoneNumbers: {
-                select: {
-                  id: true,
-                  phoneNumber: true,
-                  subscriptionStatus: true,
-                },
-              },
-            },
-          });
+          const agent = await agentRepo.findAgentWithPhoneNumbers(oldStep.agentId ?? undefined);
 
           if (!agent) {
             throw new TRPCError({
@@ -354,16 +285,12 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
           }
 
           await WorkflowRepository.deleteAllWorkflowReminders(remindersFromStep);
-          await ctx.prisma.workflowStep.delete({
-            where: {
-              id: oldStep.id,
-            },
-          });
+          await workflowStepRepository.deleteById(oldStep.id);
 
           const aiPhoneService = createDefaultAIPhoneServiceProvider();
           const externalErrors: string[] = [];
 
-          const phoneNumberOperations: Promise<any>[] = [];
+          const phoneNumberOperations: Promise<void | { success: boolean; message: string }>[] = [];
 
           if (agent.outboundPhoneNumbers) {
             for (const phoneNumber of agent.outboundPhoneNumbers) {
@@ -464,11 +391,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
         } else {
           // For non-AI phone steps, just delete reminders and step
           await WorkflowRepository.deleteAllWorkflowReminders(remindersFromStep);
-          await ctx.prisma.workflowStep.delete({
-            where: {
-              id: oldStep.id,
-            },
-          });
+          await workflowStepRepository.deleteById(oldStep.id);
         }
       } else if (
         isStepEdited(oldStep, {
@@ -520,25 +443,19 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
 
         const didBodyChange = newStep.reminderBody !== oldStep.reminderBody;
 
-        await ctx.prisma.workflowStep.update({
-          where: {
-            id: oldStep.id,
-          },
-          data: {
-            action: newStep.action,
-            sendTo: requiresSender ? newStep.sendTo : null,
-            stepNumber: newStep.stepNumber,
-            workflowId: newStep.workflowId,
-            reminderBody: newStep.reminderBody,
-            emailSubject: newStep.emailSubject,
-            template: newStep.template,
-            numberRequired: newStep.numberRequired,
-            sender: newStep.sender,
-            numberVerificationPending: false,
-            includeCalendarEvent: newStep.includeCalendarEvent,
-            agentId: newStep.agentId || null,
-            verifiedAt: !SCANNING_WORKFLOW_STEPS ? new Date() : didBodyChange ? null : oldStep.verifiedAt,
-          },
+        await workflowStepRepository.updateWorkflowStep(oldStep.id, {
+          action: newStep.action,
+          sendTo: requiresSender ? newStep.sendTo : null,
+          stepNumber: newStep.stepNumber,
+          reminderBody: newStep.reminderBody,
+          emailSubject: newStep.emailSubject,
+          template: newStep.template,
+          numberRequired: newStep.numberRequired,
+          sender: newStep.sender,
+          numberVerificationPending: false,
+          includeCalendarEvent: newStep.includeCalendarEvent,
+          agentId: newStep.agentId || null,
+          verifiedAt: !SCANNING_WORKFLOW_STEPS ? new Date() : didBodyChange ? null : oldStep.verifiedAt,
         });
 
         if (SCANNING_WORKFLOW_STEPS && didBodyChange) {
@@ -547,10 +464,10 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
             userId: ctx.user.id,
             createdAt: new Date().toISOString(),
           });
-        } else {
-          // schedule notifications for edited steps
+        } else if (!isFormTrigger(trigger)) {
+          // schedule notifications for edited steps (only for event-based triggers)
           await scheduleWorkflowNotifications({
-            activeOn,
+            activeOn: activeOnEventTypeIds,
             isOrg,
             workflowSteps: [newStep],
             time,
@@ -590,20 +507,16 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
           await verifyEmailSender(newStep.sendTo || "", user.id, userWorkflow.teamId);
         }
 
-        const {
-          id: _stepId,
-          senderName,
-          ...stepToAdd
-        } = {
+        return {
           ...newStep,
           sender: getSender({
             action: newStep.action,
             sender: newStep.sender || null,
             senderName: newStep.senderName,
           }),
+          id: undefined,
+          senderName: undefined,
         };
-
-        return stepToAdd;
       })
   );
 
@@ -611,12 +524,11 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
     //create new steps
     const createdSteps = await Promise.all(
       addedSteps.map((step) =>
-        ctx.prisma.workflowStep.create({
-          data: {
-            ...step,
-            numberVerificationPending: false,
-            ...(!SCANNING_WORKFLOW_STEPS ? { verifiedAt: new Date() } : {}),
-          },
+        workflowStepRepository.createWorkflowStep({
+          ...step,
+          workflowId: id,
+          numberVerificationPending: false,
+          ...(!SCANNING_WORKFLOW_STEPS ? { verifiedAt: new Date() } : {}),
         })
       )
     );
@@ -631,10 +543,10 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
           })
         )
       );
-    } else {
-      // schedule notification for new step
+    } else if (!isFormTrigger(trigger)) {
+      // schedule notification for new step (only for event-based triggers)
       await scheduleWorkflowNotifications({
-        activeOn,
+        activeOn: activeOnEventTypeIds,
         isOrg,
         workflowSteps: createdSteps,
         time,
@@ -647,50 +559,15 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
   }
 
   //update trigger, name, time, timeUnit
-  await ctx.prisma.workflow.update({
-    where: {
-      id,
-    },
-    data: {
-      name,
-      trigger,
-      time,
-      timeUnit,
-      isActiveOnAll,
-    },
+  await WorkflowRepository.updateWorkflow(id, {
+    name,
+    trigger,
+    time,
+    timeUnit,
+    isActiveOnAll,
   });
 
-  const workflow = await ctx.prisma.workflow.findUnique({
-    where: {
-      id,
-    },
-    include: {
-      activeOn: {
-        select: {
-          eventType: true,
-        },
-      },
-      activeOnTeams: {
-        select: {
-          team: true,
-        },
-      },
-      team: {
-        select: {
-          id: true,
-          slug: true,
-          members: true,
-          name: true,
-          isOrganization: true,
-        },
-      },
-      steps: {
-        orderBy: {
-          stepNumber: "asc",
-        },
-      },
-    },
-  });
+  const workflow = await WorkflowRepository.findUniqueWithRelations(id);
 
   if (!workflow) {
     throw new TRPCError({
@@ -699,48 +576,51 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
     });
   }
 
-  // Remove or add booking field for sms reminder number
-  const smsReminderNumberNeeded =
-    activeOn.length &&
-    steps.some(
-      (step) =>
-        step.action === WorkflowActions.SMS_ATTENDEE || step.action === WorkflowActions.WHATSAPP_ATTENDEE
-    );
-  await removeSmsReminderFieldForEventTypes({
-    activeOnToRemove: removedActiveOnIds,
-    workflowId: id,
-    isOrg,
-    activeOn,
-  });
+  // Remove or add booking field for sms reminder number (only for event types, not routing forms)
+  if (!isFormTrigger(trigger)) {
+    const smsReminderNumberNeeded =
+      activeOnWithChildren.length &&
+      steps.some(
+        (step) =>
+          step.action === WorkflowActions.SMS_ATTENDEE || step.action === WorkflowActions.WHATSAPP_ATTENDEE
+      );
 
-  if (!smsReminderNumberNeeded) {
     await removeSmsReminderFieldForEventTypes({
-      activeOnToRemove: activeOnWithChildren,
+      activeOnToRemove: removedActiveOnIds,
       workflowId: id,
       isOrg,
-    });
-  } else {
-    await upsertSmsReminderFieldForEventTypes({
       activeOn: activeOnWithChildren,
-      workflowId: id,
-      isSmsReminderNumberRequired: steps.some(
-        (s) =>
-          (s.action === WorkflowActions.SMS_ATTENDEE || s.action === WorkflowActions.WHATSAPP_ATTENDEE) &&
-          s.numberRequired
-      ),
-      isOrg,
     });
+
+    if (!smsReminderNumberNeeded) {
+      await removeSmsReminderFieldForEventTypes({
+        activeOnToRemove: activeOnWithChildren,
+        workflowId: id,
+        isOrg,
+      });
+    } else {
+      await upsertSmsReminderFieldForEventTypes({
+        activeOn: activeOnWithChildren,
+        workflowId: id,
+        isSmsReminderNumberRequired: steps.some(
+          (s) =>
+            (s.action === WorkflowActions.SMS_ATTENDEE || s.action === WorkflowActions.WHATSAPP_ATTENDEE) &&
+            s.numberRequired
+        ),
+        isOrg,
+      });
+    }
   }
 
   // Remove or add attendeePhoneNumber field for AI phone call actions
   const aiPhoneCallStepsNeeded =
-    activeOn.length && steps.some((s) => s.action === WorkflowActions.CAL_AI_PHONE_CALL);
+    activeOnWithChildren.length && steps.some((s) => s.action === WorkflowActions.CAL_AI_PHONE_CALL);
 
   await removeAIAgentCallPhoneNumberFieldForEventTypes({
     activeOnToRemove: removedActiveOnIds,
     workflowId: id,
     isOrg,
-    activeOn,
+    activeOn: activeOnWithChildren,
   });
 
   if (!aiPhoneCallStepsNeeded) {
@@ -768,10 +648,7 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
         if (!step.agentId) return;
 
         try {
-          const agent = await ctx.prisma.agent.findUnique({
-            where: { id: step.agentId },
-            select: { providerAgentId: true },
-          });
+          const agent = await agentRepo.findProviderAgentIdById(step.agentId);
 
           if (!agent?.providerAgentId) {
             log.error(`Agent not found for step ${step.id} agentId ${step.agentId}`);
diff --git a/packages/trpc/server/routers/viewer/workflows/update.schema.ts b/packages/trpc/server/routers/viewer/workflows/update.schema.ts
index fb58c6155176dc..e643e557bcbcb9 100644
--- a/packages/trpc/server/routers/viewer/workflows/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/update.schema.ts
@@ -1,38 +1,57 @@
 import { z } from "zod";
 
+import { isFormTrigger } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
 import {
   WORKFLOW_TEMPLATES,
   TIME_UNIT,
   WORKFLOW_ACTIONS,
   WORKFLOW_TRIGGER_EVENTS,
+  ALLOWED_FORM_WORKFLOW_ACTIONS,
 } from "@calcom/features/ee/workflows/lib/constants";
 
-export const ZUpdateInputSchema = z.object({
+const stepSchema = z.object({
   id: z.number(),
-  name: z.string(),
-  activeOn: z.number().array(),
-  steps: z
-    .object({
-      id: z.number(),
-      stepNumber: z.number(),
-      action: z.enum(WORKFLOW_ACTIONS),
-      workflowId: z.number(),
-      sendTo: z.string().nullable(),
-      reminderBody: z.string().nullable(),
-      emailSubject: z.string().nullable(),
-      template: z.enum(WORKFLOW_TEMPLATES),
-      numberRequired: z.boolean().nullable(),
-      sender: z.string().nullable(),
-      senderName: z.string().nullable(),
-      includeCalendarEvent: z.boolean(),
-      agentId: z.string().nullish(),
-      inboundAgentId: z.string().nullish(),
-    })
-    .array(),
-  trigger: z.enum(WORKFLOW_TRIGGER_EVENTS),
-  time: z.number().nullable(),
-  timeUnit: z.enum(TIME_UNIT).nullable(),
-  isActiveOnAll: z.boolean().optional(),
+  stepNumber: z.number(),
+  action: z.enum(WORKFLOW_ACTIONS),
+  workflowId: z.number(),
+  sendTo: z.string().nullable(),
+  reminderBody: z.string().nullable(),
+  emailSubject: z.string().nullable(),
+  template: z.enum(WORKFLOW_TEMPLATES),
+  numberRequired: z.boolean().nullable(),
+  sender: z.string().nullable(),
+  senderName: z.string().nullable(),
+  includeCalendarEvent: z.boolean(),
+  agentId: z.string().nullish(),
+  inboundAgentId: z.string().nullish(),
 });
 
+export const ZUpdateInputSchema = z
+  .object({
+    id: z.number(),
+    name: z.string(),
+    activeOnEventTypeIds: z.number().array(), // also includes team ids
+    activeOnRoutingFormIds: z.string().array(),
+    steps: stepSchema.array(),
+    trigger: z.enum(WORKFLOW_TRIGGER_EVENTS),
+    time: z.number().nullable(),
+    timeUnit: z.enum(TIME_UNIT).nullable(),
+    isActiveOnAll: z.boolean().optional(),
+  })
+  .refine(
+    (data) => {
+      // For form triggers, validate that all steps use allowed actions
+      if (isFormTrigger(data.trigger)) {
+        return data.steps.every((step) =>
+          (ALLOWED_FORM_WORKFLOW_ACTIONS as readonly string[]).includes(step.action)
+        );
+      }
+      return true;
+    },
+    {
+      message: "This action is not allowed for form triggers",
+      path: ["steps"],
+    }
+  );
+
 export type TUpdateInputSchema = z.infer<typeof ZUpdateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/util.ts b/packages/trpc/server/routers/viewer/workflows/util.ts
index 5c104258871f49..4d3e8c1ab825bc 100644
--- a/packages/trpc/server/routers/viewer/workflows/util.ts
+++ b/packages/trpc/server/routers/viewer/workflows/util.ts
@@ -12,7 +12,7 @@ import type { Workflow as WorkflowType } from "@calcom/ee/workflows/lib/types";
 import {
   SMS_REMINDER_NUMBER_FIELD,
   CAL_AI_AGENT_PHONE_NUMBER_FIELD,
-} from "@calcom/features/bookings/lib/SystemField";
+} from "@calcom/lib/bookings/SystemField";
 import {
   getSmsReminderNumberField,
   getSmsReminderNumberSource,
@@ -23,15 +23,14 @@ import { removeBookingField, upsertBookingField } from "@calcom/features/eventty
 import type { PermissionString } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
-import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
+import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
-import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
+import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";
 import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
 import prisma from "@calcom/prisma";
-import type { Workflow } from "@calcom/prisma/client";
+import { WorkflowType as PrismaWorkflowType, type Workflow } from "@calcom/prisma/client";
 import type { Prisma, WorkflowStep } from "@calcom/prisma/client";
 import type { TimeUnit } from "@calcom/prisma/enums";
 import { WorkflowTemplates } from "@calcom/prisma/enums";
@@ -44,8 +43,6 @@ import { TRPCError } from "@trpc/server";
 
 import type { ZWorkflows } from "./getAllActiveWorkflows.schema";
 
-const log = logger.getSubLogger({ prefix: ["workflow"] });
-
 export const bookingSelect = {
   userPrimaryEmail: true,
   startTime: true,
@@ -456,53 +453,85 @@ async function getAllUserAndTeamEventTypes(teamIds: number[], notMemberOfTeamId:
   return teamEventTypes.map((et) => et.id).concat(userEventTypes);
 }
 
-export async function isAuthorizedToAddActiveOnIds(
-  newActiveIds: number[],
-  isOrg: boolean,
-  teamId?: number | null,
-  userId?: number | null
-) {
-  for (const id of newActiveIds) {
-    if (isOrg) {
-      const newTeam = await prisma.team.findUnique({
-        where: {
-          id,
-        },
-        select: {
-          parent: true,
-        },
-      });
-      if (newTeam?.parent?.id !== teamId) {
-        return false;
-      }
-    } else {
-      const newEventType = await prisma.eventType.findUnique({
-        where: {
-          id,
-        },
-        include: {
-          users: {
-            select: {
-              id: true,
-            },
+export async function isAuthorizedToAddActiveOnIds({
+  newEventTypeIds,
+  newRoutingFormIds,
+  newTeamIds,
+  teamId,
+  userId,
+}: {
+  newEventTypeIds: number[];
+  newRoutingFormIds: string[];
+  newTeamIds: number[];
+  teamId?: number | null;
+  userId?: number | null;
+}) {
+  for (const id of newTeamIds) {
+    const newTeam = await prisma.team.findUnique({
+      where: {
+        id,
+      },
+      select: {
+        parent: true,
+      },
+    });
+    if (newTeam?.parent?.id !== teamId) {
+      return false;
+    }
+  }
+
+  // Check authorization for event type IDs
+  for (const id of newEventTypeIds) {
+    const newEventType = await prisma.eventType.findUnique({
+      where: {
+        id,
+      },
+      include: {
+        users: {
+          select: {
+            id: true,
           },
-          children: true,
         },
-      });
+        children: true,
+      },
+    });
 
-      if (newEventType) {
-        if (teamId && teamId !== newEventType.teamId) {
-          return false;
-        }
-        if (
-          !teamId &&
-          userId &&
-          newEventType.userId !== userId &&
-          !newEventType?.users.find((eventTypeUser) => eventTypeUser.id === userId)
-        ) {
-          return false;
-        }
+    if (newEventType) {
+      if (teamId && teamId !== newEventType.teamId) {
+        return false;
       }
+      if (
+        !teamId &&
+        userId &&
+        newEventType.userId !== userId &&
+        !newEventType?.users.find((eventTypeUser) => eventTypeUser.id === userId)
+      ) {
+        return false;
+      }
+    }
+  }
+
+  // Check authorization for routing form IDs
+  for (const id of newRoutingFormIds) {
+    // For routing forms, check if user has access to the form
+    const routingForm = await prisma.app_RoutingForms_Form.findUnique({
+      where: {
+        id: String(id),
+      },
+      select: {
+        userId: true,
+        teamId: true,
+      },
+    });
+
+    if (!routingForm) return false;
+
+    if (teamId && teamId !== routingForm.teamId) {
+      return false;
+    }
+
+    if (!teamId && userId && routingForm.userId !== userId) {
+      return false;
     }
   }
   return true;
@@ -580,6 +609,8 @@ export async function scheduleWorkflowNotifications({
   teamId: number | null;
   alreadyScheduledActiveOnIds?: number[];
 }) {
+  if (trigger !== WorkflowTriggerEvents.BEFORE_EVENT && trigger !== WorkflowTriggerEvents.AFTER_EVENT) return;
+
   const bookingsToScheduleNotifications = await getBookings(activeOn, isOrg, alreadyScheduledActiveOnIds);
 
   await scheduleBookingReminders(
@@ -757,7 +788,7 @@ export async function scheduleBookingReminders(
         let sendTo: string[] = [];
 
         switch (step.action) {
-          case WorkflowActions.EMAIL_HOST:
+          case WorkflowActions.EMAIL_HOST: {
             sendTo = [bookingInfo.organizer?.email];
             const schedulingType = bookingInfo.eventType.schedulingType;
             const hosts = bookingInfo.eventType.hosts
@@ -770,6 +801,7 @@ export async function scheduleBookingReminders(
               sendTo = sendTo.concat(hosts);
             }
             break;
+          }
           case WorkflowActions.EMAIL_ATTENDEE:
             sendTo = bookingInfo.attendees.map((attendee) => attendee.email);
             break;
@@ -941,13 +973,14 @@ export async function getAllWorkflowsFromEventType(
     ? !eventTypeMetadata?.managedEventConfig?.unlockedFields?.workflows
     : false;
 
-  const allWorkflows = await getAllWorkflows(
-    eventTypeWorkflows,
+  const allWorkflows = await getAllWorkflows({
+    entityWorkflows: eventTypeWorkflows,
     userId,
     teamId,
     orgId,
-    workflowsLockedForUser
-  );
+    workflowsLockedForUser,
+    type: PrismaWorkflowType.EVENT_TYPE,
+  });
 
   return allWorkflows;
 }
diff --git a/packages/ui/components/avatar/UserAvatarGroup.tsx b/packages/ui/components/avatar/UserAvatarGroup.tsx
index fa30a6a27c1466..27cbd6b5f0178b 100644
--- a/packages/ui/components/avatar/UserAvatarGroup.tsx
+++ b/packages/ui/components/avatar/UserAvatarGroup.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import type { User } from "@calcom/prisma/client";
 import type { UserProfile } from "@calcom/types/UserProfile";
 
diff --git a/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx b/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
index 8319465b2301ed..be1db5b8b8584a 100644
--- a/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
+++ b/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
@@ -1,7 +1,7 @@
 import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import type { Team, User } from "@calcom/prisma/client";
 
 import { AvatarGroup } from "./AvatarGroup";
diff --git a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
index ca62a447bf419f..58ab9f9b7621b1 100644
--- a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
+++ b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
@@ -35,8 +35,6 @@ import { AddVariablesDropdown } from "./AddVariablesDropdown";
 
 const LowPriority = 1;
 
-const supportedBlockTypes = new Set(["paragraph", "h1", "h2", "ul", "ol"]);
-
 interface BlockType {
   [key: string]: string;
 }
@@ -360,13 +358,16 @@ export default function ToolbarPlugin(props: TextEditorProps) {
         }
       });
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.updateTemplate]);
 
   useEffect(() => {
     if (props.setFirstRender) {
       props.setFirstRender(false);
       editor.update(() => {
+        const currentContent = $getRoot().getTextContent().trim();
+        if (currentContent) {
+          return;
+        }
         const parser = new DOMParser();
         const dom = parser.parseFromString(props.getText(), "text/html");
 
@@ -375,7 +376,7 @@ export default function ToolbarPlugin(props: TextEditorProps) {
         $getRoot().select();
         try {
           $insertNodes(nodes);
-        } catch (e: unknown) {
+        } catch {
           // resolves: "topLevelElement is root node at RangeSelection.insertNodes"
           // @see https://stackoverflow.com/questions/73094258/setting-editor-from-html
           const paragraphNode = $createParagraphNode();
@@ -397,7 +398,6 @@ export default function ToolbarPlugin(props: TextEditorProps) {
         });
       });
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   useEffect(() => {
@@ -430,7 +430,7 @@ export default function ToolbarPlugin(props: TextEditorProps) {
   return (
     <div className="toolbar flex" ref={toolbarRef}>
       <>
-        {!props.excludedToolbarItems?.includes("blockType") && supportedBlockTypes.has(blockType) && (
+        {!props.excludedToolbarItems?.includes("blockType") && (
           <>
             <Dropdown>
               <DropdownMenuTrigger className="text-subtle">
@@ -467,7 +467,7 @@ export default function ToolbarPlugin(props: TextEditorProps) {
           </>
         )}
 
-        <>
+        <div className="flex gap-1">
           {!props.excludedToolbarItems?.includes("bold") && (
             <Button
               aria-label="Bold"
@@ -508,7 +508,7 @@ export default function ToolbarPlugin(props: TextEditorProps) {
               {isLink && createPortal(<FloatingLinkEditor editor={editor} />, document.body)}{" "}
             </>
           )}
-        </>
+        </div>
         {props.variables && (
           <div className={`${props.addVariableButtonTop ? "-mt-10" : ""} ml-auto`}>
             <AddVariablesDropdown
diff --git a/packages/ui/components/navigation/tabs/VerticalTabItem.tsx b/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
index 2d3da4b7c60c2f..8f6095ef7c1432 100644
--- a/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
+++ b/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
@@ -27,6 +27,7 @@ export type VerticalTabItemProps = {
   iconClassName?: string;
   onClick?: (name: string) => void;
   isActive?: boolean;
+  isBadged?: boolean;
   "data-testid"?: string;
 };
 
diff --git a/scripts/reassign-attributes.ts b/scripts/reassign-attributes.ts
new file mode 100644
index 00000000000000..f9cb0629078001
--- /dev/null
+++ b/scripts/reassign-attributes.ts
@@ -0,0 +1,41 @@
+import { prisma } from "@calcom/prisma";
+
+const reassignAttributes = async () => {
+  const orgId = 0;
+
+  // Add attribute option id that we want to search against
+  const lookupAttributeId = "";
+
+  // Add attribute option ids that we want to assign to users
+  const attributeIdsToAssign = [];
+
+  // Find all users who have the lookupAttributeId
+  const usersWithAttribute = await prisma.attributeToUser.findMany({
+    where: {
+      attributeOptionId: lookupAttributeId,
+      member: {
+        teamId: orgId,
+      },
+    },
+    select: {
+      memberId: true,
+    },
+  });
+
+  console.log(`Found ${usersWithAttribute.length} users with attribute ${lookupAttributeId}`);
+
+  // Assign the new attributes to these users
+  for (const attributeId of attributeIdsToAssign) {
+    const results = await prisma.attributeToUser.createMany({
+      data: usersWithAttribute.map((user) => ({
+        memberId: user.memberId,
+        attributeOptionId: attributeId,
+      })),
+      skipDuplicates: true, // Skip if user already has this attribute
+    });
+
+    console.log(`Assigned attribute ${attributeId} to ${results.count} users`);
+  }
+};
+
+export default reassignAttributes();
diff --git a/tests/libs/__mocks__/videoClient.ts b/tests/libs/__mocks__/videoClient.ts
index 7e5891215c8b17..13e2d7a8b7a757 100644
--- a/tests/libs/__mocks__/videoClient.ts
+++ b/tests/libs/__mocks__/videoClient.ts
@@ -1,9 +1,9 @@
 import { beforeEach, vi } from "vitest";
 import { mockReset, mockDeep } from "vitest-mock-extended";
 
-import type * as videoClient from "@calcom/app-store/videoClient";
+import type * as videoClient from "@calcom/features/conferencing/lib/videoClient";
 
-vi.mock("@calcom/app-store/videoClient", () => videoClientMock);
+vi.mock("@calcom/features/conferencing/lib/videoClient", () => videoClientMock);
 
 beforeEach(() => {
   mockReset(videoClientMock);

From 11d6497a2772c878317220825f2c018177df541e Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 21 Oct 2025 18:46:43 +0530
Subject: [PATCH 12/18] refactor: feedback

---
 .../getUserAndTeamWithBillingPermission.ts    | 89 +++++++++++++++++++
 .../helpers/handleInsufficientCredits.ts      | 60 +++++++++++++
 .../ee/teams/repositories/TeamRepository.ts   | 21 +----
 .../tasker/tasks/executeAIPhoneCall.ts        | 80 +++--------------
 packages/lib/getOrgIdFromMemberOrTeamId.ts    |  2 +-
 5 files changed, 162 insertions(+), 90 deletions(-)
 create mode 100644 packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
 create mode 100644 packages/features/ee/billing/helpers/handleInsufficientCredits.ts

diff --git a/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts b/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
new file mode 100644
index 00000000000000..4526111be816ac
--- /dev/null
+++ b/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
@@ -0,0 +1,89 @@
+import type { TFunction } from "i18next";
+
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { getTranslation } from "@calcom/lib/server/i18n";
+import type { PrismaClient } from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+interface UserWithBillingAccess {
+  id: number;
+  name: string | null;
+  email: string;
+  t: TFunction;
+}
+
+interface TeamWithBillingAdmins {
+  id: number;
+  name: string;
+  adminAndOwners: UserWithBillingAccess[];
+}
+
+interface GetUserAndTeamResult {
+  user?: UserWithBillingAccess;
+  team?: TeamWithBillingAdmins;
+}
+
+export async function getUserAndTeamWithBillingPermission({
+  userId,
+  teamId,
+  prismaClient,
+}: {
+  userId?: number | null;
+  teamId?: number | null;
+  prismaClient: PrismaClient;
+}): Promise<GetUserAndTeamResult> {
+  const result: GetUserAndTeamResult = {};
+
+  if (teamId) {
+    const teamRepository = new TeamRepository(prismaClient);
+    const team = await teamRepository.findTeamWithAdminMembers({ teamId });
+
+    if (!team) {
+      return result;
+    }
+
+    const permissionService = new PermissionCheckService();
+    const permission = team.isOrganization ? "organization.manageBilling" : "team.manageBilling";
+    const usersWithBillingAccess: UserWithBillingAccess[] = [];
+
+    for (const member of team.members) {
+      const hasPermission = await permissionService.checkPermission({
+        userId: member.user.id,
+        teamId,
+        permission,
+        fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      });
+
+      if (hasPermission) {
+        usersWithBillingAccess.push({
+          id: member.user.id,
+          name: member.user.name,
+          email: member.user.email,
+          t: await getTranslation(member.user.locale ?? "en", "common"),
+        });
+      }
+    }
+
+    result.team = {
+      id: team.id,
+      name: team.name ?? "",
+      adminAndOwners: usersWithBillingAccess,
+    };
+  } else if (userId) {
+    const userRepository = new UserRepository(prismaClient);
+    const userRecord = await userRepository.findById({ id: userId });
+
+    if (userRecord) {
+      result.user = {
+        id: userRecord.id,
+        name: userRecord.name,
+        email: userRecord.email,
+        t: await getTranslation(userRecord.locale ?? "en", "common"),
+      };
+    }
+  }
+
+  return result;
+}
diff --git a/packages/features/ee/billing/helpers/handleInsufficientCredits.ts b/packages/features/ee/billing/helpers/handleInsufficientCredits.ts
new file mode 100644
index 00000000000000..9df24f67fe6edd
--- /dev/null
+++ b/packages/features/ee/billing/helpers/handleInsufficientCredits.ts
@@ -0,0 +1,60 @@
+import { sendCreditBalanceLimitReachedEmails } from "@calcom/emails/email-manager";
+import logger from "@calcom/lib/logger";
+import type { PrismaClient } from "@calcom/prisma";
+import type { CreditUsageType } from "@calcom/prisma/enums";
+
+import { getUserAndTeamWithBillingPermission } from "./getUserAndTeamWithBillingPermission";
+
+const log = logger.getSubLogger({ prefix: ["handleInsufficientCredits"] });
+
+export async function handleInsufficientCredits({
+  userId,
+  teamId,
+  creditFor,
+  prismaClient,
+  context,
+}: {
+  userId?: number | null;
+  teamId?: number | null;
+  creditFor: CreditUsageType;
+  prismaClient: PrismaClient;
+  context?: Record<string, unknown>;
+}): Promise<void> {
+  try {
+    const { user, team } = await getUserAndTeamWithBillingPermission({
+      userId,
+      teamId,
+      prismaClient,
+    });
+
+    if (team || user) {
+      await sendCreditBalanceLimitReachedEmails({
+        team,
+        user,
+        creditFor,
+      });
+
+      log.info("Credit limit reached email sent", {
+        userId,
+        teamId,
+        creditFor,
+        ...context,
+      });
+    } else {
+      log.warn("No user or team found to send credit limit email", {
+        userId,
+        teamId,
+        creditFor,
+        ...context,
+      });
+    }
+  } catch (error) {
+    log.error("Failed to send credit limit email", {
+      error,
+      userId,
+      teamId,
+      creditFor,
+      ...context,
+    });
+  }
+}
diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
index fecb76fccf2997..6bdd4614c63eeb 100644
--- a/packages/features/ee/teams/repositories/TeamRepository.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -391,26 +391,6 @@ export class TeamRepository {
     });
   }
 
-  async getTeamByIdIfUserIsAdmin({ userId, teamId }: { userId: number; teamId: number }) {
-    return await this.prismaClient.team.findUnique({
-      where: {
-        id: teamId,
-      },
-      select: {
-        id: true,
-        metadata: true,
-        members: {
-          where: {
-            userId,
-            role: {
-              in: [MembershipRole.ADMIN, MembershipRole.OWNER],
-            },
-          },
-        },
-      },
-    });
-  }
-
   async findTeamWithParentHideBranding({ teamId }: { teamId: number }) {
     return await this.prismaClient.team.findUnique({
       where: { id: teamId },
@@ -479,6 +459,7 @@ export class TeamRepository {
       select: {
         id: true,
         name: true,
+        isOrganization: true,
         members: {
           where: {
             role: {
diff --git a/packages/features/tasker/tasks/executeAIPhoneCall.ts b/packages/features/tasker/tasks/executeAIPhoneCall.ts
index ee502be99c4eef..158cbac8bd9e2c 100644
--- a/packages/features/tasker/tasks/executeAIPhoneCall.ts
+++ b/packages/features/tasker/tasks/executeAIPhoneCall.ts
@@ -1,15 +1,10 @@
-import type { TFunction } from "i18next";
-
 import dayjs from "@calcom/dayjs";
-import { sendCreditBalanceLimitReachedEmails } from "@calcom/emails/email-manager";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { createDefaultAIPhoneServiceProvider } from "@calcom/features/calAIPhone";
+import { handleInsufficientCredits } from "@calcom/features/ee/billing/helpers/handleInsufficientCredits";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import logger from "@calcom/lib/logger";
-import { getTranslation } from "@calcom/lib/server/i18n";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
-import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma from "@calcom/prisma";
 import { CreditUsageType } from "@calcom/prisma/enums";
 
@@ -121,69 +116,16 @@ export async function executeAIPhoneCall(payload: string) {
           bookingUid: workflowReminder.booking?.uid,
         });
 
-        try {
-          let teamWithAdmins:
-            | {
-                id: number;
-                name: string;
-                adminAndOwners: { id: number; name: string | null; email: string; t: TFunction }[];
-              }
-            | undefined;
-          let user:
-            | {
-                id: number;
-                name: string | null;
-                email: string;
-                t: TFunction;
-              }
-            | undefined;
-
-          if (data.teamId) {
-            const teamRepository = new TeamRepository(prisma);
-            const team = await teamRepository.findTeamWithAdminMembers({ teamId: data.teamId });
-
-            if (team) {
-              teamWithAdmins = {
-                id: team.id,
-                name: team.name ?? "",
-                adminAndOwners: await Promise.all(
-                  team.members.map(async (member) => ({
-                    id: member.user.id,
-                    name: member.user.name,
-                    email: member.user.email,
-                    t: await getTranslation(member.user.locale ?? "en", "common"),
-                  }))
-                ),
-              };
-            }
-          } else if (data.userId) {
-            const userRepository = new UserRepository(prisma);
-            const userRecord = await userRepository.findById({ id: data.userId });
-
-            if (userRecord) {
-              user = {
-                id: userRecord.id,
-                name: userRecord.name,
-                email: userRecord.email,
-                t: await getTranslation(userRecord.locale ?? "en", "common"),
-              };
-            }
-          }
-
-          if (teamWithAdmins || user) {
-            await sendCreditBalanceLimitReachedEmails({
-              team: teamWithAdmins,
-              user,
-              creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-            });
-            log.info("Credit limit reached email sent for AI phone call", {
-              userId: data.userId,
-              teamId: data.teamId,
-            });
-          }
-        } catch (emailError) {
-          log.error("Failed to send credit limit email for AI phone call", emailError);
-        }
+        await handleInsufficientCredits({
+          userId: data.userId,
+          teamId: data.teamId,
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+          prismaClient: prisma,
+          context: {
+            workflowReminderId: data.workflowReminderId,
+            bookingUid: workflowReminder.booking?.uid,
+          },
+        });
 
         return;
       }
diff --git a/packages/lib/getOrgIdFromMemberOrTeamId.ts b/packages/lib/getOrgIdFromMemberOrTeamId.ts
index 765c72ed4744ce..0aae179d13ed14 100644
--- a/packages/lib/getOrgIdFromMemberOrTeamId.ts
+++ b/packages/lib/getOrgIdFromMemberOrTeamId.ts
@@ -1,4 +1,4 @@
-import prisma, { type PrismaTransaction } from "@calcom/prisma";
+import { prisma, type PrismaTransaction } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
 const getOrgMemberOrTeamWhere = (memberId?: number | null, teamId?: number | null) => {

From 444271d47d7b5e077e0d4370324468f9d59587ff Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Tue, 21 Oct 2025 18:53:53 +0530
Subject: [PATCH 13/18] refactor: imporvement

---
 packages/features/ee/teams/repositories/TeamRepository.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
index 6bdd4614c63eeb..edfbae55927506 100644
--- a/packages/features/ee/teams/repositories/TeamRepository.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -462,6 +462,7 @@ export class TeamRepository {
         isOrganization: true,
         members: {
           where: {
+            accepted: true,
             role: {
               in: [MembershipRole.ADMIN, MembershipRole.OWNER],
             },

From 7ffdb49296c033cc296c26d01acbd361e3bf7aba Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 22 Oct 2025 14:28:16 +0530
Subject: [PATCH 14/18] fix: type

---
 packages/features/ee/billing/credit-service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 14f8cbcc8a0162..9c2d7679aa951a 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -15,7 +15,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import { CreditsRepository } from "@calcom/lib/server/repository/credits";
-import prisma, { type PrismaTransaction } from "@calcom/prisma";
+import { prisma, type PrismaTransaction } from "@calcom/prisma";
 import { CreditUsageType, CreditType } from "@calcom/prisma/enums";
 
 const log = logger.getSubLogger({ prefix: ["[CreditService]"] });

From 3a0c8d09ad5859f6401bb4afa63fc9de055fb895 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 27 Oct 2025 21:13:51 +0530
Subject: [PATCH 15/18] refactor: feedback

---
 .../retell-ai/__tests__/route.test.ts         | 376 +-----------------
 .../features/ee/billing/credit-service.ts     |  56 ++-
 .../ee/teams/repositories/TeamRepository.ts   |   7 +
 3 files changed, 55 insertions(+), 384 deletions(-)

diff --git a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
index 2e91473cba5d1d..4a912cd40fc550 100644
--- a/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
+++ b/apps/web/app/api/webhooks/retell-ai/__tests__/route.test.ts
@@ -240,6 +240,7 @@ describe("Retell AI Webhook Handler", () => {
         credits: 58, // 120 seconds = 2 minutes * $0.29 = $0.58 = 58 credits
         callDuration: 120,
         externalRef: "retell:test-call-id",
+        creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
       })
     );
   });
@@ -297,6 +298,7 @@ describe("Retell AI Webhook Handler", () => {
         credits: 87, // 180 seconds = 3 minutes * $0.29 = $0.87 = 87 credits
         callDuration: 180,
         externalRef: "retell:test-call-id",
+        creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
       })
     );
   });
@@ -480,6 +482,7 @@ describe("Retell AI Webhook Handler", () => {
           credits: expectedCredits,
           callDuration: durationSeconds,
           externalRef: expect.stringMatching(/^retell:test-call-/),
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
         })
       );
     }
@@ -526,7 +529,12 @@ describe("Retell AI Webhook Handler", () => {
     const response = await callPOST(createMockRequest(body, "valid-signature"));
     expect(response.status).toBe(200);
     expect(mockChargeCredits).toHaveBeenCalledWith(
-      expect.objectContaining({ userId: 42, credits: 61, callDuration: 125 }) // 125s = 2.083 minutes * $0.29 = $0.604 = 61 credits (rounded up)
+      expect.objectContaining({
+        userId: 42,
+        credits: 61,
+        callDuration: 125,
+        creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
+      }) // 125s = 2.083 minutes * $0.29 = $0.604 = 61 credits (rounded up)
     );
   });
 
@@ -583,6 +591,7 @@ describe("Retell AI Webhook Handler", () => {
           credits: 29, // 60 seconds = 1 minute * $0.29 = $0.29 = 29 credits
           callDuration: 60,
           externalRef: "retell:test-idempotency-call",
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
         })
       );
     });
@@ -769,6 +778,7 @@ describe("Retell AI Webhook Handler", () => {
           credits: 4, // 7 seconds = 0.117 minutes * $0.29 = $0.034 = 4 credits (rounded up)
           callDuration: 7,
           externalRef: "retell:call_bcd94f5a50832873a5fd68cb1aa",
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
         })
       );
     });
@@ -803,6 +813,7 @@ describe("Retell AI Webhook Handler", () => {
           teamId: 10,
           credits: 29, // 60 seconds = 1 minute * $0.29 = 29 credits
           callDuration: 60,
+          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
         })
       );
     });
@@ -885,367 +896,4 @@ describe("Retell AI Webhook Handler", () => {
       expect(mockChargeCredits).not.toHaveBeenCalled();
     });
   });
-
-  describe("Cal.ai Credit Type", () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-      vi.mocked(Retell.verify).mockReturnValue(true);
-    });
-
-    it("should pass CAL_AI_PHONE_CALL creditFor when charging credits for web call", async () => {
-      const mockAgent: Pick<
-        Agent,
-        "id" | "name" | "providerAgentId" | "enabled" | "userId" | "teamId" | "createdAt" | "updatedAt"
-      > = {
-        id: "agent-123",
-        name: "Test Agent",
-        providerAgentId: "agent_cal_ai_test",
-        enabled: true,
-        userId: 1,
-        teamId: null,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      };
-
-      mockFindByProviderAgentId.mockResolvedValue(mockAgent);
-      mockChargeCredits.mockResolvedValue(undefined);
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "web-call-credit-type",
-          call_type: "web_call",
-          agent_id: "agent_cal_ai_test",
-          call_status: "ended",
-          start_timestamp: 1757673314024,
-          call_cost: {
-            total_duration_seconds: 120,
-            combined_cost: 2.0,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          userId: 1,
-          credits: 58,
-          callDuration: 120,
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-          externalRef: "retell:web-call-credit-type",
-        })
-      );
-    });
-
-    it("should pass CAL_AI_PHONE_CALL creditFor when charging credits for phone call", async () => {
-      const mockPhoneNumber: MockPhoneNumberWithUser = {
-        id: 1,
-        phoneNumber: "+1234567890",
-        userId: 1,
-        teamId: null,
-        provider: "test-provider",
-        providerPhoneNumberId: "test-provider-id",
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        stripeCustomerId: null,
-        stripeSubscriptionId: null,
-        subscriptionStatus: null,
-        inboundAgentId: null,
-        outboundAgentId: null,
-        user: { id: 1, email: "test@example.com", name: "Test User" },
-        team: null,
-      };
-
-      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
-      mockChargeCredits.mockResolvedValue(undefined);
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "phone-call-credit-type",
-          from_number: "+1234567890",
-          to_number: "+0987654321",
-          direction: "outbound",
-          call_status: "completed",
-          start_timestamp: 1234567890,
-          call_cost: {
-            combined_cost: 100,
-            total_duration_seconds: 180,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          userId: 1,
-          credits: 87,
-          callDuration: 180,
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-          externalRef: "retell:phone-call-credit-type",
-        })
-      );
-    });
-
-    it("should pass CAL_AI_PHONE_CALL creditFor for team-based calls", async () => {
-      const mockPhoneNumber: MockPhoneNumberWithTeam = {
-        id: 2,
-        phoneNumber: "+1234567890",
-        userId: null,
-        teamId: 5,
-        provider: "test-provider",
-        providerPhoneNumberId: "test-provider-id-2",
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        stripeCustomerId: null,
-        stripeSubscriptionId: null,
-        subscriptionStatus: null,
-        inboundAgentId: null,
-        outboundAgentId: null,
-        team: { id: 5, name: "Test Team" },
-        user: null,
-      };
-
-      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
-      mockChargeCredits.mockResolvedValue(undefined);
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "team-call-credit-type",
-          from_number: "+1234567890",
-          to_number: "+0987654321",
-          direction: "outbound",
-          call_status: "completed",
-          start_timestamp: 1234567890,
-          call_cost: {
-            combined_cost: 50,
-            total_duration_seconds: 60,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          teamId: 5,
-          credits: 29,
-          callDuration: 60,
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-          externalRef: "retell:team-call-credit-type",
-        })
-      );
-    });
-  });
-
-  describe("Cal.ai Credit Email Integration", () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-      vi.mocked(Retell.verify).mockReturnValue(true);
-      mockSendCreditBalanceLimitReachedEmails.mockResolvedValue(undefined);
-      mockSendCreditBalanceLowWarningEmails.mockResolvedValue(undefined);
-    });
-
-    it("should trigger email with CAL_AI_PHONE_CALL creditFor when credits run out", async () => {
-      const mockPhoneNumber: MockPhoneNumberWithUser = {
-        id: 1,
-        phoneNumber: "+1234567890",
-        userId: 1,
-        teamId: null,
-        provider: "test-provider",
-        providerPhoneNumberId: "test-provider-id",
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        stripeCustomerId: null,
-        stripeSubscriptionId: null,
-        subscriptionStatus: null,
-        inboundAgentId: null,
-        outboundAgentId: null,
-        user: { id: 1, email: "test@example.com", name: "Test User" },
-        team: null,
-      };
-
-      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
-
-      mockChargeCredits.mockImplementation(async (params) => {
-        if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
-          await mockSendCreditBalanceLimitReachedEmails({
-            user: {
-              id: params.userId,
-              name: "Test User",
-              email: "test@example.com",
-              t: (key: string) => key,
-            },
-            creditFor: params.creditFor,
-          });
-        }
-        return { userId: params.userId };
-      });
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "call-trigger-email",
-          from_number: "+1234567890",
-          to_number: "+0987654321",
-          direction: "outbound",
-          call_status: "completed",
-          start_timestamp: 1234567890,
-          call_cost: {
-            combined_cost: 100,
-            total_duration_seconds: 120,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-        })
-      );
-
-      expect(mockSendCreditBalanceLimitReachedEmails).toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-        })
-      );
-    });
-
-    it("should trigger warning email with CAL_AI_PHONE_CALL creditFor when credits are low", async () => {
-      const mockAgent: Pick<
-        Agent,
-        "id" | "name" | "providerAgentId" | "enabled" | "userId" | "teamId" | "createdAt" | "updatedAt"
-      > = {
-        id: "agent-123",
-        name: "Test Agent",
-        providerAgentId: "agent_warning_test",
-        enabled: true,
-        userId: 1,
-        teamId: null,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      };
-
-      mockFindByProviderAgentId.mockResolvedValue(mockAgent);
-
-      mockChargeCredits.mockImplementation(async (params) => {
-        if (params.creditFor === CreditUsageType.CAL_AI_PHONE_CALL) {
-          await mockSendCreditBalanceLowWarningEmails({
-            user: {
-              id: params.userId,
-              name: "Test User",
-              email: "test@example.com",
-              t: (key: string) => key,
-            },
-            balance: 100,
-            creditFor: params.creditFor,
-          });
-        }
-        return { userId: params.userId };
-      });
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "call-trigger-warning",
-          call_type: "web_call",
-          agent_id: "agent_warning_test",
-          call_status: "ended",
-          start_timestamp: 1757673314024,
-          call_cost: {
-            total_duration_seconds: 60,
-            combined_cost: 1.0,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-        })
-      );
-
-      expect(mockSendCreditBalanceLowWarningEmails).toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-          balance: 100,
-        })
-      );
-    });
-
-    it("should not pass SMS creditFor for Cal.ai calls", async () => {
-      const mockPhoneNumber: MockPhoneNumberWithTeam = {
-        id: 2,
-        phoneNumber: "+1234567890",
-        userId: null,
-        teamId: 5,
-        provider: "test-provider",
-        providerPhoneNumberId: "test-provider-id-2",
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        stripeCustomerId: null,
-        stripeSubscriptionId: null,
-        subscriptionStatus: null,
-        inboundAgentId: null,
-        outboundAgentId: null,
-        team: { id: 5, name: "Test Team" },
-        user: null,
-      };
-
-      mockFindByPhoneNumber.mockResolvedValue(mockPhoneNumber);
-      mockChargeCredits.mockResolvedValue({ teamId: 5 });
-
-      const body: RetellWebhookBody = {
-        event: "call_analyzed",
-        call: {
-          call_id: "call-not-sms",
-          from_number: "+1234567890",
-          to_number: "+0987654321",
-          direction: "outbound",
-          call_status: "completed",
-          start_timestamp: 1234567890,
-          call_cost: {
-            combined_cost: 50,
-            total_duration_seconds: 30,
-          },
-        },
-      };
-
-      const request = createMockRequest(body, "valid-signature");
-      const response = await callPOST(request);
-
-      expect(response.status).toBe(200);
-
-      expect(mockChargeCredits).toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.CAL_AI_PHONE_CALL,
-        })
-      );
-
-      expect(mockChargeCredits).not.toHaveBeenCalledWith(
-        expect.objectContaining({
-          creditFor: CreditUsageType.SMS,
-        })
-      );
-    });
-  });
 });
diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.ts
index 9c2d7679aa951a..da341902483cd5 100644
--- a/packages/features/ee/billing/credit-service.ts
+++ b/packages/features/ee/billing/credit-service.ts
@@ -223,6 +223,37 @@ export class CreditService {
     });
   }
 
+  /**
+   * Separates memberships into organization and team memberships.
+   * Organizations take precedence - if user belongs to any organization,
+   * only organization memberships are returned.
+   *
+   * @param memberships - User's accepted team memberships
+   * @param teams - Team data including isOrganization and parentId
+   * @returns Memberships to check (org memberships if any exist, otherwise team memberships)
+   */
+  private static filterMembershipsForCreditCheck<T extends { teamId: number }>(
+    memberships: T[],
+    teams: Array<{ id: number; isOrganization: boolean; parentId: number | null }>
+  ): T[] {
+    const teamMap = new Map(teams.map((t) => [t.id, t]));
+
+    const orgMemberships: T[] = [];
+    const teamMemberships: T[] = [];
+
+    for (const membership of memberships) {
+      const team = teamMap.get(membership.teamId);
+      if (team?.isOrganization && !team.parentId) {
+        orgMemberships.push(membership);
+      } else {
+        teamMemberships.push(membership);
+      }
+    }
+
+    // If user belongs to any organization, ONLY check organization credits
+    return orgMemberships.length > 0 ? orgMemberships : teamMemberships;
+  }
+
   /*
     If user has memberships, it always returns a team, even if all have limit reached. In that case, limitReached: true is returned
     If user belongs to any organization, ONLY organization credits are checked (team memberships are ignored)
@@ -235,27 +266,12 @@ export class CreditService {
       return null;
     }
 
-    const teams = await tx.team.findMany({
-      where: { id: { in: memberships.map((m) => m.teamId) } },
-      select: { id: true, isOrganization: true, parentId: true, parent: { select: { id: true } } },
+    const teamRepository = new TeamRepository(prisma);
+    const teams = await teamRepository.findTeamsForCreditCheck({
+      teamIds: memberships.map((m) => m.teamId),
     });
 
-    const teamMap = new Map(teams.map((t) => [t.id, t]));
-
-    const orgMemberships: typeof memberships = [];
-    const teamMemberships: typeof memberships = [];
-
-    for (const membership of memberships) {
-      const team = teamMap.get(membership.teamId);
-      if (team?.isOrganization && !team.parentId) {
-        orgMemberships.push(membership);
-      } else {
-        teamMemberships.push(membership);
-      }
-    }
-
-    // If user belongs to any organization, ONLY check organization credits
-    const membershipsToCheck = orgMemberships.length > 0 ? orgMemberships : teamMemberships;
+    const membershipsToCheck = CreditService.filterMembershipsForCreditCheck(memberships, teams);
 
     for (const membership of membershipsToCheck) {
       const creditBalance = await CreditsRepository.findCreditBalance({ teamId: membership.teamId }, tx);
@@ -471,7 +487,7 @@ export class CreditService {
         creditBalance?.limitReachedAt &&
         (!teamId || dayjs(creditBalance?.limitReachedAt).isAfter(dayjs().startOf("month")))
       ) {
-        log.info("User or team has limit already reached or team has already reached limit this month", {
+        log.info("User or team has limit already reached this month", {
           teamId,
           userId,
           creditBalance,
diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
index edfbae55927506..6001f8045d9cf9 100644
--- a/packages/features/ee/teams/repositories/TeamRepository.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -493,4 +493,11 @@ export class TeamRepository {
       select: { id: true },
     });
   }
+
+  async findTeamsForCreditCheck({ teamIds }: { teamIds: number[] }) {
+    return await this.prismaClient.team.findMany({
+      where: { id: { in: teamIds } },
+      select: { id: true, isOrganization: true, parentId: true, parent: { select: { id: true } } },
+    });
+  }
 }

From 0c39cec83846dc46c2501352bd84d911e6084ff3 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Mon, 27 Oct 2025 23:16:55 +0530
Subject: [PATCH 16/18] fix: tests

---
 .../ee/billing/credit-service.test.ts         | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts
index dccaec8f37dcfe..251aa2c66b6a8d 100644
--- a/packages/features/ee/billing/credit-service.test.ts
+++ b/packages/features/ee/billing/credit-service.test.ts
@@ -70,7 +70,10 @@ vi.mock("@calcom/prisma/enums", async (importOriginal) => {
 vi.mock("@calcom/lib/server/repository/credits");
 vi.mock("@calcom/features/membership/repositories/MembershipRepository");
 vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
-vi.mock("@calcom/emails/email-manager");
+vi.mock("@calcom/emails/email-manager", () => ({
+  sendCreditBalanceLimitReachedEmails: vi.fn().mockResolvedValue(undefined),
+  sendCreditBalanceLowWarningEmails: vi.fn().mockResolvedValue(undefined),
+}));
 vi.mock("../workflows/lib/reminders/reminderScheduler", () => ({
   cancelScheduledMessagesAndScheduleEmails: vi.fn().mockResolvedValue(undefined),
 }));
@@ -173,8 +176,8 @@ describe("CreditService", () => {
           },
         ]);
 
-        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-          { id: 1, isOrganization: false, parentId: null },
+        vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+          { id: 1, isOrganization: false, parentId: null, parent: null },
         ]);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
@@ -203,8 +206,8 @@ describe("CreditService", () => {
           },
         ]);
 
-        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-          { id: 1, isOrganization: false, parentId: null },
+        vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+          { id: 1, isOrganization: false, parentId: null, parent: null },
         ]);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
@@ -790,8 +793,8 @@ describe("CreditService", () => {
         { teamId: 2 },
       ]);
 
-      vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-        { id: 2, isOrganization: false, parentId: null },
+      vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+        { id: 2, isOrganization: false, parentId: null, parent: null },
       ]);
 
       vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
@@ -825,9 +828,9 @@ describe("CreditService", () => {
           { teamId: 2 },
         ]);
 
-        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-          { id: 1, isOrganization: true, parentId: null },
-          { id: 2, isOrganization: false, parentId: null },
+        vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+          { id: 1, isOrganization: true, parentId: null, parent: null },
+          { id: 2, isOrganization: false, parentId: null, parent: null },
         ]);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
@@ -859,9 +862,9 @@ describe("CreditService", () => {
           { teamId: 2 },
         ]);
 
-        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-          { id: 1, isOrganization: true, parentId: null },
-          { id: 2, isOrganization: false, parentId: null },
+        vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+          { id: 1, isOrganization: true, parentId: null, parent: null },
+          { id: 2, isOrganization: false, parentId: null, parent: null },
         ]);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({
@@ -893,8 +896,8 @@ describe("CreditService", () => {
           { teamId: 2 },
         ]);
 
-        vi.mocked(MOCK_TX.team.findMany).mockResolvedValue([
-          { id: 2, isOrganization: false, parentId: null },
+        vi.spyOn(TeamRepository.prototype, "findTeamsForCreditCheck").mockResolvedValue([
+          { id: 2, isOrganization: false, parentId: null, parent: null },
         ]);
 
         vi.mocked(CreditsRepository.findCreditBalance).mockResolvedValue({

From 0a439786f1221e22844de554f13a8476d89001e0 Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Fri, 31 Oct 2025 23:27:06 +0530
Subject: [PATCH 17/18] fix: use pbac

---
 .../getUserAndTeamWithBillingPermission.ts    | 35 +++-----
 .../ee/teams/repositories/TeamRepository.ts   | 85 ++++++++++++-------
 2 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts b/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
index 4526111be816ac..31dea651a77665 100644
--- a/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
+++ b/packages/features/ee/billing/helpers/getUserAndTeamWithBillingPermission.ts
@@ -1,7 +1,6 @@
 import type { TFunction } from "i18next";
 
 import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
-import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import type { PrismaClient } from "@calcom/prisma";
@@ -38,33 +37,27 @@ export async function getUserAndTeamWithBillingPermission({
 
   if (teamId) {
     const teamRepository = new TeamRepository(prismaClient);
-    const team = await teamRepository.findTeamWithAdminMembers({ teamId });
+    const team = await teamRepository.findById({ id: teamId });
 
     if (!team) {
       return result;
     }
 
-    const permissionService = new PermissionCheckService();
     const permission = team.isOrganization ? "organization.manageBilling" : "team.manageBilling";
-    const usersWithBillingAccess: UserWithBillingAccess[] = [];
+    const users = await teamRepository.findTeamMembersWithPermission({
+      teamId,
+      permission,
+      fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+    });
 
-    for (const member of team.members) {
-      const hasPermission = await permissionService.checkPermission({
-        userId: member.user.id,
-        teamId,
-        permission,
-        fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
-      });
-
-      if (hasPermission) {
-        usersWithBillingAccess.push({
-          id: member.user.id,
-          name: member.user.name,
-          email: member.user.email,
-          t: await getTranslation(member.user.locale ?? "en", "common"),
-        });
-      }
-    }
+    const usersWithBillingAccess: UserWithBillingAccess[] = await Promise.all(
+      users.map(async (user) => ({
+        id: user.id,
+        name: user.name,
+        email: user.email,
+        t: await getTranslation(user.locale ?? "en", "common"),
+      }))
+    );
 
     result.team = {
       id: team.id,
diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
index 6001f8045d9cf9..5d0b69a6ee9b83 100644
--- a/packages/features/ee/teams/repositories/TeamRepository.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -453,35 +453,6 @@ export class TeamRepository {
     return !conflictingTeam;
   }
 
-  async findTeamWithAdminMembers({ teamId }: { teamId: number }) {
-    return await this.prismaClient.team.findUnique({
-      where: { id: teamId },
-      select: {
-        id: true,
-        name: true,
-        isOrganization: true,
-        members: {
-          where: {
-            accepted: true,
-            role: {
-              in: [MembershipRole.ADMIN, MembershipRole.OWNER],
-            },
-          },
-          select: {
-            user: {
-              select: {
-                id: true,
-                name: true,
-                email: true,
-                locale: true,
-              },
-            },
-          },
-        },
-      },
-    });
-  }
-
   async findOrgTeamsExcludingTeam({ parentId, excludeTeamId }: { parentId: number; excludeTeamId: number }) {
     return await this.prismaClient.team.findMany({
       where: {
@@ -500,4 +471,60 @@ export class TeamRepository {
       select: { id: true, isOrganization: true, parentId: true, parent: { select: { id: true } } },
     });
   }
+
+  async findTeamMembersWithPermission({
+    teamId,
+    permission,
+    fallbackRoles,
+  }: {
+    teamId: number;
+    permission: string;
+    fallbackRoles: MembershipRole[];
+  }) {
+    const { resource, action } = this.parsePermission(permission);
+
+    type UserResult = {
+      id: number;
+      name: string | null;
+      email: string;
+      locale: string | null;
+    };
+
+    const users = await this.prismaClient.$queryRaw<UserResult[]>`
+      SELECT DISTINCT u.id, u.name, u.email, u.locale
+      FROM "Membership" m
+      INNER JOIN "User" u ON m."userId" = u.id
+      LEFT JOIN "Role" r ON m."customRoleId" = r.id
+      LEFT JOIN "TeamFeatures" f ON m."teamId" = f."teamId" AND f."featureId" = 'pbac'
+      WHERE m."teamId" = ${teamId}
+        AND m."accepted" = true
+        AND (
+          -- Scenario 1: PBAC enabled + custom role with permission
+          (f."teamId" IS NOT NULL
+           AND m."customRoleId" IS NOT NULL
+           AND EXISTS (
+             SELECT 1 FROM "RolePermission" rp
+             WHERE rp."roleId" = r.id
+               AND (
+                 (rp."resource" = '*' AND rp."action" = '*') OR
+                 (rp."resource" = ${resource} AND rp."action" = ${action}) OR
+                 (rp."resource" = ${resource} AND rp."action" = '*') OR
+                 (rp."resource" = '*' AND rp."action" = ${action})
+               )
+           ))
+          OR
+          -- Scenario 2 & 3: Legacy role ADMIN/OWNER (works for both PBAC and non-PBAC teams)
+          (m."role"::text = ANY(${fallbackRoles}))
+        )
+    `;
+
+    return users;
+  }
+
+  private parsePermission(permission: string): { resource: string; action: string } {
+    const lastDotIndex = permission.lastIndexOf(".");
+    const resource = permission.substring(0, lastDotIndex);
+    const action = permission.substring(lastDotIndex + 1);
+    return { resource, action };
+  }
 }

From da711152e997e9a83fa7cf2450d28d95bcabd32d Mon Sep 17 00:00:00 2001
From: Udit Takkar <udit222001@gmail.com>
Date: Wed, 5 Nov 2025 12:26:55 +0530
Subject: [PATCH 18/18] chore: add missing methof

---
 .../ee/teams/repositories/TeamRepository.ts   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts
index 5d0b69a6ee9b83..293c5a375bb35b 100644
--- a/packages/features/ee/teams/repositories/TeamRepository.ts
+++ b/packages/features/ee/teams/repositories/TeamRepository.ts
@@ -453,6 +453,26 @@ export class TeamRepository {
     return !conflictingTeam;
   }
 
+  async getTeamByIdIfUserIsAdmin({ userId, teamId }: { userId: number; teamId: number }) {
+    return await this.prismaClient.team.findUnique({
+      where: {
+        id: teamId,
+      },
+      select: {
+        id: true,
+        metadata: true,
+        members: {
+          where: {
+            userId,
+            role: {
+              in: [MembershipRole.ADMIN, MembershipRole.OWNER],
+            },
+          },
+        },
+      },
+    });
+  }
+
   async findOrgTeamsExcludingTeam({ parentId, excludeTeamId }: { parentId: number; excludeTeamId: number }) {
     return await this.prismaClient.team.findMany({
       where: {