diff --git a/.env.example b/.env.example
index 14c3410bb9..120256f91c 100644
--- a/.env.example
+++ b/.env.example
@@ -334,7 +334,6 @@ AB_TEST_BUCKET_PROBABILITY=50
 # whether we redirect to the future/event-types from event-types or not
 APP_ROUTER_EVENT_TYPES_ENABLED=0
 APP_ROUTER_SETTINGS_DEVELOPER_ENABLED=0
-APP_ROUTER_SETTINGS_SECURITY_ENABLED=0
 APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
 APP_ROUTER_SETTINGS_PLATFORM_ENABLED=0
 APP_ROUTER_SETTINGS_ORG_ENABLED=0
diff --git a/apps/web/abTest/middlewareFactory.ts b/apps/web/abTest/middlewareFactory.ts
index 119c81d053..0c4940b8ba 100644
--- a/apps/web/abTest/middlewareFactory.ts
+++ b/apps/web/abTest/middlewareFactory.ts
@@ -8,7 +8,6 @@ import { FUTURE_ROUTES_ENABLED_COOKIE_NAME, FUTURE_ROUTES_OVERRIDE_COOKIE_NAME }
 const ROUTES: [URLPattern, boolean][] = [
   ["/event-types", process.env.APP_ROUTER_EVENT_TYPES_ENABLED === "1"] as const,
   ["/settings/developer/:path*", process.env.APP_ROUTER_SETTINGS_DEVELOPER_ENABLED === "1"] as const,
-  ["/settings/security/:path*", process.env.APP_ROUTER_SETTINGS_SECURITY_ENABLED === "1"] as const,
   ["/settings/admin/:path*", process.env.APP_ROUTER_SETTINGS_ADMIN_ENABLED === "1"] as const,
   ["/settings/platform/:path*", process.env.APP_ROUTER_SETTINGS_PLATFORM_ENABLED === "1"] as const,
   ["/settings/organizations/:path*", process.env.APP_ROUTER_SETTINGS_ORG_ENABLED === "1"] as const,
diff --git a/apps/web/app/settings/(settings-layout)/layout.tsx b/apps/web/app/settings/(settings-layout)/layout.tsx
new file mode 100644
index 0000000000..1e4a657288
--- /dev/null
+++ b/apps/web/app/settings/(settings-layout)/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir";
+
+export default WithLayout({ getServerLayout: getLayout })<"L">;
diff --git a/apps/web/app/future/settings/(settings)/security/impersonation/page.tsx b/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
similarity index 100%
rename from apps/web/app/future/settings/(settings)/security/impersonation/page.tsx
rename to apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
diff --git a/apps/web/app/future/settings/(settings)/security/password/page.tsx b/apps/web/app/settings/(settings-layout)/security/password/page.tsx
similarity index 100%
rename from apps/web/app/future/settings/(settings)/security/password/page.tsx
rename to apps/web/app/settings/(settings-layout)/security/password/page.tsx
diff --git a/apps/web/app/future/settings/(settings)/security/sso/page.tsx b/apps/web/app/settings/(settings-layout)/security/sso/page.tsx
similarity index 100%
rename from apps/web/app/future/settings/(settings)/security/sso/page.tsx
rename to apps/web/app/settings/(settings-layout)/security/sso/page.tsx
diff --git a/apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx b/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
similarity index 100%
rename from apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx
rename to apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
diff --git a/apps/web/pages/settings/security/impersonation.tsx b/apps/web/pages/settings/security/impersonation.tsx
deleted file mode 100644
index b8a365fdb1..0000000000
--- a/apps/web/pages/settings/security/impersonation.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-
-import ProfileImpersonationViewWrapper from "~/settings/security/impersonation-view";
-
-const Page = () => {
-  const { t } = useLocale();
-  return (
-    <>
-      <Meta
-        title={t("impersonation")}
-        description={t("impersonation_description")}
-        borderInShellHeader={true}
-      />
-      <ProfileImpersonationViewWrapper />
-    </>
-  );
-};
-
-Page.getLayout = getLayout;
-Page.PageWrapper = PageWrapper;
-
-export default Page;
diff --git a/apps/web/pages/settings/security/password.tsx b/apps/web/pages/settings/security/password.tsx
deleted file mode 100644
index ca051d7bae..0000000000
--- a/apps/web/pages/settings/security/password.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-
-import PasswordViewWrapper from "~/settings/security/password-view";
-
-const Page = () => {
-  const { t } = useLocale();
-
-  return (
-    <>
-      <Meta title={t("password")} description={t("password_description")} borderInShellHeader={true} />
-      <PasswordViewWrapper />
-    </>
-  );
-};
-
-Page.getLayout = getLayout;
-Page.PageWrapper = PageWrapper;
-
-export default Page;
diff --git a/apps/web/pages/settings/security/sso.tsx b/apps/web/pages/settings/security/sso.tsx
deleted file mode 100644
index 93cfa3bfda..0000000000
--- a/apps/web/pages/settings/security/sso.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import UserSSOView from "@calcom/features/ee/sso/page/user-sso-view";
-import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-
-const Page = () => {
-  const { t } = useLocale();
-
-  return (
-    <>
-      <Meta
-        title={t("sso_configuration")}
-        description={t("sso_configuration_description")}
-        borderInShellHeader={true}
-      />
-      <UserSSOView />
-    </>
-  );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/pages/settings/security/two-factor-auth.tsx b/apps/web/pages/settings/security/two-factor-auth.tsx
deleted file mode 100644
index d098f2b272..0000000000
--- a/apps/web/pages/settings/security/two-factor-auth.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-
-import TwoFactorAuthView from "~/settings/security/two-factor-auth-view";
-
-const Page = () => {
-  const { t } = useLocale();
-  return (
-    <>
-      <Meta title={t("2fa")} description={t("set_up_two_factor_authentication")} borderInShellHeader={true} />
-      <TwoFactorAuthView />
-    </>
-  );
-};
-
-Page.getLayout = getLayout;
-Page.PageWrapper = PageWrapper;
-
-export default Page;
diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh
index 75b7f282b5..841e2cc9c2 100755
--- a/apps/web/scripts/vercel-app-router-deploy.sh
+++ b/apps/web/scripts/vercel-app-router-deploy.sh
@@ -9,7 +9,6 @@ checkRoute () {
 checkRoute "$APP_ROUTER_EVENT_TYPES_ENABLED" app/future/event-types
 checkRoute "$APP_ROUTER_AVAILABILITY_ENABLED" app/future/availability
 checkRoute "$APP_ROUTER_SETTINGS_DEVELOPER_ENABLED" app/future/settings/developer
-checkRoute "$APP_ROUTER_SETTINGS_SECURITY_ENABLED" app/future/settings/security
 checkRoute "$APP_ROUTER_SETTINGS_ADMIN_ENABLED" app/future/settings/admin
 checkRoute "$APP_ROUTER_SETTINGS_PLATFORM_ENABLED" app/future/settings/platform
 checkRoute "$APP_ROUTER_SETTINGS_ORG_ENABLED" app/future/settings/organizations
diff --git a/turbo.json b/turbo.json
index b740e06c6b..c1a7ef3434 100644
--- a/turbo.json
+++ b/turbo.json
@@ -237,7 +237,6 @@
     "APP_ROUTER_EVENT_TYPES_ENABLED",
     "APP_ROUTER_GETTING_STARTED_STEP_ENABLED",
     "APP_ROUTER_SETTINGS_DEVELOPER_ENABLED",
-    "APP_ROUTER_SETTINGS_SECURITY_ENABLED",
     "APP_ROUTER_SETTINGS_ADMIN_ENABLED",
     "APP_ROUTER_SETTINGS_PLATFORM_ENABLED",
     "APP_ROUTER_SETTINGS_ORG_ENABLED",