diff --git a/apps/web/test/utils/bookingScenario/expects.ts b/apps/web/test/utils/bookingScenario/expects.ts
index 4486b3eff1..64f04b4b7a 100644
--- a/apps/web/test/utils/bookingScenario/expects.ts
+++ b/apps/web/test/utils/bookingScenario/expects.ts
@@ -8,7 +8,7 @@ import { expect, vi } from "vitest";
 import "vitest-fetch-mock";
 
 import dayjs from "@calcom/dayjs";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { CAL_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -382,7 +382,7 @@ export function expectSuccessfulBookingCreationEmails({
   bookingTimeRange?: { start: Date; end: Date };
   booking: { uid: string; urlOrigin?: string };
 }) {
-  const bookingUrlOrigin = booking.urlOrigin || WEBAPP_URL;
+  const bookingUrlOrigin = booking.urlOrigin || CAL_URL;
   expect(emails).toHaveEmail(
     {
       titleTag: "confirmed_event_type_subject",
@@ -742,7 +742,7 @@ export function expectBookingRequestRescheduledEmails({
   booking: { uid: string; urlOrigin?: string };
   bookNewTimePath: string;
 }) {
-  const bookingUrlOrigin = booking.urlOrigin || WEBAPP_URL;
+  const bookingUrlOrigin = booking.urlOrigin || CAL_URL;
 
   expect(emails).toHaveEmail(
     {
diff --git a/packages/features/bookings/lib/handleNewBooking/test/fresh-booking.test.ts b/packages/features/bookings/lib/handleNewBooking/test/fresh-booking.test.ts
index a34790ccfe..a487e503df 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/fresh-booking.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/fresh-booking.test.ts
@@ -12,7 +12,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { describe, expect } from "vitest";
 
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { resetTestEmails } from "@calcom/lib/testEmails";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -218,7 +218,7 @@ describe("handleNewBooking", () => {
         expectSuccessfulBookingCreationEmails({
           booking: {
             uid: createdBooking.uid!,
-            urlOrigin: org ? org.urlOrigin : WEBAPP_URL,
+            urlOrigin: org ? org.urlOrigin : CAL_URL,
           },
           booker,
           organizer,
diff --git a/packages/features/bookings/lib/handleNewBooking/test/recurring-event.test.ts b/packages/features/bookings/lib/handleNewBooking/test/recurring-event.test.ts
index 393d86ec2c..a0aadf87bf 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/recurring-event.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/recurring-event.test.ts
@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from "uuid";
 import { describe, expect } from "vitest";
 
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { WEBAPP_URL, CAL_URL } from "@calcom/lib/constants";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import logger from "@calcom/lib/logger";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -209,7 +209,7 @@ describe("handleNewBooking", () => {
           booking: {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             uid: createdBookings[0].uid!,
-            urlOrigin: WEBAPP_URL,
+            urlOrigin: CAL_URL,
           },
           organizer,
           emails,
@@ -555,7 +555,7 @@ describe("handleNewBooking", () => {
           booking: {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             uid: createdBookings[0].uid!,
-            urlOrigin: WEBAPP_URL,
+            urlOrigin: CAL_URL,
           },
           organizer,
           emails,
@@ -769,7 +769,7 @@ describe("handleNewBooking", () => {
           booking: {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             uid: createdBookings[0].uid!,
-            urlOrigin: WEBAPP_URL,
+            urlOrigin: CAL_URL,
           },
           booker,
           organizer,
diff --git a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts
index d4b0407f88..c556b04bbe 100644
--- a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts
+++ b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { describe, expect } from "vitest";
 
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { SchedulingType } from "@calcom/prisma/enums";
 import { BookingStatus } from "@calcom/prisma/enums";
@@ -1279,7 +1279,7 @@ describe("handleNewBooking", () => {
               booking: {
                 uid: createdBooking.uid!,
                 // All booking links are of WEBAPP_URL and not of the org because the team isn't part of the org
-                urlOrigin: WEBAPP_URL,
+                urlOrigin: CAL_URL,
               },
               booker,
               organizer,
diff --git a/packages/lib/getBookerUrl/server.ts b/packages/lib/getBookerUrl/server.ts
index f34c208943..0031fa7943 100644
--- a/packages/lib/getBookerUrl/server.ts
+++ b/packages/lib/getBookerUrl/server.ts
@@ -1,12 +1,12 @@
-import { WEBAPP_URL } from "../constants";
+import { CAL_URL } from "../constants";
 import { getBrand } from "../server/getBrand";
 
 export const getBookerBaseUrl = async (user: { organizationId: number | null }) => {
   const orgBrand = await getBrand(user.organizationId);
-  return orgBrand?.fullDomain ?? WEBAPP_URL;
+  return orgBrand?.fullDomain ?? CAL_URL;
 };
 
 export const getTeamBookerUrl = async (team: { organizationId: number | null }) => {
   const orgBrand = await getBrand(team.organizationId);
-  return orgBrand?.fullDomain ?? WEBAPP_URL;
+  return orgBrand?.fullDomain ?? CAL_URL;
 };
diff --git a/packages/lib/getEventTypeById.ts b/packages/lib/getEventTypeById.ts
index 94b6e14cf0..8df07f7868 100644
--- a/packages/lib/getEventTypeById.ts
+++ b/packages/lib/getEventTypeById.ts
@@ -15,7 +15,7 @@ import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-u
 
 import { TRPCError } from "@trpc/server";
 
-import { WEBAPP_URL } from "./constants";
+import { CAL_URL } from "./constants";
 import { getBookerBaseUrl } from "./getBookerUrl/server";
 
 interface getEventTypeByIdProps {
@@ -271,7 +271,7 @@ export default async function getEventTypeById({
       ? await getBookerBaseUrl({ organizationId: restEventType.team.parentId })
       : restEventType.owner
       ? await getBookerBaseUrl(restEventType.owner)
-      : WEBAPP_URL,
+      : CAL_URL,
     children: restEventType.children.flatMap((ch) =>
       ch.owner !== null
         ? {