diff --git a/apps/web/app/(use-page-wrapper)/enterprise/page.tsx b/apps/web/app/(use-page-wrapper)/enterprise/page.tsx
index 3be9790f06a2d0..9b96fe2de0c4f6 100644
--- a/apps/web/app/(use-page-wrapper)/enterprise/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/enterprise/page.tsx
@@ -1,11 +1,11 @@
 import { _generateMetadata } from "app/_utils";
 
-import EnterprisePage from "@components/EnterprisePage";
+import UpgradeToEnterprise from "@components/UpgradePageWrapper";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
-    (t) => t("create_your_org"),
+    (t) => t("enterprise_description"),
     (t) => t("create_your_org_description")
   );
 
-export default EnterprisePage;
+export default UpgradeToEnterprise;
diff --git a/apps/web/app/(use-page-wrapper)/insights/layout.tsx b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
index 7aee590dde914e..2c0b16f5ef1ce6 100644
--- a/apps/web/app/(use-page-wrapper)/insights/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
@@ -2,14 +2,14 @@ import { getTranslate } from "app/_utils";
 
 import Shell from "@calcom/features/shell/Shell";
 
-import UpgradeTipWrapper from "./UpgradeTipWrapper";
+import { UpgradeInsights } from "@components/UpgradePageWrapper";
 
 export default async function InsightsLayout({ children }: { children: React.ReactNode }) {
   const t = await getTranslate();
   return (
     <div>
       <Shell withoutMain={false} withoutSeo={true} heading={t("insights")} subtitle={t("insights_subtitle")}>
-        <UpgradeTipWrapper>{children}</UpgradeTipWrapper>
+        <UpgradeInsights>{children}</UpgradeInsights>
       </Shell>
     </div>
   );
diff --git a/apps/web/app/(use-page-wrapper)/organizations/page.tsx b/apps/web/app/(use-page-wrapper)/organizations/page.tsx
new file mode 100644
index 00000000000000..abc067d404a596
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/organizations/page.tsx
@@ -0,0 +1,13 @@
+import { _generateMetadata } from "app/_utils";
+
+import { UpgradeToOrganizations } from "@components/UpgradePageWrapper";
+
+export default function OrganizationsPage() {
+  return <UpgradeToOrganizations />;
+}
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("create_your_org"),
+    (t) => t("create_your_org_description")
+  );
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
index 2edf360cd78e46..15a46f99f1d061 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
@@ -1,8 +1,9 @@
 import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
+import EnterprisePage from "@components/EnterprisePage";
+
 export const generateMetadata = async () =>
   await _generateMetadata(
     (t) => `${t("admin")} ${t("api_reference")}`,
@@ -17,7 +18,7 @@ const Page = async () => {
       title={`${t("admin")} ${t("api_reference")}`}
       description={t("leverage_our_api")}
       borderInShellHeader={false}>
-      <AdminAPIView />
+      <EnterprisePage />
     </SettingsHeader>
   );
 };
diff --git a/apps/web/components/EnterprisePage.tsx b/apps/web/components/EnterprisePage.tsx
deleted file mode 100644
index 17af9f4dcb98d0..00000000000000
--- a/apps/web/components/EnterprisePage.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-"use client";
-
-import Shell from "@calcom/features/shell/Shell";
-import { UpgradeTip } from "@calcom/features/tips";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, ButtonGroup, Icon } from "@calcom/ui";
-
-export default function EnterprisePage() {
-  const { t } = useLocale();
-
-  const features = [
-    {
-      icon: <Icon name="globe" className="h-5 w-5 text-red-500" />,
-      title: t("branded_subdomain"),
-      description: t("branded_subdomain_description"),
-    },
-    {
-      icon: <Icon name="chart-bar" className="h-5 w-5 text-blue-500" />,
-      title: t("org_insights"),
-      description: t("org_insights_description"),
-    },
-    {
-      icon: <Icon name="paintbrush" className="h-5 w-5 text-pink-500" />,
-      title: t("extensive_whitelabeling"),
-      description: t("extensive_whitelabeling_description"),
-    },
-    {
-      icon: <Icon name="users" className="h-5 w-5 text-orange-500" />,
-      title: t("unlimited_teams"),
-      description: t("unlimited_teams_description"),
-    },
-    {
-      icon: <Icon name="credit-card" className="h-5 w-5 text-green-500" />,
-      title: t("unified_billing"),
-      description: t("unified_billing_description"),
-    },
-    {
-      icon: <Icon name="lock" className="h-5 w-5 text-purple-500" />,
-      title: t("advanced_managed_events"),
-      description: t("advanced_managed_events_description"),
-    },
-  ];
-  return (
-    <div>
-      <Shell heading={t("enterprise")} subtitle={t("enterprise_description")} withoutSeo={true}>
-        <UpgradeTip
-          plan="enterprise"
-          title={t("create_your_org")}
-          description={t("create_your_org_description")}
-          features={features}
-          background="/tips/enterprise"
-          buttons={
-            <div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
-              <ButtonGroup>
-                <Button color="primary" href="https://i.cal.com/sales/enterprise?duration=25" target="_blank">
-                  {t("contact_sales")}
-                </Button>
-                <Button color="minimal" href="https://cal.com/enterprise" target="_blank">
-                  {t("learn_more")}
-                </Button>
-              </ButtonGroup>
-            </div>
-          }>
-          <>Create Org</>
-        </UpgradeTip>
-      </Shell>
-    </div>
-  );
-}
diff --git a/apps/web/components/OrganizationsPage.tsx b/apps/web/components/OrganizationsPage.tsx
new file mode 100644
index 00000000000000..bce9a91fe6b301
--- /dev/null
+++ b/apps/web/components/OrganizationsPage.tsx
@@ -0,0 +1 @@
+"use client";
diff --git a/apps/web/components/UpgradePageWrapper.tsx b/apps/web/components/UpgradePageWrapper.tsx
new file mode 100644
index 00000000000000..823b9fef129195
--- /dev/null
+++ b/apps/web/components/UpgradePageWrapper.tsx
@@ -0,0 +1,215 @@
+"use client";
+
+import { useSession } from "next-auth/react";
+
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+import Shell from "@calcom/features/shell/Shell";
+import { UpgradeTip } from "@calcom/features/tips";
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Button, Icon, ButtonGroup } from "@calcom/ui";
+
+export default function UpgradeToTeams({ children }: { children: React.ReactNode }) {
+  const { t } = useLocale();
+  const session = useSession();
+  const features = [
+    {
+      icon: <Icon name="users" className="h-5 w-5" />,
+      title: t("view_bookings_across"),
+      description: t("view_bookings_across_description"),
+    },
+    {
+      icon: <Icon name="refresh-ccw" className="h-5 w-5" />,
+      title: t("identify_booking_trends"),
+      description: t("identify_booking_trends_description"),
+    },
+    {
+      icon: <Icon name="user-plus" className="h-5 w-5" />,
+      title: t("spot_popular_event_types"),
+      description: t("spot_popular_event_types_description"),
+    },
+  ];
+
+  return (
+    <Shell heading={t("insights")} subtitle={t("insights_subtitle")} withoutSeo={true}>
+      <UpgradeTip
+        plan="team"
+        title={t("make_informed_decisions")}
+        description={t("make_informed_decisions_description")}
+        features={features}
+        background="/tips/insights"
+        buttons={
+          <div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
+            <ButtonGroup>
+              <Button color="primary" href={`${WEBAPP_URL}/settings/teams/new`}>
+                {t("create_team")}
+              </Button>
+              <Button color="minimal" href="https://go.cal.com/insights" target="_blank">
+                {t("learn_more")}
+              </Button>
+            </ButtonGroup>
+          </div>
+        }>
+        {!session.data?.user ? null : children}
+      </UpgradeTip>
+    </Shell>
+  );
+}
+
+export function UpgradeInsights({ children }: { children: React.ReactNode }) {
+  const { t } = useLocale();
+  const session = useSession();
+  const features = [
+    {
+      icon: <Icon name="users" className="h-5 w-5" />,
+      title: t("view_bookings_across"),
+      description: t("view_bookings_across_description"),
+    },
+    {
+      icon: <Icon name="refresh-ccw" className="h-5 w-5" />,
+      title: t("identify_booking_trends"),
+      description: t("identify_booking_trends_description"),
+    },
+    {
+      icon: <Icon name="user-plus" className="h-5 w-5" />,
+      title: t("spot_popular_event_types"),
+      description: t("spot_popular_event_types_description"),
+    },
+  ];
+
+  return (
+    <UpgradeTip
+      plan="team"
+      title={t("make_informed_decisions")}
+      description={t("make_informed_decisions_description")}
+      features={features}
+      background="/tips/insights"
+      buttons={
+        <div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
+          <ButtonGroup>
+            <Button color="primary" href={`${WEBAPP_URL}/settings/teams/new`}>
+              {t("create_team")}
+            </Button>
+            <Button color="minimal" href="https://go.cal.com/insights" target="_blank">
+              {t("learn_more")}
+            </Button>
+          </ButtonGroup>
+        </div>
+      }>
+      {!session.data?.user ? null : children}
+    </UpgradeTip>
+  );
+}
+
+export function UpgradeToEnterprise() {
+  const { t } = useLocale();
+
+  const features = [
+    {
+      icon: <Icon name="terminal" className="h-5 w-5 text-pink-500" />,
+      title: t("admin_api"),
+      description: t("leverage_our_api"),
+    },
+    {
+      icon: <Icon name="folder" className="h-5 w-5 text-red-500" />,
+      title: `SCIM & ${t("directory_sync")}`,
+      description: t("directory_sync_description"),
+    },
+    {
+      icon: <Icon name="sparkles" className="h-5 w-5 text-blue-500" />,
+      title: "Cal.ai",
+      description: t("use_cal_ai_to_make_call_description"),
+    },
+  ];
+  return (
+    <Shell heading={t("enterprise")} subtitle={t("enterprise_description")} withoutSeo={true}>
+      <LicenseRequired>
+        <div className="mt-8">
+          <UpgradeTip
+            plan="enterprise"
+            title={t("enterprise_license")}
+            description={t("create_your_enterprise_description")}
+            features={features}
+            background="/tips/enterprise"
+            buttons={
+              <div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
+                <ButtonGroup>
+                  <Button color="primary" href="https://cal.com/sales" target="_blank">
+                    {t("contact_sales")}
+                  </Button>
+                  <Button color="minimal" href="https://cal.com/enterprise" target="_blank">
+                    {t("learn_more")}
+                  </Button>
+                </ButtonGroup>
+              </div>
+            }>
+            {/* TODO: Show your Organization */}
+          </UpgradeTip>
+        </div>
+      </LicenseRequired>
+    </Shell>
+  );
+}
+
+export function UpgradeToOrganizations() {
+  const { t } = useLocale();
+
+  const features = [
+    {
+      icon: <Icon name="globe" className="h-5 w-5 text-red-500" />,
+      title: t("branded_subdomain"),
+      description: t("branded_subdomain_description"),
+    },
+    {
+      icon: <Icon name="chart-bar" className="h-5 w-5 text-blue-500" />,
+      title: t("org_insights"),
+      description: t("org_insights_description"),
+    },
+    {
+      icon: <Icon name="paintbrush" className="h-5 w-5 text-pink-500" />,
+      title: t("extensive_whitelabeling"),
+      description: t("extensive_whitelabeling_description"),
+    },
+    {
+      icon: <Icon name="users" className="h-5 w-5 text-orange-500" />,
+      title: t("unlimited_teams"),
+      description: t("unlimited_teams_description"),
+    },
+    {
+      icon: <Icon name="credit-card" className="h-5 w-5 text-green-500" />,
+      title: t("unified_billing"),
+      description: t("unified_billing_description"),
+    },
+    {
+      icon: <Icon name="lock" className="h-5 w-5 text-purple-500" />,
+      title: t("advanced_managed_events"),
+      description: t("advanced_managed_events_description"),
+    },
+  ];
+  return (
+    <div>
+      <Shell heading={t("organizations")} subtitle={t("organizations_description")} withoutSeo={true}>
+        <UpgradeTip
+          plan="enterprise"
+          title={t("create_your_org")}
+          description={t("create_your_org_description")}
+          features={features}
+          background="/tips/enterprise"
+          buttons={
+            <div className="space-y-2 rtl:space-x-reverse sm:space-x-2">
+              <ButtonGroup>
+                <Button color="primary" href="https://i.cal.com/sales/enterprise?duration=25" target="_blank">
+                  {t("create_your_org")}
+                </Button>
+                <Button color="minimal" href="https://cal.com/enterprise" target="_blank">
+                  {t("learn_more")}
+                </Button>
+              </ButtonGroup>
+            </div>
+          }>
+          <>Create Org</>
+        </UpgradeTip>
+      </Shell>
+    </div>
+  );
+}
diff --git a/apps/web/modules/settings/my-account/appearance-view.tsx b/apps/web/modules/settings/my-account/appearance-view.tsx
index d031f2cdabf6e4..2f2ba46d6d923b 100644
--- a/apps/web/modules/settings/my-account/appearance-view.tsx
+++ b/apps/web/modules/settings/my-account/appearance-view.tsx
@@ -29,7 +29,7 @@ import {
   SkeletonContainer,
   SkeletonText,
   SettingsToggle,
-  UpgradeTeamsBadge,
+  UpgradeBadge,
   useCalcomTheme,
 } from "@calcom/ui";
 
@@ -422,7 +422,7 @@ const AppearanceView = ({
             disabled={!hasPaidPlan || mutation?.isPending}
             description={t("removes_cal_branding", { appName: APP_NAME })}
             checked={hasPaidPlan ? hideBrandingValue : false}
-            Badge={<UpgradeTeamsBadge />}
+            Badge={<UpgradeBadge />}
             onCheckedChange={(checked) => {
               setHideBrandingValue(checked);
               mutation.mutate({ hideBranding: checked });
diff --git a/apps/web/public/static/locales/ar/common.json b/apps/web/public/static/locales/ar/common.json
index 4210793c04e9aa..dc0792b3e427c1 100644
--- a/apps/web/public/static/locales/ar/common.json
+++ b/apps/web/public/static/locales/ar/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "مضيفون بنظام دوار",
   "minimum_round_robin_hosts_count": "عدد المضيفين المطلوب حضورهم",
   "hosts": "المضيفون",
-  "upgrade_to_enable_feature": "تحتاج إلى إنشاء فريق لتفعيل هذه الميزة. انقر هنا لإنشاء فريق.",
-  "orgs_upgrade_to_enable_feature": "تحتاج إلى الترقية إلى خطة enterprise لتفعيل هذه الميزة.",
+  "upgrade_to_team": "تحتاج إلى إنشاء فريق لتفعيل هذه الميزة. انقر هنا لإنشاء فريق.",
+  "upgrade_to_enterprise": "تحتاج إلى الترقية إلى خطة enterprise لتفعيل هذه الميزة.",
   "new_attendee": "حضور جديد",
   "awaiting_approval": "في انتظار الموافقة",
   "requires_google_calendar": "يتطلب هذا التطبيق اتصال تقويم Google",
diff --git a/apps/web/public/static/locales/az/common.json b/apps/web/public/static/locales/az/common.json
index bec2dfffb3b112..025fcdb15aa5f4 100644
--- a/apps/web/public/static/locales/az/common.json
+++ b/apps/web/public/static/locales/az/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin Hostlar",
   "minimum_round_robin_hosts_count": "Tələb olunan host sayı",
   "hosts": "Hostlar",
-  "upgrade_to_enable_feature": "Bu funksiyanı aktivləşdirmək üçün komanda yaratmalısınız. Komanda yaratmaq üçün buraya klikləyin.",
-  "orgs_upgrade_to_enable_feature": "Bu funksiyanı aktivləşdirmək üçün enterprise planımıza yüksəltməlisiniz.",
+  "upgrade_to_team": "Bu funksiyanı aktivləşdirmək üçün komanda yaratmalısınız. Komanda yaratmaq üçün buraya klikləyin.",
+  "upgrade_to_enterprise": "Bu funksiyanı aktivləşdirmək üçün enterprise planımıza yüksəltməlisiniz.",
   "new_attendee": "Yeni İştirakçı",
   "awaiting_approval": "Təsdiq gözləyir",
   "requires_google_calendar": "Bu tətbiq Google Calendar bağlantısı tələb edir",
diff --git a/apps/web/public/static/locales/bg/common.json b/apps/web/public/static/locales/bg/common.json
index e7fab9245a0e40..984e29d44144dd 100644
--- a/apps/web/public/static/locales/bg/common.json
+++ b/apps/web/public/static/locales/bg/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin домакини",
   "minimum_round_robin_hosts_count": "Необходим брой домакини за участие",
   "hosts": "Домакини",
-  "upgrade_to_enable_feature": "Трябва да създадете екип, за да активирате тази функция. Кликнете тук, за да създадете екип.",
-  "orgs_upgrade_to_enable_feature": "Трябва да преминете към корпоративния ни план, за да активирате тази функция.",
+  "upgrade_to_team": "Трябва да създадете екип, за да активирате тази функция. Кликнете тук, за да създадете екип.",
+  "upgrade_to_enterprise": "Трябва да преминете към корпоративния ни план, за да активирате тази функция.",
   "new_attendee": "Нов участник",
   "awaiting_approval": "Очаква одобрение",
   "requires_google_calendar": "Това приложение изисква връзка с Google Calendar",
diff --git a/apps/web/public/static/locales/ca/common.json b/apps/web/public/static/locales/ca/common.json
index 94262fc37e3e7f..13c2c324c2c341 100644
--- a/apps/web/public/static/locales/ca/common.json
+++ b/apps/web/public/static/locales/ca/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Amfitrions Round-Robin",
   "minimum_round_robin_hosts_count": "Nombre mínim d'amfitrions necessaris per assistir",
   "hosts": "Amfitrions",
-  "upgrade_to_enable_feature": "Has de crear un equip per activar aquesta funcionalitat. Fes clic aquí per crear un equip.",
-  "orgs_upgrade_to_enable_feature": "Has d'actualitzar al pla enterprise per activar aquesta funcionalitat.",
+  "upgrade_to_team": "Has de crear un equip per activar aquesta funcionalitat. Fes clic aquí per crear un equip.",
+  "upgrade_to_enterprise": "Has d'actualitzar al pla enterprise per activar aquesta funcionalitat.",
   "new_attendee": "Nou assistent",
   "awaiting_approval": "Pendent d'aprovació",
   "requires_google_calendar": "Aquesta aplicació requereix una connexió amb Google Calendar",
diff --git a/apps/web/public/static/locales/cs/common.json b/apps/web/public/static/locales/cs/common.json
index 99014932b97682..de389b7329daff 100644
--- a/apps/web/public/static/locales/cs/common.json
+++ b/apps/web/public/static/locales/cs/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Hostitelé typu „round robin“",
   "minimum_round_robin_hosts_count": "Počet hostitelů, kteří se musí zúčastnit",
   "hosts": "Hostitelé",
-  "upgrade_to_enable_feature": "Pro povolení této funkce musíte vytvořit tým. Klikněte zde pro vytvoření týmu.",
-  "orgs_upgrade_to_enable_feature": "Pokud chcete zapnout tuto funkci, musíte upgradovat na náš tarif Enterprise.",
+  "upgrade_to_team": "Pro povolení této funkce musíte vytvořit tým. Klikněte zde pro vytvoření týmu.",
+  "upgrade_to_enterprise": "Pokud chcete zapnout tuto funkci, musíte upgradovat na náš tarif Enterprise.",
   "new_attendee": "Nový účastník",
   "awaiting_approval": "Čeká na schválení",
   "requires_google_calendar": "Tato aplikace vyžaduje připojení ke Kalendáři Google",
diff --git a/apps/web/public/static/locales/da/common.json b/apps/web/public/static/locales/da/common.json
index ac5e796f249f37..2e570729d8379e 100644
--- a/apps/web/public/static/locales/da/common.json
+++ b/apps/web/public/static/locales/da/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin Værter",
   "minimum_round_robin_hosts_count": "Antallet af værter, der skal deltage",
   "hosts": "Værter",
-  "upgrade_to_enable_feature": "Du skal oprette et team for at aktivere denne funktion. Klik her for at oprette et team.",
-  "orgs_upgrade_to_enable_feature": "Du skal opgradere til vores enterprise-plan for at aktivere denne funktion.",
+  "upgrade_to_team": "Du skal oprette et team for at aktivere denne funktion. Klik her for at oprette et team.",
+  "upgrade_to_enterprise": "Du skal opgradere til vores enterprise-plan for at aktivere denne funktion.",
   "new_attendee": "Ny Deltager",
   "awaiting_approval": "Afventer Godkendelse",
   "requires_google_calendar": "Denne app kræver en Google Calendar-forbindelse",
diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json
index 708bf2037234da..3df40c6278b98b 100644
--- a/apps/web/public/static/locales/de/common.json
+++ b/apps/web/public/static/locales/de/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin-Veranstalter",
   "minimum_round_robin_hosts_count": "Anzahl der Veranstalter, die teilnehmen müssen",
   "hosts": "Veranstalter",
-  "upgrade_to_enable_feature": "Sie müssen ein Team erstellen, um diese Funktion zu aktivieren. Klicken Sie hier, um ein Team zu erstellen.",
-  "orgs_upgrade_to_enable_feature": "Sie müssen auf unsere Enterprise-Lizenz aktualisieren, um diese Funktion zu aktivieren.",
+  "upgrade_to_team": "Sie müssen ein Team erstellen, um diese Funktion zu aktivieren. Klicken Sie hier, um ein Team zu erstellen.",
+  "upgrade_to_enterprise": "Sie müssen auf unsere Enterprise-Lizenz aktualisieren, um diese Funktion zu aktivieren.",
   "new_attendee": "Neuer Teilnehmer",
   "awaiting_approval": "Wartet auf Genehmigung",
   "requires_google_calendar": "Diese App erfordert eine Verbindung mit Google Calendar",
diff --git a/apps/web/public/static/locales/el/common.json b/apps/web/public/static/locales/el/common.json
index eea8bef76006b5..f4acfbf26558f6 100644
--- a/apps/web/public/static/locales/el/common.json
+++ b/apps/web/public/static/locales/el/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Διοργανωτές Round-Robin",
   "minimum_round_robin_hosts_count": "Απαιτούμενος αριθμός διοργανωτών για συμμετοχή",
   "hosts": "Διοργανωτές",
-  "upgrade_to_enable_feature": "Πρέπει να δημιουργήσετε μια ομάδα για να ενεργοποιήσετε αυτή τη λειτουργία. Κάντε κλικ εδώ για να δημιουργήσετε μια ομάδα.",
-  "orgs_upgrade_to_enable_feature": "Πρέπει να αναβαθμίσετε στο εταιρικό πρόγραμμα για να ενεργοποιήσετε αυτή τη λειτουργία.",
+  "upgrade_to_team": "Πρέπει να δημιουργήσετε μια ομάδα για να ενεργοποιήσετε αυτή τη λειτουργία. Κάντε κλικ εδώ για να δημιουργήσετε μια ομάδα.",
+  "upgrade_to_enterprise": "Πρέπει να αναβαθμίσετε στο εταιρικό πρόγραμμα για να ενεργοποιήσετε αυτή τη λειτουργία.",
   "new_attendee": "Νέος συμμετέχων",
   "awaiting_approval": "Σε αναμονή έγκρισης",
   "requires_google_calendar": "Αυτή η εφαρμογή απαιτεί σύνδεση με το Google Calendar",
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index f97e4299f80068..936cdce90d44e7 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1869,8 +1869,9 @@
   "round_robin_hosts": "Round-Robin Hosts",
   "minimum_round_robin_hosts_count": "Number of hosts required to attend",
   "hosts": "Hosts",
-  "upgrade_to_enable_feature": "You need to create a team to enable this feature. Click here to create a team.",
-  "orgs_upgrade_to_enable_feature": "You need to upgrade to our enterprise plan to enable this feature.",
+  "upgrade_to_team": "You need to create a team to enable this feature. Click here to create a team.",
+  "upgrade_to_organizations": "You need to upgrade to our organizations plan to enable this feature.",
+  "upgrade_to_enterprise": "You need to upgrade to our enterprise plan to enable this feature.",
   "new_attendee": "New Attendee",
   "awaiting_approval": "Awaiting Approval",
   "requires_google_calendar": "This app requires a Google Calendar connection",
diff --git a/apps/web/public/static/locales/es-419/common.json b/apps/web/public/static/locales/es-419/common.json
index fe357b7cfc9b78..7ab0366390446c 100644
--- a/apps/web/public/static/locales/es-419/common.json
+++ b/apps/web/public/static/locales/es-419/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Anfitriones Round-Robin",
   "minimum_round_robin_hosts_count": "Número de anfitriones requeridos para asistir",
   "hosts": "Anfitriones",
-  "upgrade_to_enable_feature": "Necesitas crear un equipo para habilitar esta función. Haz clic aquí para crear un equipo.",
-  "orgs_upgrade_to_enable_feature": "Necesitas actualizar a nuestro plan empresarial para habilitar esta función.",
+  "upgrade_to_team": "Necesitas crear un equipo para habilitar esta función. Haz clic aquí para crear un equipo.",
+  "upgrade_to_enterprise": "Necesitas actualizar a nuestro plan empresarial para habilitar esta función.",
   "new_attendee": "Nuevo Asistente",
   "awaiting_approval": "En Espera de Aprobación",
   "requires_google_calendar": "Esta aplicación requiere una conexión con Google Calendar",
diff --git a/apps/web/public/static/locales/es/common.json b/apps/web/public/static/locales/es/common.json
index dc1a59d088d95e..b6d72740524274 100644
--- a/apps/web/public/static/locales/es/common.json
+++ b/apps/web/public/static/locales/es/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Anfitriones por turnos",
   "minimum_round_robin_hosts_count": "Número de anfitriones requeridos para asistir",
   "hosts": "Anfitriones",
-  "upgrade_to_enable_feature": "Necesitas crear un equipo para habilitar esta función. Haz clic aquí para crear un equipo.",
-  "orgs_upgrade_to_enable_feature": "Debe pasarse a nuestro plan Enterprise para habilitar esta función.",
+  "upgrade_to_team": "Necesitas crear un equipo para habilitar esta función. Haz clic aquí para crear un equipo.",
+  "upgrade_to_enterprise": "Debe pasarse a nuestro plan Enterprise para habilitar esta función.",
   "new_attendee": "Nuevo asistente",
   "awaiting_approval": "En espera de aprobación",
   "requires_google_calendar": "Esta aplicación requiere una conexión con Google Calendar",
diff --git a/apps/web/public/static/locales/et/common.json b/apps/web/public/static/locales/et/common.json
index 8de2d45e06ba07..f9802fc903772c 100644
--- a/apps/web/public/static/locales/et/common.json
+++ b/apps/web/public/static/locales/et/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Ring-Robini võõrustajad",
   "minimum_round_robin_hosts_count": "Osalemiseks vajalik võõrustajate arv",
   "hosts": "Võõrustajad",
-  "upgrade_to_enable_feature": "Selle funktsiooni lubamiseks peate looma meeskonna. Klõpsake siia meeskonna loomiseks.",
-  "orgs_upgrade_to_enable_feature": "Selle funktsiooni lubamiseks peate üle minema meie ettevõtteplaanile.",
+  "upgrade_to_team": "Selle funktsiooni lubamiseks peate looma meeskonna. Klõpsake siia meeskonna loomiseks.",
+  "upgrade_to_enterprise": "Selle funktsiooni lubamiseks peate üle minema meie ettevõtteplaanile.",
   "new_attendee": "Uus osaleja",
   "awaiting_approval": "Ootan heakskiitu",
   "requires_google_calendar": "See rakendus nõuab Google'i kalendri ühendust",
diff --git a/apps/web/public/static/locales/eu/common.json b/apps/web/public/static/locales/eu/common.json
index 53851cb562bfbe..7b9adb3b746fd4 100644
--- a/apps/web/public/static/locales/eu/common.json
+++ b/apps/web/public/static/locales/eu/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin ostalariak",
   "minimum_round_robin_hosts_count": "Beharrezkoak diren ostalari kopurua",
   "hosts": "Ostalariak",
-  "upgrade_to_enable_feature": "Talde bat sortu behar duzu funtzio hau gaitzeko. Egin klik hemen talde bat sortzeko.",
-  "orgs_upgrade_to_enable_feature": "Enterprise planera igo behar duzu funtzio hau gaitzeko.",
+  "upgrade_to_team": "Talde bat sortu behar duzu funtzio hau gaitzeko. Egin klik hemen talde bat sortzeko.",
+  "upgrade_to_enterprise": "Enterprise planera igo behar duzu funtzio hau gaitzeko.",
   "new_attendee": "Parte-hartzaile berria",
   "awaiting_approval": "Onarpenaren zain",
   "requires_google_calendar": "App honek Google Calendar konexioa behar du",
diff --git a/apps/web/public/static/locales/fi/common.json b/apps/web/public/static/locales/fi/common.json
index 3ae99e34bdef8a..e3260be0b35472 100644
--- a/apps/web/public/static/locales/fi/common.json
+++ b/apps/web/public/static/locales/fi/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin-isännät",
   "minimum_round_robin_hosts_count": "Vaadittu isäntien määrä osallistumiseen",
   "hosts": "Isännät",
-  "upgrade_to_enable_feature": "Sinun täytyy luoda tiimi ottaaksesi tämän ominaisuuden käyttöön. Klikkaa tästä luodaksesi tiimin.",
-  "orgs_upgrade_to_enable_feature": "Sinun täytyy päivittää enterprise-suunnitelmaan ottaaksesi tämän ominaisuuden käyttöön.",
+  "upgrade_to_team": "Sinun täytyy luoda tiimi ottaaksesi tämän ominaisuuden käyttöön. Klikkaa tästä luodaksesi tiimin.",
+  "upgrade_to_enterprise": "Sinun täytyy päivittää enterprise-suunnitelmaan ottaaksesi tämän ominaisuuden käyttöön.",
   "new_attendee": "Uusi osallistuja",
   "awaiting_approval": "Odottaa hyväksyntää",
   "requires_google_calendar": "Tämä sovellus vaatii Google Calendar -yhteyden",
diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json
index 33c066b8b594c2..40e63d8417800f 100644
--- a/apps/web/public/static/locales/fr/common.json
+++ b/apps/web/public/static/locales/fr/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Hôtes round-robin",
   "minimum_round_robin_hosts_count": "Nombre d'hôtes requis pour participer",
   "hosts": "Hôtes",
-  "upgrade_to_enable_feature": "Vous devez créer une équipe pour activer cette fonctionnalité. Cliquez ici pour créer une équipe.",
-  "orgs_upgrade_to_enable_feature": "Vous devez passer sur notre formule entreprise pour activer cette fonctionnalité.",
+  "upgrade_to_team": "Vous devez créer une équipe pour activer cette fonctionnalité. Cliquez ici pour créer une équipe.",
+  "upgrade_to_enterprise": "Vous devez passer sur notre formule entreprise pour activer cette fonctionnalité.",
   "new_attendee": "Nouveau participant",
   "awaiting_approval": "En attente de validation",
   "requires_google_calendar": "Cette application nécessite une connexion à Google Agenda",
diff --git a/apps/web/public/static/locales/he/common.json b/apps/web/public/static/locales/he/common.json
index 8a2bc69e5e5572..7793669e42e3e9 100644
--- a/apps/web/public/static/locales/he/common.json
+++ b/apps/web/public/static/locales/he/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "מארחים לפי סבב",
   "minimum_round_robin_hosts_count": "מספר המארחים שחייבים להשתתף",
   "hosts": "מארחים",
-  "upgrade_to_enable_feature": "עליך ליצור צוות כדי להפעיל תכונה זו. לחץ כאן ליצירת צוות.",
-  "orgs_upgrade_to_enable_feature": "כדי לאפשר שימוש בתכונה הזו, יש לשדרג לתוכנית שלנו לארגונים.",
+  "upgrade_to_team": "עליך ליצור צוות כדי להפעיל תכונה זו. לחץ כאן ליצירת צוות.",
+  "upgrade_to_enterprise": "כדי לאפשר שימוש בתכונה הזו, יש לשדרג לתוכנית שלנו לארגונים.",
   "new_attendee": "משתתף/ת חדש/ה",
   "awaiting_approval": "בהמתנה לאישור",
   "requires_google_calendar": "האפליקציה הזו מחייבת חיבור ל-Google Calendar",
diff --git a/apps/web/public/static/locales/hu/common.json b/apps/web/public/static/locales/hu/common.json
index b52a9881869282..a4fdabb9673e92 100644
--- a/apps/web/public/static/locales/hu/common.json
+++ b/apps/web/public/static/locales/hu/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin házigazdák",
   "minimum_round_robin_hosts_count": "A részvételhez szükséges házigazdák száma",
   "hosts": "Házigazdák",
-  "upgrade_to_enable_feature": "Csapatot kell létrehoznia ennek a funkciónak az engedélyezéséhez. Kattintson ide egy csapat létrehozásához.",
-  "orgs_upgrade_to_enable_feature": "A funkció engedélyezéséhez frissítenie kell vállalati csomagunkra.",
+  "upgrade_to_team": "Csapatot kell létrehoznia ennek a funkciónak az engedélyezéséhez. Kattintson ide egy csapat létrehozásához.",
+  "upgrade_to_enterprise": "A funkció engedélyezéséhez frissítenie kell vállalati csomagunkra.",
   "new_attendee": "Új résztvevő",
   "awaiting_approval": "Jóváhagyásra vár",
   "requires_google_calendar": "Ehhez az alkalmazáshoz Google Naptár-kapcsolat szükséges",
diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json
index 8f6f0011eeb9c5..bfb1247316df0a 100644
--- a/apps/web/public/static/locales/it/common.json
+++ b/apps/web/public/static/locales/it/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Organizzatori round robin",
   "minimum_round_robin_hosts_count": "Numero di organizzatori necessario per partecipare",
   "hosts": "Organizzatori",
-  "upgrade_to_enable_feature": "Devi creare un team per abilitare questa funzionalità. Clicca qui per creare un team.",
-  "orgs_upgrade_to_enable_feature": "Per abilitare questa funzione, è necessario eseguire l'upgrade al nostro piano Enterprise.",
+  "upgrade_to_team": "Devi creare un team per abilitare questa funzionalità. Clicca qui per creare un team.",
+  "upgrade_to_enterprise": "Per abilitare questa funzione, è necessario eseguire l'upgrade al nostro piano Enterprise.",
   "new_attendee": "Nuovo partecipante",
   "awaiting_approval": "In attesa di approvazione",
   "requires_google_calendar": "L'app richiede una connessione a Google Calendar",
diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json
index 6371ad73a9a41c..2dc6f314eabdae 100644
--- a/apps/web/public/static/locales/ja/common.json
+++ b/apps/web/public/static/locales/ja/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "ラウンドロビンホスト",
   "minimum_round_robin_hosts_count": "出席が必要なホストの数",
   "hosts": "ホスト",
-  "upgrade_to_enable_feature": "この機能を有効にするにはチームを作成する必要があります。ここをクリックしてチームを作成してください。",
-  "orgs_upgrade_to_enable_feature": "この機能を有効にするには Enterprise プランにアップグレードする必要があります。",
+  "upgrade_to_team": "この機能を有効にするにはチームを作成する必要があります。ここをクリックしてチームを作成してください。",
+  "upgrade_to_enterprise": "この機能を有効にするには Enterprise プランにアップグレードする必要があります。",
   "new_attendee": "新規参加者",
   "awaiting_approval": "承認を待っています",
   "requires_google_calendar": "このアプリは Google カレンダーとの接続が必要です",
diff --git a/apps/web/public/static/locales/km/common.json b/apps/web/public/static/locales/km/common.json
index c35873e256293d..6b069eb5b2cd4c 100644
--- a/apps/web/public/static/locales/km/common.json
+++ b/apps/web/public/static/locales/km/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "ម្ចាស់ផ្ទះ Round-Robin",
   "minimum_round_robin_hosts_count": "ចំនួនម្ចាស់ផ្ទះដែលត្រូវការដើម្បីចូលរួម",
   "hosts": "ម្ចាស់ផ្ទះ",
-  "upgrade_to_enable_feature": "អ្នកត្រូវបង្កើតក្រុមដើម្បីបើកដំណើរការមុខងារនេះ។ ចុចទីនេះដើម្បីបង្កើតក្រុម។",
-  "orgs_upgrade_to_enable_feature": "អ្នកត្រូវតែធ្វើការអាប់ហ្គ្រេដទៅផែនការអាជីវកម្មរបស់យើងដើម្បីបើកមុខងារនេះ។",
+  "upgrade_to_team": "អ្នកត្រូវបង្កើតក្រុមដើម្បីបើកដំណើរការមុខងារនេះ។ ចុចទីនេះដើម្បីបង្កើតក្រុម។",
+  "upgrade_to_enterprise": "អ្នកត្រូវតែធ្វើការអាប់ហ្គ្រេដទៅផែនការអាជីវកម្មរបស់យើងដើម្បីបើកមុខងារនេះ។",
   "new_attendee": "អ្នកចូលរួមថ្មី",
   "awaiting_approval": "កំពុងរង់ចាំការអនុម័ត",
   "requires_google_calendar": "កម្មវិធីនេះត្រូវការការតភ្ជាប់ប្រតិទិន Google",
diff --git a/apps/web/public/static/locales/ko/common.json b/apps/web/public/static/locales/ko/common.json
index 7d7eb744493103..44e489dd343fcd 100644
--- a/apps/web/public/static/locales/ko/common.json
+++ b/apps/web/public/static/locales/ko/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "라운드 로빈 호스트",
   "minimum_round_robin_hosts_count": "참석에 필요한 호스트 수",
   "hosts": "호스트",
-  "upgrade_to_enable_feature": "이 기능을 활성화하려면 팀을 생성해야 합니다. 여기를 클릭하여 팀을 생성하세요.",
-  "orgs_upgrade_to_enable_feature": "이 기능을 활성화하려면 엔터프라이즈 플랜으로 업그레이드해야 합니다.",
+  "upgrade_to_team": "이 기능을 활성화하려면 팀을 생성해야 합니다. 여기를 클릭하여 팀을 생성하세요.",
+  "upgrade_to_enterprise": "이 기능을 활성화하려면 엔터프라이즈 플랜으로 업그레이드해야 합니다.",
   "new_attendee": "새 참석자",
   "awaiting_approval": "승인 기다리는 중",
   "requires_google_calendar": "이 앱은 Google Calendar 연결이 필요합니다",
diff --git a/apps/web/public/static/locales/nl/common.json b/apps/web/public/static/locales/nl/common.json
index c40c387f319afa..9c3fd8e316de64 100644
--- a/apps/web/public/static/locales/nl/common.json
+++ b/apps/web/public/static/locales/nl/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-robin-hosts",
   "minimum_round_robin_hosts_count": "Aantal vereiste hosts voor deelname",
   "hosts": "Hosts",
-  "upgrade_to_enable_feature": "Je moet een team aanmaken om deze functie in te schakelen. Klik hier om een team aan te maken.",
-  "orgs_upgrade_to_enable_feature": "U moet upgraden naar ons Enterprise-abonnement om deze functie in te schakelen.",
+  "upgrade_to_team": "Je moet een team aanmaken om deze functie in te schakelen. Klik hier om een team aan te maken.",
+  "upgrade_to_enterprise": "U moet upgraden naar ons Enterprise-abonnement om deze functie in te schakelen.",
   "new_attendee": "Nieuwe deelnemer",
   "awaiting_approval": "In afwachting van goedkeuring",
   "requires_google_calendar": "Deze app vereist een Google Agenda-koppeling",
diff --git a/apps/web/public/static/locales/no/common.json b/apps/web/public/static/locales/no/common.json
index 4f1b758a0d1f64..b5888041d57fdb 100644
--- a/apps/web/public/static/locales/no/common.json
+++ b/apps/web/public/static/locales/no/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round-Robin verter",
   "minimum_round_robin_hosts_count": "Antall verter som kreves for å delta",
   "hosts": "Verter",
-  "upgrade_to_enable_feature": "Du må opprette et team for å aktivere denne funksjonen. Klikk her for å opprette et team.",
-  "orgs_upgrade_to_enable_feature": "Du må oppgradere til vår bedriftsplan for å aktivere denne funksjonen.",
+  "upgrade_to_team": "Du må opprette et team for å aktivere denne funksjonen. Klikk her for å opprette et team.",
+  "upgrade_to_enterprise": "Du må oppgradere til vår bedriftsplan for å aktivere denne funksjonen.",
   "new_attendee": "Ny Deltaker",
   "awaiting_approval": "Venter på godkjenning",
   "requires_google_calendar": "Denne appen krever en Google Kalender-tilkobling",
diff --git a/apps/web/public/static/locales/pl/common.json b/apps/web/public/static/locales/pl/common.json
index ec1eb09990a038..005b1f2aa8db86 100644
--- a/apps/web/public/static/locales/pl/common.json
+++ b/apps/web/public/static/locales/pl/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Gospodarze przypisywani algorytmem karuzelowym",
   "minimum_round_robin_hosts_count": "Liczba gospodarzy, których uczestnictwo jest wymagane",
   "hosts": "Gospodarze",
-  "upgrade_to_enable_feature": "Musisz utworzyć zespół, aby włączyć tę funkcję. Kliknij tutaj, aby utworzyć zespół.",
-  "orgs_upgrade_to_enable_feature": "Aby włączyć tę funkcję, musisz przejść na plan Enterprise.",
+  "upgrade_to_team": "Musisz utworzyć zespół, aby włączyć tę funkcję. Kliknij tutaj, aby utworzyć zespół.",
+  "upgrade_to_enterprise": "Aby włączyć tę funkcję, musisz przejść na plan Enterprise.",
   "new_attendee": "Nowy uczestnik",
   "awaiting_approval": "Oczekiwanie na zatwierdzenie",
   "requires_google_calendar": "Ta aplikacja wymaga połączenia z Kalendarzem Google",
diff --git a/apps/web/public/static/locales/pt-BR/common.json b/apps/web/public/static/locales/pt-BR/common.json
index 9c3121315aebd1..96340fa3bb4f0e 100644
--- a/apps/web/public/static/locales/pt-BR/common.json
+++ b/apps/web/public/static/locales/pt-BR/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Anfitriões em Round-Robin",
   "minimum_round_robin_hosts_count": "Número de anfitriões necessários para participar",
   "hosts": "Anfitriões",
-  "upgrade_to_enable_feature": "Você precisa criar uma equipe para ativar este recurso. Clique aqui para criar uma equipe.",
-  "orgs_upgrade_to_enable_feature": "Você precisa atualizar para nosso plano empresarial para ativar esse recurso.",
+  "upgrade_to_team": "Você precisa criar uma equipe para ativar este recurso. Clique aqui para criar uma equipe.",
+  "upgrade_to_enterprise": "Você precisa atualizar para nosso plano empresarial para ativar esse recurso.",
   "new_attendee": "Novo participante",
   "awaiting_approval": "Aguardando aprovação",
   "requires_google_calendar": "Este aplicativo requer uma conexão com o Google Calendar",
diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json
index 84ad8721c4de7d..9b8a31cdb22e9a 100644
--- a/apps/web/public/static/locales/pt/common.json
+++ b/apps/web/public/static/locales/pt/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Distribuição equilibrada de anfitriões",
   "minimum_round_robin_hosts_count": "Número de anfitriões necessários",
   "hosts": "Anfitriões",
-  "upgrade_to_enable_feature": "Precisa de criar uma equipa para ativar esta funcionalidade. Clique aqui para criar uma equipa.",
-  "orgs_upgrade_to_enable_feature": "Deve atualizar para o nosso plano empresarial para ativar esta funcionalidade.",
+  "upgrade_to_team": "Precisa de criar uma equipa para ativar esta funcionalidade. Clique aqui para criar uma equipa.",
+  "upgrade_to_enterprise": "Deve atualizar para o nosso plano empresarial para ativar esta funcionalidade.",
   "new_attendee": "Novo participante",
   "awaiting_approval": "Aguarda aprovação",
   "requires_google_calendar": "Esta aplicação requer uma ligação ao Google Calendar",
diff --git a/apps/web/public/static/locales/ro/common.json b/apps/web/public/static/locales/ro/common.json
index 7b76c509046a9d..e13c471ff472e6 100644
--- a/apps/web/public/static/locales/ro/common.json
+++ b/apps/web/public/static/locales/ro/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Gazde Round-Robin",
   "minimum_round_robin_hosts_count": "Numărul de gazde necesar pentru participare",
   "hosts": "Gazde",
-  "upgrade_to_enable_feature": "Trebuie să creați o echipă pentru a activa această funcție. Faceți clic aici pentru a crea o echipă.",
-  "orgs_upgrade_to_enable_feature": "Trebuie să faceți upgrade la planul nostru Enterprise pentru a activa această caracteristică.",
+  "upgrade_to_team": "Trebuie să creați o echipă pentru a activa această funcție. Faceți clic aici pentru a crea o echipă.",
+  "upgrade_to_enterprise": "Trebuie să faceți upgrade la planul nostru Enterprise pentru a activa această caracteristică.",
   "new_attendee": "Participant nou",
   "awaiting_approval": "În așteptarea aprobării",
   "requires_google_calendar": "Această aplicație necesită o conexiune cu Google Calendar",
diff --git a/apps/web/public/static/locales/ru/common.json b/apps/web/public/static/locales/ru/common.json
index 6e7ba5cb8a8792..497e65c1b01248 100644
--- a/apps/web/public/static/locales/ru/common.json
+++ b/apps/web/public/static/locales/ru/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Назначение организаторов по очереди",
   "minimum_round_robin_hosts_count": "Количество организаторов, которые должны участвовать в мероприятии",
   "hosts": "Организаторы",
-  "upgrade_to_enable_feature": "Чтобы использовать эту функцию, нужно создать команду. Нажмите, чтобы создать команду.",
-  "orgs_upgrade_to_enable_feature": "Для использования этой функции нужно перейти на тарифный план Enterprise.",
+  "upgrade_to_team": "Чтобы использовать эту функцию, нужно создать команду. Нажмите, чтобы создать команду.",
+  "upgrade_to_enterprise": "Для использования этой функции нужно перейти на тарифный план Enterprise.",
   "new_attendee": "Новый участник",
   "awaiting_approval": "Ожидает одобрения",
   "requires_google_calendar": "Для этого приложения необходимо подключение к Google Календарю",
diff --git a/apps/web/public/static/locales/sk-SK/common.json b/apps/web/public/static/locales/sk-SK/common.json
index 4875af75fbcfd1..e46ed2a7faa115 100644
--- a/apps/web/public/static/locales/sk-SK/common.json
+++ b/apps/web/public/static/locales/sk-SK/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Hostitelia v systéme round-robin",
   "minimum_round_robin_hosts_count": "Počet hostiteľov potrebných na účasť",
   "hosts": "Hostitelia",
-  "upgrade_to_enable_feature": "Musíte vytvoriť tím, aby ste aktivovali túto funkciu. Kliknite sem na vytvorenie tímu.",
-  "orgs_upgrade_to_enable_feature": "Musíte prejsť na náš podnikový plán, aby ste aktivovali túto funkciu.",
+  "upgrade_to_team": "Musíte vytvoriť tím, aby ste aktivovali túto funkciu. Kliknite sem na vytvorenie tímu.",
+  "upgrade_to_enterprise": "Musíte prejsť na náš podnikový plán, aby ste aktivovali túto funkciu.",
   "new_attendee": "Nový účastník",
   "awaiting_approval": "Čaká na schválenie",
   "requires_google_calendar": "Táto aplikácia vyžaduje pripojenie k Google Kalendáru",
diff --git a/apps/web/public/static/locales/sr/common.json b/apps/web/public/static/locales/sr/common.json
index 15e667a6723aa2..fa877c34252f1b 100644
--- a/apps/web/public/static/locales/sr/common.json
+++ b/apps/web/public/static/locales/sr/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Kružno dodeljeni domaćini",
   "minimum_round_robin_hosts_count": "Broj domaćina potrebnih da učestvuju",
   "hosts": "Domaćini",
-  "upgrade_to_enable_feature": "Potrebno je da kreirate tim da biste omogućili ovu funkciju. Kliknite ovde da kreirate tim.",
-  "orgs_upgrade_to_enable_feature": "Morate da nadogradite na naš Enterprise plan da biste omogućili ovu funkciju.",
+  "upgrade_to_team": "Potrebno je da kreirate tim da biste omogućili ovu funkciju. Kliknite ovde da kreirate tim.",
+  "upgrade_to_enterprise": "Morate da nadogradite na naš Enterprise plan da biste omogućili ovu funkciju.",
   "new_attendee": "Novi učesnik",
   "awaiting_approval": "Čeka na odobrenje",
   "requires_google_calendar": "Ova aplikacija zahteva vezu sa Google kalendarom",
diff --git a/apps/web/public/static/locales/sv/common.json b/apps/web/public/static/locales/sv/common.json
index 6e818fbdde6fff..29635ff904551c 100644
--- a/apps/web/public/static/locales/sv/common.json
+++ b/apps/web/public/static/locales/sv/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Round Robin-värdar",
   "minimum_round_robin_hosts_count": "Antal värdar som krävs för att delta",
   "hosts": "Värdar",
-  "upgrade_to_enable_feature": "Du behöver skapa ett team för att aktivera denna funktion. Klicka här för att skapa ett team.",
-  "orgs_upgrade_to_enable_feature": "Du behöver uppgradera till vår företagsplan för att aktivera den här funktionen.",
+  "upgrade_to_team": "Du behöver skapa ett team för att aktivera denna funktion. Klicka här för att skapa ett team.",
+  "upgrade_to_enterprise": "Du behöver uppgradera till vår företagsplan för att aktivera den här funktionen.",
   "new_attendee": "Ny deltagare",
   "awaiting_approval": "Väntar på godkännande",
   "requires_google_calendar": "Den här appen kräver en Google Kalender-anslutning",
diff --git a/apps/web/public/static/locales/tr/common.json b/apps/web/public/static/locales/tr/common.json
index 64dd3c9191a30b..c79adc4119951d 100644
--- a/apps/web/public/static/locales/tr/common.json
+++ b/apps/web/public/static/locales/tr/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Döngüsel Organizatörler",
   "minimum_round_robin_hosts_count": "Katılması gereken organizatör sayısı",
   "hosts": "Organizatörler",
-  "upgrade_to_enable_feature": "Bu özelliği etkinleştirmek için bir ekip oluşturmanız gerekiyor. Ekip oluşturmak için buraya tıklayın.",
-  "orgs_upgrade_to_enable_feature": "Bu özelliği etkinleştirmek için kurumsal planımıza geçmeniz gerekiyor.",
+  "upgrade_to_team": "Bu özelliği etkinleştirmek için bir ekip oluşturmanız gerekiyor. Ekip oluşturmak için buraya tıklayın.",
+  "upgrade_to_enterprise": "Bu özelliği etkinleştirmek için kurumsal planımıza geçmeniz gerekiyor.",
   "new_attendee": "Yeni Katılımcı",
   "awaiting_approval": "Onay Bekleniyor",
   "requires_google_calendar": "Bu uygulama, Google Takvim bağlantısı gerektirir",
diff --git a/apps/web/public/static/locales/uk/common.json b/apps/web/public/static/locales/uk/common.json
index 8f4b8e7b88735e..c94731b917964b 100644
--- a/apps/web/public/static/locales/uk/common.json
+++ b/apps/web/public/static/locales/uk/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Почергові ведучі",
   "minimum_round_robin_hosts_count": "Кількість ведучих, які мають узяти участь",
   "hosts": "Ведучі",
-  "upgrade_to_enable_feature": "Вам потрібно створити команду, щоб увімкнути цю функцію. Натисніть тут, щоб створити команду.",
-  "orgs_upgrade_to_enable_feature": "Вам необхідно перейти на план Enterprise, щоб ввімкнути цю функцію.",
+  "upgrade_to_team": "Вам потрібно створити команду, щоб увімкнути цю функцію. Натисніть тут, щоб створити команду.",
+  "upgrade_to_enterprise": "Вам необхідно перейти на план Enterprise, щоб ввімкнути цю функцію.",
   "new_attendee": "Новий учасник",
   "awaiting_approval": "Очікує схвалення",
   "requires_google_calendar": "Цей додаток потрібно підключити до Google Календаря",
diff --git a/apps/web/public/static/locales/vi/common.json b/apps/web/public/static/locales/vi/common.json
index 51391647248673..09fb9aebfaedfd 100644
--- a/apps/web/public/static/locales/vi/common.json
+++ b/apps/web/public/static/locales/vi/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "Chủ tọa xoay vòng",
   "minimum_round_robin_hosts_count": "Số chủ tọa cần thiết để tham dự",
   "hosts": "Chủ tọa",
-  "upgrade_to_enable_feature": "Bạn cần tạo một nhóm để kích hoạt tính năng này. Nhấp vào đây để tạo một nhóm.",
-  "orgs_upgrade_to_enable_feature": "Bạn cần nâng cấp gói Enterprise để bật tính năng này.",
+  "upgrade_to_team": "Bạn cần tạo một nhóm để kích hoạt tính năng này. Nhấp vào đây để tạo một nhóm.",
+  "upgrade_to_enterprise": "Bạn cần nâng cấp gói Enterprise để bật tính năng này.",
   "new_attendee": "Người tham dự mới",
   "awaiting_approval": "Đang chờ duyệt",
   "requires_google_calendar": "Ứng dụng này yêu cầu bạn liên kết với Google Calendar",
diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json
index 35cca7010b795c..4e16299e8b6455 100644
--- a/apps/web/public/static/locales/zh-CN/common.json
+++ b/apps/web/public/static/locales/zh-CN/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "轮流主持人",
   "minimum_round_robin_hosts_count": "需要参加的主持人数目",
   "hosts": "主持人",
-  "upgrade_to_enable_feature": "您需要创建一个团队才能启用此功能。点击此处创建团队。",
-  "orgs_upgrade_to_enable_feature": "您需要升级到我们的企业计划才能启用此功能。",
+  "upgrade_to_team": "您需要创建一个团队才能启用此功能。点击此处创建团队。",
+  "upgrade_to_enterprise": "您需要升级到我们的企业计划才能启用此功能。",
   "new_attendee": "新参与者",
   "awaiting_approval": "待批准",
   "requires_google_calendar": "此应用需要 Google 日历连接",
diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json
index adde846e45b6e4..8e6e892e57e490 100644
--- a/apps/web/public/static/locales/zh-TW/common.json
+++ b/apps/web/public/static/locales/zh-TW/common.json
@@ -1869,8 +1869,8 @@
   "round_robin_hosts": "輪流主辦人",
   "minimum_round_robin_hosts_count": "須參加的主辦人數",
   "hosts": "主辦人",
-  "upgrade_to_enable_feature": "您需要創建一個團隊來啟用此功能。點擊此處創建團隊。",
-  "orgs_upgrade_to_enable_feature": "須升級至 Enterprise 方案才能啟用此功能。",
+  "upgrade_to_team": "您需要創建一個團隊來啟用此功能。點擊此處創建團隊。",
+  "upgrade_to_enterprise": "須升級至 Enterprise 方案才能啟用此功能。",
   "new_attendee": "新參與者",
   "awaiting_approval": "正在等待核准",
   "requires_google_calendar": "此應用程式需要 Google 日曆連結",
diff --git a/i18n.lock b/i18n.lock
index 1977cb6abbafdd..fba6ca91af06dc 100644
--- a/i18n.lock
+++ b/i18n.lock
@@ -1867,7 +1867,7 @@ checksums:
     minimum_round_robin_hosts_count: 5582ab73362ba09b5366984f6d7df29e
     hosts: e8f8791fcea6024eb21194a643d4dd5a
     upgrade_to_enable_feature: f180480b3c237bebfae046dfd941261a
-    orgs_upgrade_to_enable_feature: e606877ec226f35bb274fb497fd30963
+    upgrade_to_enterprise: e606877ec226f35bb274fb497fd30963
     new_attendee: 818656cd46e446313b8ed670f8361792
     awaiting_approval: 1587287d4d76a03d67940c18540b7e52
     requires_google_calendar: 6d16fbde7f48cba7737ea822ac7f481b
diff --git a/packages/features/ee/organizations/pages/settings/admin-api.tsx b/packages/features/ee/organizations/pages/settings/admin-api.tsx
index 9c776bb06da2fd..9354d556180e92 100644
--- a/packages/features/ee/organizations/pages/settings/admin-api.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin-api.tsx
@@ -5,7 +5,7 @@ import { UpgradeTip } from "@calcom/features/tips";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, Icon, ButtonGroup } from "@calcom/ui";
 
-export const AdminAPIView = () => {
+export const UpgradeEnterpriseTip = () => {
   const { t } = useLocale();
 
   const features = [
@@ -53,4 +53,4 @@ export const AdminAPIView = () => {
   );
 };
 
-export default AdminAPIView;
+export default UpgradeEnterpriseTip;
diff --git a/packages/features/ee/support/components/ContactMenuItem.tsx b/packages/features/ee/support/components/ContactMenuItem.tsx
index b70cff1df45546..4bc16e2ea06424 100644
--- a/packages/features/ee/support/components/ContactMenuItem.tsx
+++ b/packages/features/ee/support/components/ContactMenuItem.tsx
@@ -1,7 +1,7 @@
 import { JOIN_COMMUNITY } from "@calcom/lib/constants";
 import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, UpgradeTeamsBadge } from "@calcom/ui";
+import { Icon, UpgradeBadge } from "@calcom/ui";
 
 import FreshChatMenuItem from "../lib/freshchat/FreshChatMenuItem";
 import HelpscoutMenuItem from "../lib/helpscout/HelpscoutMenuItem";
@@ -26,7 +26,7 @@ export default function ContactMenuItem(props: ContactMenuItem) {
       ) : (
         <div className=" hover:text-emphasis text-default flex w-full cursor-not-allowed justify-between px-5 py-2 pr-4 text-sm font-medium">
           {t("premium_support")}
-          <UpgradeTeamsBadge />
+          <UpgradeBadge />
         </div>
       )}
       <a
diff --git a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx b/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
index 43b0394f349944..a48bf7453f49e5 100644
--- a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
+++ b/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
@@ -151,7 +151,7 @@ export const EventSetupTab = (
                   formMethods.setValue("autoTranslateDescriptionEnabled", value, { shouldDirty: true });
                 }}
                 disabled={!orgId}
-                tooltip={!orgId ? t("orgs_upgrade_to_enable_feature") : undefined}
+                tooltip={!orgId ? t("upgrade_to_enterprise") : undefined}
               />
             </div>
           )}
diff --git a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
index b9e26bc5ccb446..b7d4987e5c16a7 100644
--- a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
+++ b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
@@ -20,7 +20,7 @@ import {
   showToast,
   Switch,
   TextArea,
-  UpgradeTeamsBadge,
+  UpgradeBadge,
   Label,
   Input,
 } from "@calcom/ui";
@@ -231,7 +231,7 @@ export const CreateOrEditOutOfOfficeEntryModal = ({
                 />
                 {!hasTeamPlan && (
                   <div className="mx-2" data-testid="upgrade-team-badge">
-                    <UpgradeTeamsBadge />
+                    <UpgradeBadge />
                   </div>
                 )}
               </div>
diff --git a/packages/ui/components/badge/UpgradeBadge.tsx b/packages/ui/components/badge/UpgradeBadge.tsx
new file mode 100644
index 00000000000000..cb61543f7e82ec
--- /dev/null
+++ b/packages/ui/components/badge/UpgradeBadge.tsx
@@ -0,0 +1,55 @@
+import Link from "next/link";
+
+import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+import { Tooltip } from "../tooltip";
+import { Badge } from "./Badge";
+
+// TODO: make "teams" | "organizations" | "enterprise" a "Plan" type
+export const UpgradeBadge = function UpgradeBadge({ to }: { to?: "teams" | "organizations" | "enterprise" }) {
+  const { t } = useLocale();
+  const { hasPaidPlan } = useHasPaidPlan();
+
+  // TODO: check for what plan, i.e. hasTeamsPlan or hasEnterprisePlan
+  if (hasPaidPlan) return null;
+
+  if (to === "teams") {
+    return (
+      <Tooltip content={t("upgrade_to_team")}>
+        <Link href="/teams">
+          <Badge variant="gray">{t("upgrade")}</Badge>
+        </Link>
+      </Tooltip>
+    );
+  }
+
+  // TODO: ship /organizations page
+  if (to === "organizations") {
+    return (
+      <Tooltip content={t("upgrade_to_organizations")}>
+        <Link href="/organizations">
+          <Badge variant="gray">{t("upgrade")}</Badge>
+        </Link>
+      </Tooltip>
+    );
+  }
+
+  if (to === "enterprise") {
+    return (
+      <Tooltip content={t("upgrade_to_enterprise")}>
+        <Link href="https://cal.com/demo?plan=enterprise">
+          <Badge variant="gray">{t("upgrade")}</Badge>
+        </Link>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <Tooltip content={t("upgrade_to_team")}>
+      <Link href="/teams">
+        <Badge variant="gray">{t("upgrade")}</Badge>
+      </Link>
+    </Tooltip>
+  );
+};
diff --git a/packages/ui/components/badge/UpgradeOrgsBadge.tsx b/packages/ui/components/badge/UpgradeOrgsBadge.tsx
deleted file mode 100644
index 932cd82497cad8..00000000000000
--- a/packages/ui/components/badge/UpgradeOrgsBadge.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import { Tooltip } from "../tooltip";
-import { Badge } from "./Badge";
-
-export const UpgradeOrgsBadge = function UpgradeOrgsBadge() {
-  const { t } = useLocale();
-
-  return (
-    <Tooltip content={t("orgs_upgrade_to_enable_feature")}>
-      <a href="https://cal.com/enterprise" target="_blank">
-        <Badge variant="gray">{t("upgrade")}</Badge>
-      </a>
-    </Tooltip>
-  );
-};
diff --git a/packages/ui/components/badge/UpgradeTeamsBadge.tsx b/packages/ui/components/badge/UpgradeTeamsBadge.tsx
deleted file mode 100644
index 6bc2335b7bfc6d..00000000000000
--- a/packages/ui/components/badge/UpgradeTeamsBadge.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import Link from "next/link";
-
-import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import { Tooltip } from "../tooltip";
-import { Badge } from "./Badge";
-
-export const UpgradeTeamsBadge = function UpgradeTeamsBadge() {
-  const { t } = useLocale();
-  const { hasPaidPlan } = useHasPaidPlan();
-
-  if (hasPaidPlan) return null;
-
-  return (
-    <Tooltip content={t("upgrade_to_enable_feature")}>
-      <Link href="/teams">
-        <Badge variant="gray">{t("upgrade")}</Badge>
-      </Link>
-    </Tooltip>
-  );
-};
diff --git a/packages/ui/components/badge/index.ts b/packages/ui/components/badge/index.ts
index ec420c85cb96b4..42fa0cd5e8835b 100644
--- a/packages/ui/components/badge/index.ts
+++ b/packages/ui/components/badge/index.ts
@@ -1,5 +1,4 @@
 export { Badge } from "./Badge";
-export { UpgradeTeamsBadge } from "./UpgradeTeamsBadge";
-export { UpgradeOrgsBadge } from "./UpgradeOrgsBadge";
+export { UpgradeBadge } from "./UpgradeBadge";
 export { InfoBadge } from "./InfoBadge";
 export type { BadgeProps } from "./Badge";
diff --git a/packages/ui/components/form/select/components.tsx b/packages/ui/components/form/select/components.tsx
index 51a3748677b04d..81074a9a7920b6 100644
--- a/packages/ui/components/form/select/components.tsx
+++ b/packages/ui/components/form/select/components.tsx
@@ -3,7 +3,7 @@ import { components as reactSelectComponents } from "react-select";
 
 import { classNames } from "@calcom/lib";
 
-import { UpgradeTeamsBadge } from "../../badge";
+import { UpgradeBadge } from "../../badge";
 import { Icon } from "../../icon";
 import type { SelectProps } from "./Select";
 
@@ -47,7 +47,7 @@ export const OptionComponent = <
         <span className="mr-auto" data-testid={`select-option-${(props as unknown as ExtendedOption).value}`}>
           {props.label || <>&nbsp;</>}
         </span>
-        {(props.data as unknown as ExtendedOption).needsTeamsUpgrade ? <UpgradeTeamsBadge /> : <></>}
+        {(props.data as unknown as ExtendedOption).needsTeamsUpgrade ? <UpgradeBadge /> : <></>}
         {props.isSelected && <Icon name="check" className="ml-2 h-4 w-4" />}
       </div>
     </reactSelectComponents.Option>
diff --git a/packages/ui/index.ts b/packages/ui/index.ts
index b9385a946d4f6f..c00b7a24b608b8 100644
--- a/packages/ui/index.ts
+++ b/packages/ui/index.ts
@@ -8,7 +8,7 @@ export {
 export type { AvatarProps, AvatarGroupProps } from "./components/avatar";
 export { ArrowButton } from "./components/arrow-button";
 export type { ArrowButtonProps } from "./components/arrow-button";
-export { Badge, UpgradeTeamsBadge, InfoBadge } from "./components/badge";
+export { Badge, UpgradeBadge, InfoBadge } from "./components/badge";
 export type { BadgeProps } from "./components/badge";
 export { Breadcrumb, BreadcrumbContainer, BreadcrumbItem } from "./components/breadcrumb";
 export { Button, LinkIconButton, buttonClasses, SplitButton } from "./components/button";