diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.spec.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.spec.ts
index 503642631b..cb4c11c0a9 100644
--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.spec.ts
+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.spec.ts
@@ -82,6 +82,35 @@ describe("OutputEventTypesService_2024_06_14", () => {
       expect(result).toBe("https://acme.cal.com/owner1/30min");
     });
 
+    it("should use cal.com for non-managed users in platform orgs", () => {
+      const user = {
+        id: 1,
+        name: "Dhairyashil Shinde",
+        username: "dhairyashil10101010-gmail-com",
+        avatarUrl: null,
+        brandColor: null,
+        darkBrandColor: null,
+        weekStart: "Monday",
+        metadata: {},
+        organizationId: 1,
+        organization: { slug: "gmail-platform-9041df0e" },
+        movedToProfile: null,
+        profiles: [
+          {
+            id: 100,
+            username: "dhairyashil",
+            organizationId: 1,
+            organization: { id: 1, slug: "gmail-platform-9041df0e", isPlatform: true },
+          },
+        ],
+      };
+      const slug = "secret";
+
+      const result = service.buildBookingUrl(user, slug);
+
+      expect(result).toBe("https://cal.com/dhairyashil/secret");
+    });
+
     it("should fall back to user username when profile has no username", () => {
       const user = {
         id: 1,
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 1719913757..0e27ac332a 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
@@ -53,7 +53,7 @@ type EventTypeUser = {
   weekStart: string;
   metadata: Prisma.JsonValue;
   organizationId: number | null;
-  organization?: { slug: string | null } | null;
+  organization?: { slug: string | null; isPlatform?: boolean } | null;
   movedToProfile?: ProfileMinimal | null;
   profiles?: ProfileMinimal[];
 };
@@ -448,7 +448,9 @@ export class OutputEventTypesService_2024_06_14 {
       return "";
     }
 
-    const orgSlug = profile?.organization?.slug ?? null;
+    const org = profile?.organization;
+    // Don't use org subdomain for platform organizations - they don't have public-facing subdomains
+    const orgSlug = org && !org.isPlatform ? org.slug : null;
     const webAppUrl = this.configService.get<string>("app.baseUrl", "https://app.cal.com");
     const baseUrl = orgSlug ? getBookerBaseUrlSync(orgSlug) : webAppUrl;
     const normalizedBaseUrl = baseUrl.replace(/\/$/, "");
diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json
index 0e5ab88b51..e295c53b9c 100644
--- a/docs/api-reference/v2/openapi.json
+++ b/docs/api-reference/v2/openapi.json
@@ -2936,7 +2936,9 @@
                   "watchlist.create",
                   "watchlist.read",
                   "watchlist.update",
-                  "watchlist.delete"
+                  "watchlist.delete",
+                  "featureOptIn.read",
+                  "featureOptIn.update"
                 ]
               }
             }
@@ -6659,7 +6661,9 @@
                   "webhook.create",
                   "webhook.read",
                   "webhook.update",
-                  "webhook.delete"
+                  "webhook.delete",
+                  "featureOptIn.read",
+                  "featureOptIn.update"
                 ]
               }
             }
@@ -29645,7 +29649,9 @@
                 "watchlist.create",
                 "watchlist.read",
                 "watchlist.update",
-                "watchlist.delete"
+                "watchlist.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -29758,7 +29764,9 @@
                 "watchlist.create",
                 "watchlist.read",
                 "watchlist.update",
-                "watchlist.delete"
+                "watchlist.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -29920,7 +29928,9 @@
                 "watchlist.create",
                 "watchlist.read",
                 "watchlist.update",
-                "watchlist.delete"
+                "watchlist.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -30039,7 +30049,9 @@
                 "watchlist.create",
                 "watchlist.read",
                 "watchlist.update",
-                "watchlist.delete"
+                "watchlist.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           }
@@ -30123,7 +30135,9 @@
                 "webhook.create",
                 "webhook.read",
                 "webhook.update",
-                "webhook.delete"
+                "webhook.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -30215,7 +30229,9 @@
                 "webhook.create",
                 "webhook.read",
                 "webhook.update",
-                "webhook.delete"
+                "webhook.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -30356,7 +30372,9 @@
                 "webhook.create",
                 "webhook.read",
                 "webhook.update",
-                "webhook.delete"
+                "webhook.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           },
@@ -30454,7 +30472,9 @@
                 "webhook.create",
                 "webhook.read",
                 "webhook.update",
-                "webhook.delete"
+                "webhook.delete",
+                "featureOptIn.read",
+                "featureOptIn.update"
               ]
             }
           }
@@ -33058,10 +33078,6 @@
               "error"
             ]
           },
-          "message": {
-            "type": "string",
-            "example": "This endpoint will require authentication in a future release."
-          },
           "error": {
             "type": "object"
           },
@@ -33098,10 +33114,6 @@
               "type": "string"
             }
           },
-          "message": {
-            "type": "string",
-            "example": "This endpoint will require authentication in a future release."
-          },
           "error": {
             "type": "object"
           }