diff --git a/apps/web/app/settings/(admin-layout)/AdminLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/apps/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/apps/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/oAuth/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/oAuth/page.tsx
diff --git a/apps/web/app/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
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/page.tsx
diff --git a/apps/web/app/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
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/users/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/users/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/admin/workspace-platforms/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx
similarity index 100%
rename from apps/web/app/settings/(admin-layout)/admin/workspace-platforms/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx
diff --git a/apps/web/app/settings/(admin-layout)/AdminLayoutAppDir.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/layout.tsx
similarity index 81%
rename from apps/web/app/settings/(admin-layout)/AdminLayoutAppDir.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(admin-layout)/layout.tsx
index a455f2f8f3..b5286dee2b 100644
--- a/apps/web/app/settings/(admin-layout)/AdminLayoutAppDir.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/layout.tsx
@@ -6,7 +6,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
-import SettingsLayoutAppDir from "../(settings-layout)/SettingsLayoutAppDir";
+import SettingsLayoutAppDir from "../(settings-layout)/layout";
 import type { AdminLayoutProps } from "./AdminLayoutAppDirClient";
 
 const AdminLayoutAppDirClient = dynamic(() => import("./AdminLayoutAppDirClient"), {
@@ -21,5 +21,3 @@ export default async function AdminLayoutAppDir(props: AdminLayoutAppDirProps) {
 
   return await SettingsLayoutAppDir({ children: <AdminLayoutAppDirClient {...props} userRole={userRole} /> });
 }
-
-export const getLayout = async (page: React.ReactElement) => await AdminLayoutAppDir({ children: page });
diff --git a/apps/web/app/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
diff --git a/apps/web/app/settings/(settings-layout)/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/billing/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/api-keys/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/api-keys/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/developer/webhooks/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/SettingsLayoutAppDir.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
similarity index 84%
rename from apps/web/app/settings/(settings-layout)/SettingsLayoutAppDir.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
index 0fc271a394..d2c953d8ef 100644
--- a/apps/web/app/settings/(settings-layout)/SettingsLayoutAppDir.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx
@@ -13,10 +13,11 @@ const SettingsLayoutAppDirClient = dynamic(() => import("./SettingsLayoutAppDirC
   ssr: false,
 });
 
-type SettingsLayoutAppDir = Omit<SettingsLayoutProps, "currentOrg" | "otherTeams">;
+type SettingsLayoutAppDirProps = Omit<SettingsLayoutProps, "currentOrg" | "otherTeams">;
 
-export default async function SettingsLayoutAppDir(props: SettingsLayoutAppDir) {
+export default async function SettingsLayoutAppDir(props: SettingsLayoutAppDirProps) {
   const session = await getServerSession({ req: buildLegacyRequest(headers(), cookies()) });
+
   const userId = session?.user?.id ?? -1;
   const orgId = session?.user?.org?.id ?? -1;
   let currentOrg = null;
@@ -35,5 +36,3 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutAppDir)
 
   return <SettingsLayoutAppDirClient {...props} currentOrg={currentOrg} otherTeams={otherTeams} />;
 }
-
-export const getLayout = async (page: React.ReactElement) => await SettingsLayoutAppDir({ children: page });
diff --git a/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/appearance/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/appearance/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/general/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/general/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/out-of-office/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/out-of-office/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/profile/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/profile/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/create/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/create/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/attributes/page.tsx
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/billing/page.tsx
new file mode 100644
index 0000000000..7993b194a4
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/billing/page.tsx
@@ -0,0 +1,5 @@
+import BillingPage, { generateMetadata } from "../../billing/page";
+
+export { generateMetadata };
+
+export default BillingPage;
diff --git a/apps/web/app/settings/(settings-layout)/organizations/domain-wide-delegation/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/domain-wide-delegation/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/domain-wide-delegation/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/domain-wide-delegation/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/dsync/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/dsync/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/general/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/general/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/privacy/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/privacy/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/sso/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/sso/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/security/password/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/security/password/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/security/sso/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/security/sso/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/billing/page.tsx
new file mode 100644
index 0000000000..e88787f0b7
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/billing/page.tsx
@@ -0,0 +1,4 @@
+import BillingPage, { generateMetadata } from "../../../billing/page";
+
+export { generateMetadata };
+export default BillingPage;
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/settings/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/teams/[id]/settings/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx
diff --git a/apps/web/app/settings/(settings-layout)/teams/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/page.tsx
similarity index 100%
rename from apps/web/app/settings/(settings-layout)/teams/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/page.tsx
diff --git a/apps/web/app/settings/license-key/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx
similarity index 50%
rename from apps/web/app/settings/license-key/new/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx
index d6e6e58344..09d4940017 100644
--- a/apps/web/app/settings/license-key/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx
@@ -1,9 +1,11 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/settings/license-key/new/getServerSideProps";
 
 import CreateANewLicenseKeyForm, { LayoutWrapper } from "~/settings/license-key/new/new-view";
@@ -14,8 +16,15 @@ export const generateMetadata = async () =>
     (t) => t("organizations_description")
   );
 
-export default WithLayout({
-  Page: CreateANewLicenseKeyForm,
-  getLayout: LayoutWrapper,
-  getData: withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps),
-});
+const getData = withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <CreateANewLicenseKeyForm />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/organizations/[id]/about/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/about/page.tsx
similarity index 55%
rename from apps/web/app/settings/organizations/[id]/about/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/[id]/about/page.tsx
index cb899d1e0b..991e556f15 100644
--- a/apps/web/app/settings/organizations/[id]/about/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/about/page.tsx
@@ -1,9 +1,12 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
 import { getServerSideProps } from "@calcom/features/ee/organizations/pages/organization";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
 import LegacyPage, { LayoutWrapper } from "~/settings/organizations/[id]/about-view";
 
 export const generateMetadata = async () =>
@@ -14,8 +17,13 @@ export const generateMetadata = async () =>
 
 const getData = withAppDirSsr(getServerSideProps);
 
-export default WithLayout({
-  Page: LegacyPage,
-  getLayout: LayoutWrapper,
-  getData,
-});
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <LegacyPage />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/organizations/[id]/add-teams/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/add-teams/page.tsx
similarity index 55%
rename from apps/web/app/settings/organizations/[id]/add-teams/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/[id]/add-teams/page.tsx
index 86c8f32962..937dbccd39 100644
--- a/apps/web/app/settings/organizations/[id]/add-teams/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/add-teams/page.tsx
@@ -1,9 +1,12 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
 import { getServerSideProps } from "@calcom/features/ee/organizations/pages/organization";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
 import LegacyPage, { LayoutWrapper } from "~/settings/organizations/[id]/add-teams-view";
 
 export const generateMetadata = async () =>
@@ -14,8 +17,13 @@ export const generateMetadata = async () =>
 
 const getData = withAppDirSsr(getServerSideProps);
 
-export default WithLayout({
-  Page: LegacyPage,
-  getLayout: LayoutWrapper,
-  getData,
-});
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <LegacyPage />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/organizations/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/members/page.tsx
similarity index 72%
rename from apps/web/app/settings/organizations/[id]/members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/[id]/members/page.tsx
index 0c78d970cb..2ab52fffac 100644
--- a/apps/web/app/settings/organizations/[id]/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/members/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import MembersPage from "~/members/members-view";
 
@@ -9,6 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("organization_description")
   );
 
-export default WithLayout({
-  Page: MembersPage,
-});
+const ServerPageWrapper = () => {
+  return <MembersPage />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/organizations/[id]/onboard-members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/onboard-members/page.tsx
similarity index 56%
rename from apps/web/app/settings/organizations/[id]/onboard-members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/[id]/onboard-members/page.tsx
index 56be6482e1..09fcf81c55 100644
--- a/apps/web/app/settings/organizations/[id]/onboard-members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/[id]/onboard-members/page.tsx
@@ -1,9 +1,12 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
 import { getServerSideProps } from "@calcom/features/ee/organizations/pages/organization";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
 import LegacyPage, { LayoutWrapper } from "~/settings/organizations/[id]/onboard-members-view";
 
 export const generateMetadata = async () =>
@@ -14,8 +17,13 @@ export const generateMetadata = async () =>
 
 const getData = withAppDirSsr(getServerSideProps);
 
-export default WithLayout({
-  Page: LegacyPage,
-  getLayout: LayoutWrapper,
-  getData,
-});
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <LegacyPage />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/organizations/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/appearance/page.tsx
similarity index 75%
rename from apps/web/app/settings/organizations/appearance/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/appearance/page.tsx
index 84acb6502b..4729f92be8 100644
--- a/apps/web/app/settings/organizations/appearance/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/appearance/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import Page from "@calcom/features/ee/organizations/pages/settings/appearance";
 
@@ -9,4 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("appearance_org_description")
   );
 
-export default WithLayout({ Page });
+const ServerPageWrapper = () => {
+  return <Page />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/organizations/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/members/page.tsx
similarity index 61%
rename from apps/web/app/settings/organizations/members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/organizations/members/page.tsx
index 82af86f80b..2fa140478b 100644
--- a/apps/web/app/settings/organizations/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/members/page.tsx
@@ -1,11 +1,9 @@
+import SettingsLayoutAppDir from "app/(use-page-wrapper)/settings/(settings-layout)/layout";
 import { _generateMetadata, getTranslate } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import LegacyPage from "@calcom/features/ee/organizations/pages/members";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
-import SettingsLayoutAppDir from "../../(settings-layout)/SettingsLayoutAppDir";
-
 export const generateMetadata = async () =>
   await _generateMetadata(
     (t) => t("organization_members"),
@@ -15,14 +13,12 @@ export const generateMetadata = async () =>
 const Page = async () => {
   const t = await getTranslate();
 
-  return (
+  const children = (
     <SettingsHeader title={t("organization_members")} description={t("organization_description")}>
       <LegacyPage />
     </SettingsHeader>
   );
+  return await SettingsLayoutAppDir({ children, containerClassName: "lg:max-w-screen-2xl" });
 };
 
-const getLayout = async (page: React.ReactElement) =>
-  await SettingsLayoutAppDir({ children: page, containerClassName: "lg:max-w-screen-2xl" });
-
-export default WithLayout({ ServerPage: Page, getServerLayout: getLayout })<"P">;
+export default Page;
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx
new file mode 100644
index 0000000000..fbbffd2a72
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx
@@ -0,0 +1,33 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";
+import { type inferSSRProps } from "@lib/types/inferSSRProps";
+
+import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/create-new-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("set_up_your_organization"),
+    (t) => t("organizations_description")
+  );
+
+const getData = withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <LicenseRequired>
+        <LegacyPage />
+      </LicenseRequired>
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/platform/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/billing/page.tsx
similarity index 73%
rename from apps/web/app/settings/platform/billing/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/billing/page.tsx
index 0644ec7c7f..5a4e7fca09 100644
--- a/apps/web/app/settings/platform/billing/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/billing/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import PlatformBillingUpgrade from "~/settings/platform/billing/billing-view";
 
@@ -10,6 +9,8 @@ export const generateMetadata = async () => {
   );
 };
 
-export default WithLayout({
-  Page: PlatformBillingUpgrade,
-});
+const ServerPageWrapper = () => {
+  return <PlatformBillingUpgrade />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/managed-users/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx
similarity index 73%
rename from apps/web/app/settings/platform/managed-users/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx
index 17cb3b45de..adbf3015fc 100644
--- a/apps/web/app/settings/platform/managed-users/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/managed-users/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import ManagedUsersView from "~/settings/platform/managed-users/managed-users-view";
 
@@ -9,6 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("platform_members_description")
   );
 
-export default WithLayout({
-  Page: ManagedUsersView,
-});
+const ServerPageWrapper = () => {
+  return <ManagedUsersView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/page.tsx
similarity index 73%
rename from apps/web/app/settings/platform/members/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/members/page.tsx
index 20650f7def..c024e5f5f2 100644
--- a/apps/web/app/settings/platform/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import PlatformMembersView from "@calcom/features/ee/platform/pages/settings/members";
 
@@ -9,6 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("platform_members_description")
   );
 
-export default WithLayout({
-  Page: PlatformMembersView,
-});
+const ServerPageWrapper = () => {
+  return <PlatformMembersView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx
new file mode 100644
index 0000000000..34cd14dc1d
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/new/page.tsx
@@ -0,0 +1,33 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";
+import { type inferSSRProps } from "@lib/types/inferSSRProps";
+
+import LegacyPage, { LayoutWrapper } from "~/settings/platform/new/create-new-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("set_up_your_platform_organization"),
+    (t) => t("platform_organization_description")
+  );
+
+const getData = withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+  return (
+    <LayoutWrapper>
+      <LicenseRequired>
+        <LegacyPage />
+      </LicenseRequired>
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/platform/oauth-clients/[clientId]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/page.tsx
similarity index 70%
rename from apps/web/app/settings/platform/oauth-clients/[clientId]/edit/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/page.tsx
index 0b4ef43aff..f57307691b 100644
--- a/apps/web/app/settings/platform/oauth-clients/[clientId]/edit/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import EditView from "~/settings/platform/oauth-clients/[clientId]/edit/edit-view";
 
@@ -9,7 +8,8 @@ export const generateMetadata = async () =>
     () => ""
   );
 
-export default WithLayout({
-  getLayout: null,
-  Page: EditView,
-});
+const ServerPageWrapper = () => {
+  return <EditView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx
similarity index 69%
rename from apps/web/app/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx
index 23a36f10ca..571936e18c 100644
--- a/apps/web/app/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import EditWebhooksView from "~/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view";
 
@@ -9,7 +8,8 @@ export const generateMetadata = async () =>
     () => ""
   );
 
-export default WithLayout({
-  getLayout: null,
-  Page: EditWebhooksView,
-});
+const ServerPageWrapper = () => {
+  return <EditWebhooksView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/oauth-clients/create/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/create/page.tsx
similarity index 69%
rename from apps/web/app/settings/platform/oauth-clients/create/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/create/page.tsx
index 7550fbe8ef..731c9ed045 100644
--- a/apps/web/app/settings/platform/oauth-clients/create/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/oauth-clients/create/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import CreateNewView from "~/settings/platform/oauth-clients/create-new-view";
 
@@ -10,7 +9,8 @@ export const generateMetadata = async () => {
   );
 };
 
-export default WithLayout({
-  getLayout: null,
-  Page: CreateNewView,
-});
+const ServerPageWrapper = () => {
+  return <CreateNewView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/page.tsx
similarity index 69%
rename from apps/web/app/settings/platform/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/page.tsx
index 104d334c6a..273067e785 100644
--- a/apps/web/app/settings/platform/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import PlatformView from "~/settings/platform/platform-view";
 
@@ -10,7 +9,8 @@ export const generateMetadata = async () => {
   );
 };
 
-export default WithLayout({
-  getLayout: null,
-  Page: PlatformView,
-});
+const ServerPageWrapper = () => {
+  return <PlatformView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/settings/platform/plans/page.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx
similarity index 72%
rename from apps/web/app/settings/platform/plans/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx
index c6e8f8483d..70e361a349 100644
--- a/apps/web/app/settings/platform/plans/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/plans/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import PlatformPlansView from "~/settings/platform/plans/platform-plans-view";
 
@@ -10,6 +9,8 @@ export const generateMetadata = async () => {
   );
 };
 
-export default WithLayout({
-  Page: PlatformPlansView,
-});
+const ServerPageWrapper = () => {
+  return <PlatformPlansView />;
+};
+
+export default ServerPageWrapper;
diff --git a/apps/web/app/(use-page-wrapper)/settings/teams/[id]/event-type/page.tsx b/apps/web/app/(use-page-wrapper)/settings/teams/[id]/event-type/page.tsx
new file mode 100644
index 0000000000..02b273700f
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/teams/[id]/event-type/page.tsx
@@ -0,0 +1,19 @@
+import { _generateMetadata } from "app/_utils";
+
+import CreateTeamEventType, { LayoutWrapper } from "~/settings/teams/[id]/event-types-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("add_new_team_event_type"),
+    (t) => t("new_event_type_to_book_description")
+  );
+
+const ServerPage = async () => {
+  return (
+    <LayoutWrapper>
+      <CreateTeamEventType />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/(use-page-wrapper)/settings/teams/[id]/onboard-members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/teams/[id]/onboard-members/page.tsx
new file mode 100644
index 0000000000..c79a216ef8
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/settings/teams/[id]/onboard-members/page.tsx
@@ -0,0 +1,19 @@
+import { _generateMetadata } from "app/_utils";
+
+import AddNewTeamMembers, { LayoutWrapper } from "~/settings/teams/[id]/onboard-members-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("add_team_members"),
+    (t) => t("add_team_members_description")
+  );
+
+const ServerPage = async () => {
+  return (
+    <LayoutWrapper>
+      <AddNewTeamMembers />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/teams/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/teams/new/page.tsx
similarity index 66%
rename from apps/web/app/settings/teams/new/page.tsx
rename to apps/web/app/(use-page-wrapper)/settings/teams/new/page.tsx
index 160d6559d1..388c30fd48 100644
--- a/apps/web/app/settings/teams/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/teams/new/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import CreateNewTeamView, { LayoutWrapper } from "~/settings/teams/new/create-new-team-view";
 
@@ -9,4 +8,12 @@ export const generateMetadata = async () =>
     (t) => t("create_new_team_description")
   );
 
-export default WithLayout({ Page: CreateNewTeamView, getLayout: LayoutWrapper })<"P">;
+const ServerPage = async () => {
+  return (
+    <LayoutWrapper>
+      <CreateNewTeamView />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
diff --git a/apps/web/app/settings/(admin-layout)/layout.tsx b/apps/web/app/settings/(admin-layout)/layout.tsx
deleted file mode 100644
index ef33662b93..0000000000
--- a/apps/web/app/settings/(admin-layout)/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { WithLayout } from "app/layoutHOC";
-
-import { getLayout } from "./AdminLayoutAppDir";
-
-export default WithLayout({ getServerLayout: getLayout })<"L">;
diff --git a/apps/web/app/settings/(settings-layout)/layout.tsx b/apps/web/app/settings/(settings-layout)/layout.tsx
deleted file mode 100644
index 9b882fff16..0000000000
--- a/apps/web/app/settings/(settings-layout)/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { WithLayout } from "app/layoutHOC";
-
-import { getLayout } from "./SettingsLayoutAppDir";
-
-export default WithLayout({ getServerLayout: getLayout })<"L">;
diff --git a/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx
deleted file mode 100644
index b187e8ee1c..0000000000
--- a/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page";
-
-export { generateMetadata };
-
-export default BillingPage;
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx
deleted file mode 100644
index 4acaedef2b..0000000000
--- a/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page";
-
-export { generateMetadata };
-export default BillingPage;
diff --git a/apps/web/app/settings/organizations/new/page.tsx b/apps/web/app/settings/organizations/new/page.tsx
deleted file mode 100644
index 3c11ec9d19..0000000000
--- a/apps/web/app/settings/organizations/new/page.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";
-import { type inferSSRProps } from "@lib/types/inferSSRProps";
-
-import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/create-new-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("set_up_your_organization"),
-    (t) => t("organizations_description")
-  );
-
-export default WithLayout({
-  requiresLicense: true,
-  getLayout: LayoutWrapper,
-  Page: LegacyPage,
-  getData: withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps),
-});
diff --git a/apps/web/app/settings/platform/new/page.tsx b/apps/web/app/settings/platform/new/page.tsx
deleted file mode 100644
index 033ef74380..0000000000
--- a/apps/web/app/settings/platform/new/page.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";
-import { type inferSSRProps } from "@lib/types/inferSSRProps";
-
-import LegacyPage, { LayoutWrapper } from "~/settings/platform/new/create-new-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("set_up_your_platform_organization"),
-    (t) => t("platform_organization_description")
-  );
-
-export default WithLayout({
-  getLayout: LayoutWrapper,
-  Page: LegacyPage,
-  getData: withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps),
-  requiresLicense: true,
-});
diff --git a/apps/web/app/settings/teams/[id]/event-type/page.tsx b/apps/web/app/settings/teams/[id]/event-type/page.tsx
deleted file mode 100644
index 47e5b8b8c1..0000000000
--- a/apps/web/app/settings/teams/[id]/event-type/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import CreateTeamEventType, { GetLayout } from "~/settings/teams/[id]/event-types-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("add_new_team_event_type"),
-    (t) => t("new_event_type_to_book_description")
-  );
-
-export default WithLayout({ Page: CreateTeamEventType, getLayout: GetLayout })<"P">;
diff --git a/apps/web/app/settings/teams/[id]/onboard-members/page.tsx b/apps/web/app/settings/teams/[id]/onboard-members/page.tsx
deleted file mode 100644
index cf2117b4ad..0000000000
--- a/apps/web/app/settings/teams/[id]/onboard-members/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import AddNewTeamMembers, { GetLayout } from "~/settings/teams/[id]/onboard-members-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("add_team_members"),
-    (t) => t("add_team_members_description")
-  );
-
-export default WithLayout({ Page: AddNewTeamMembers, getLayout: GetLayout })<"P">;
diff --git a/apps/web/modules/settings/license-key/new/new-view.tsx b/apps/web/modules/settings/license-key/new/new-view.tsx
index a8996ee5f9..8f1c2b46ba 100644
--- a/apps/web/modules/settings/license-key/new/new-view.tsx
+++ b/apps/web/modules/settings/license-key/new/new-view.tsx
@@ -3,10 +3,10 @@
 import { CreateANewLicenseKeyForm } from "@calcom/features/ee/deployment/licensekey/CreateLicenseKeyForm";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={1} maxSteps={2}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/organizations/[id]/about-view.tsx b/apps/web/modules/settings/organizations/[id]/about-view.tsx
index 485e582721..d84565803d 100644
--- a/apps/web/modules/settings/organizations/[id]/about-view.tsx
+++ b/apps/web/modules/settings/organizations/[id]/about-view.tsx
@@ -3,10 +3,10 @@
 import { AboutOrganizationForm } from "@calcom/features/ee/organizations/components";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={3} maxSteps={5}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/organizations/[id]/add-teams-view.tsx b/apps/web/modules/settings/organizations/[id]/add-teams-view.tsx
index 21a11c76e0..ad498b34b5 100644
--- a/apps/web/modules/settings/organizations/[id]/add-teams-view.tsx
+++ b/apps/web/modules/settings/organizations/[id]/add-teams-view.tsx
@@ -3,10 +3,10 @@
 import { AddNewTeamsForm } from "@calcom/features/ee/organizations/components";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={5} maxSteps={5}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/organizations/[id]/onboard-members-view.tsx b/apps/web/modules/settings/organizations/[id]/onboard-members-view.tsx
index 6218462585..e3e0df7e8e 100644
--- a/apps/web/modules/settings/organizations/[id]/onboard-members-view.tsx
+++ b/apps/web/modules/settings/organizations/[id]/onboard-members-view.tsx
@@ -6,7 +6,7 @@ import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMe
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const router = useRouter();
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -19,7 +19,7 @@ export const LayoutWrapper = (page: React.ReactElement) => {
       isOptionalCallback={() => {
         router.push(`/settings/organizations/${query.get("id")}/add-teams`);
       }}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/organizations/new/create-new-view.tsx b/apps/web/modules/settings/organizations/new/create-new-view.tsx
index 79f1d3936e..eb18990e42 100644
--- a/apps/web/modules/settings/organizations/new/create-new-view.tsx
+++ b/apps/web/modules/settings/organizations/new/create-new-view.tsx
@@ -3,10 +3,10 @@
 import { CreateANewOrganizationForm } from "@calcom/features/ee/organizations/components";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={1} maxSteps={5}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/platform/new/create-new-view.tsx b/apps/web/modules/settings/platform/new/create-new-view.tsx
index fc155ff204..f530e0fa6c 100644
--- a/apps/web/modules/settings/platform/new/create-new-view.tsx
+++ b/apps/web/modules/settings/platform/new/create-new-view.tsx
@@ -3,10 +3,10 @@
 import { CreateANewPlatformForm } from "@calcom/features/ee/platform/components/index";
 import { WizardLayout } from "@calcom/ui";
 
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={1} maxSteps={1}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
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 3787201244..502266bc8d 100644
--- a/apps/web/modules/settings/teams/[id]/event-types-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
@@ -65,7 +65,7 @@ export const CreateTeamEventType = () => {
   );
 };
 
-export const GetLayout = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   const router = useRouter();
   const searchParams = useCompatSearchParams();
   const teamId = searchParams?.get("id") ? Number(searchParams.get("id")) : -1;
@@ -77,7 +77,7 @@ export const GetLayout = (page: React.ReactElement) => {
       isOptionalCallback={() => {
         router.push(`/settings/teams/${teamId}/profile`);
       }}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };
diff --git a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
index 3fae7f5e6e..40dc2b863d 100644
--- a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
@@ -3,9 +3,9 @@
 import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMembers";
 import { WizardLayout } from "@calcom/ui";
 
-export const GetLayout = (page: React.ReactElement) => (
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => (
   <WizardLayout currentStep={2} maxSteps={3}>
-    {page}
+    {children}
   </WizardLayout>
 );
 
diff --git a/apps/web/modules/settings/teams/new/create-new-team-view.tsx b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
index dce0adafc5..0855836781 100644
--- a/apps/web/modules/settings/teams/new/create-new-team-view.tsx
+++ b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
@@ -51,10 +51,10 @@ const CreateNewTeamPage = () => {
     />
   );
 };
-export const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <WizardLayout currentStep={1} maxSteps={3}>
-      {page}
+      {children}
     </WizardLayout>
   );
 };