diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
index 2be58eaf21e1a3..7ec2b7fa6b65ae 100644
--- a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
+++ b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
@@ -1,13 +1,11 @@
-import Page from "@pages/settings/admin/organizations/index";
 import { _generateMetadata } from "app/_utils";
 
+import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
+
 export const generateMetadata = async () =>
   await _generateMetadata(
     (t) => t("organizations"),
     (t) => t("orgs_page_description")
   );
 
-export default function AppPage() {
-  // @ts-expect-error FIXME Property 'Component' is incompatible with index signature
-  return <Page />;
-}
+export default Page;
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
index dc07519796b779..ae354725f66ec7 100644
--- a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
+++ b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
@@ -1,10 +1,10 @@
-import Page from "@pages/settings/admin/users/[id]/edit";
 import { getServerCaller } from "app/_trpc/serverClient";
 import { type Params } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { cookies, headers } from "next/headers";
 import { z } from "zod";
 
+import Page from "@calcom/features/ee/users/pages/users-edit-view";
 import prisma from "@calcom/prisma";
 
 const userIdSchema = z.object({ id: z.coerce.number() });
@@ -33,7 +33,4 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
   );
 };
 
-export default function AppPage() {
-  // @ts-expect-error FIXME AppProps | undefined' does not satisfy the constraint 'PageProps'
-  return <Page />;
-}
+export default Page;
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
index f291a5e22dd94c..511ad02a7d0a18 100644
--- a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
+++ b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
@@ -1,13 +1,11 @@
-import Page from "@pages/settings/admin/users/add";
 import { _generateMetadata } from "app/_utils";
 
+import Page from "@calcom/features/ee/users/pages/users-add-view";
+
 export const generateMetadata = async () =>
   await _generateMetadata(
     () => "Add new user",
     () => "Here you can add a new user."
   );
 
-export default function AppPage() {
-  // @ts-expect-error FIXME AppProps | undefined' does not satisfy the constraint 'PageProps'
-  return <Page />;
-}
+export default Page;
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
index fb25352449eac2..0bd414f59918a5 100644
--- a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
+++ b/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
@@ -1,13 +1,11 @@
-import Page from "@pages/settings/admin/users/index";
 import { _generateMetadata } from "app/_utils";
 
+import Page from "@calcom/features/ee/users/pages/users-listing-view";
+
 export const generateMetadata = async () =>
   await _generateMetadata(
     () => "Users",
     () => "A list of all the users in your account including their name, title, email and role."
   );
 
-export default function AppPage() {
-  // @ts-expect-error FIXME Property 'Component' is incompatible with index signature
-  return <Page />;
-}
+export default Page;
diff --git a/apps/web/pages/settings/admin/organizations/index.tsx b/apps/web/pages/settings/admin/organizations/index.tsx
index 4937f158c25997..9c2d7cc1de421c 100644
--- a/apps/web/pages/settings/admin/organizations/index.tsx
+++ b/apps/web/pages/settings/admin/organizations/index.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import AdminOrgsPage from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
 
 import type { CalPageWrapper } from "@components/PageWrapper";
diff --git a/apps/web/pages/settings/admin/users/[id]/edit.tsx b/apps/web/pages/settings/admin/users/[id]/edit.tsx
index 3969862d836c7b..0ee1269ccaccfb 100644
--- a/apps/web/pages/settings/admin/users/[id]/edit.tsx
+++ b/apps/web/pages/settings/admin/users/[id]/edit.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view";
 
 import type { CalPageWrapper } from "@components/PageWrapper";
diff --git a/apps/web/pages/settings/admin/users/add.tsx b/apps/web/pages/settings/admin/users/add.tsx
index b4afda4e4b6d74..293a90214ec4ee 100644
--- a/apps/web/pages/settings/admin/users/add.tsx
+++ b/apps/web/pages/settings/admin/users/add.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
 
 import type { CalPageWrapper } from "@components/PageWrapper";
diff --git a/apps/web/pages/settings/admin/users/index.tsx b/apps/web/pages/settings/admin/users/index.tsx
index d822ee7dab5ed4..194c9666826b84 100644
--- a/apps/web/pages/settings/admin/users/index.tsx
+++ b/apps/web/pages/settings/admin/users/index.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
 
 import type { CalPageWrapper } from "@components/PageWrapper";
diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx b/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
index c111ba30407957..0042acd986e016 100644
--- a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import NoSSR from "@calcom/core/components/NoSSR";
 import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
 import { extractDomainFromWebsiteUrl } from "@calcom/ee/organizations/lib/utils";
diff --git a/packages/features/ee/users/pages/users-add-view.tsx b/packages/features/ee/users/pages/users-add-view.tsx
index 30ffc93ae0bd9e..44f3d8d1d0793f 100644
--- a/packages/features/ee/users/pages/users-add-view.tsx
+++ b/packages/features/ee/users/pages/users-add-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { usePathname, useRouter } from "next/navigation";
 
 import { getParserWithGeneric } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/ee/users/pages/users-edit-view.tsx b/packages/features/ee/users/pages/users-edit-view.tsx
index 2da6d2126ed0c7..c4d6169f537fca 100644
--- a/packages/features/ee/users/pages/users-edit-view.tsx
+++ b/packages/features/ee/users/pages/users-edit-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { usePathname, useRouter } from "next/navigation";
 import { z } from "zod";
 
diff --git a/packages/features/ee/users/pages/users-listing-view.tsx b/packages/features/ee/users/pages/users-listing-view.tsx
index 5ddbc9d8e9c862..915530b4bffa79 100644
--- a/packages/features/ee/users/pages/users-listing-view.tsx
+++ b/packages/features/ee/users/pages/users-listing-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import NoSSR from "@calcom/core/components/NoSSR";
 import { Button, Meta } from "@calcom/ui";