diff --git a/frontend/src/components/auth/TeamInviteStep.tsx b/frontend/src/components/auth/TeamInviteStep.tsx
index 5a9f11bde..b0a5618d9 100644
--- a/frontend/src/components/auth/TeamInviteStep.tsx
+++ b/frontend/src/components/auth/TeamInviteStep.tsx
@@ -4,7 +4,6 @@ import { useNavigate } from "@tanstack/react-router";
 
 import { useAddUsersToOrg } from "@app/hooks/api";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 import { usePopUp } from "@app/hooks/usePopUp";
 
 import { Button, EmailServiceSetupModal } from "../v2";
@@ -23,7 +22,7 @@ export default function TeamInviteStep(): JSX.Element {
 
   // Redirect user to the getting started page
   const redirectToHome = async () => {
-    navigate({ to: `/organization/${ProjectType.SecretManager}/overview` as const });
+    navigate({ to: "/organization/projects" as const });
   };
 
   const inviteUsers = async ({ emails: inviteEmails }: { emails: string }) => {
diff --git a/frontend/src/components/navigation/NavHeader.tsx b/frontend/src/components/navigation/NavHeader.tsx
index 4386818dd..99f5fbdd2 100644
--- a/frontend/src/components/navigation/NavHeader.tsx
+++ b/frontend/src/components/navigation/NavHeader.tsx
@@ -71,7 +71,7 @@ export default function NavHeader({
         {currentOrg?.name?.charAt(0)}
       </div>
       <Link
-        to="/organization/secret-manager/overview"
+        to="/organization/projects"
         className="truncate pl-0.5 text-sm font-semibold text-primary/80 hover:text-primary"
       >
         {currentOrg?.name}
diff --git a/frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx b/frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
index bdf1c5c81..d4564ab6f 100644
--- a/frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
+++ b/frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
@@ -59,10 +59,7 @@ export const CreateOrgModal: FC<CreateOrgModalProps> = ({ isOpen, onClose }) =>
       });
 
       navigate({
-        to: `/organization/${ProjectType.SecretManager}/overview` as const,
-        params: {
-          organizationId: organization.id
-        }
+        to: "/organization/projects"
       });
 
       localStorage.setItem("orgData.id", organization.id);
diff --git a/frontend/src/components/projects/NewProjectModal.tsx b/frontend/src/components/projects/NewProjectModal.tsx
index c98118a96..b47a251c3 100644
--- a/frontend/src/components/projects/NewProjectModal.tsx
+++ b/frontend/src/components/projects/NewProjectModal.tsx
@@ -35,7 +35,6 @@ import { getProjectHomePage } from "@app/helpers/project";
 import { useCreateWorkspace, useGetExternalKmsList, useGetUserWorkspaces } from "@app/hooks/api";
 import { INTERNAL_KMS_KEY_ID } from "@app/hooks/api/kms/types";
 import { InfisicalProjectTemplate, useListProjectTemplates } from "@app/hooks/api/projectTemplates";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 const formSchema = z.object({
   name: z.string().trim().min(1, "Required").max(64, "Too long, maximum length is 64 characters"),
@@ -53,12 +52,11 @@ type TAddProjectFormData = z.infer<typeof formSchema>;
 interface NewProjectModalProps {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
-  projectType: ProjectType;
 }
 
-type NewProjectFormProps = Pick<NewProjectModalProps, "onOpenChange" | "projectType">;
+type NewProjectFormProps = Pick<NewProjectModalProps, "onOpenChange">;
 
-const NewProjectForm = ({ onOpenChange, projectType }: NewProjectFormProps) => {
+const NewProjectForm = ({ onOpenChange }: NewProjectFormProps) => {
   const navigate = useNavigate();
   const { currentOrg } = useOrganization();
   const { permission } = useOrgPermission();
@@ -72,7 +70,7 @@ const NewProjectForm = ({ onOpenChange, projectType }: NewProjectFormProps) => {
     OrgPermissionSubjects.ProjectTemplates
   );
 
-  const { data: projectTemplates = [] } = useListProjectTemplates(projectType, {
+  const { data: projectTemplates = [] } = useListProjectTemplates({
     enabled: Boolean(canReadProjectTemplates && subscription?.projectTemplates)
   });
 
@@ -115,8 +113,7 @@ const NewProjectForm = ({ onOpenChange, projectType }: NewProjectFormProps) => {
         projectName: name,
         projectDescription: description,
         kmsKeyId: kmsKeyId !== INTERNAL_KMS_KEY_ID ? kmsKeyId : undefined,
-        template,
-        type: projectType
+        template
       });
       await refetchWorkspaces();
 
@@ -270,18 +267,14 @@ const NewProjectForm = ({ onOpenChange, projectType }: NewProjectFormProps) => {
   );
 };
 
-export const NewProjectModal: FC<NewProjectModalProps> = ({
-  isOpen,
-  onOpenChange,
-  projectType
-}) => {
+export const NewProjectModal: FC<NewProjectModalProps> = ({ isOpen, onOpenChange }) => {
   return (
     <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
       <ModalContent
         title="Create a new project"
         subTitle="This project will contain your secrets and configurations."
       >
-        <NewProjectForm onOpenChange={onOpenChange} projectType={projectType} />
+        <NewProjectForm onOpenChange={onOpenChange} />
       </ModalContent>
     </Modal>
   );
diff --git a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
index 0465973e2..70412df5a 100644
--- a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
+++ b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
@@ -38,8 +38,8 @@ export const ProjectTemplatesTable = ({ onEdit }: Props) => {
 
   const projectType = useGetProjectTypeFromRoute();
 
-  const { isPending, data: projectTemplates = [] } = useListProjectTemplates(projectType, {
-    enabled: subscription?.projectTemplates && Boolean(projectType)
+  const { isPending, data: projectTemplates = [] } = useListProjectTemplates({
+    enabled: subscription?.projectTemplates
   });
 
   const [search, setSearch] = useState("");
diff --git a/frontend/src/components/v2/Breadcrumb/Breadcrumb.tsx b/frontend/src/components/v2/Breadcrumb/Breadcrumb.tsx
index a956991fb..20684ee61 100644
--- a/frontend/src/components/v2/Breadcrumb/Breadcrumb.tsx
+++ b/frontend/src/components/v2/Breadcrumb/Breadcrumb.tsx
@@ -1,11 +1,6 @@
 /* eslint-disable react/prop-types */
 import React from "react";
-import {
-  faCaretDown,
-  faChevronRight,
-  faEllipsis,
-  faSlash
-} from "@fortawesome/free-solid-svg-icons";
+import { faCaretDown, faEllipsis, faSlash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link, ReactNode } from "@tanstack/react-router";
 import { LinkComponentProps } from "node_modules/@tanstack/react-router/dist/esm/link";
diff --git a/frontend/src/helpers/project.ts b/frontend/src/helpers/project.ts
index 10085fd86..f60141bf9 100644
--- a/frontend/src/helpers/project.ts
+++ b/frontend/src/helpers/project.ts
@@ -42,8 +42,7 @@ export const initProjectHelper = async ({ projectName }: { projectName: string }
   const {
     data: { project }
   } = await createWorkspace({
-    projectName,
-    type: ProjectType.SecretManager
+    projectName
   });
 
   try {
diff --git a/frontend/src/hooks/api/projectTemplates/queries.tsx b/frontend/src/hooks/api/projectTemplates/queries.tsx
index 89bc96715..f5863915a 100644
--- a/frontend/src/hooks/api/projectTemplates/queries.tsx
+++ b/frontend/src/hooks/api/projectTemplates/queries.tsx
@@ -6,17 +6,14 @@ import {
   TProjectTemplate,
   TProjectTemplateResponse
 } from "@app/hooks/api/projectTemplates/types";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 export const projectTemplateKeys = {
   all: ["project-template"] as const,
-  list: (projectType?: ProjectType) =>
-    [...projectTemplateKeys.all, "list", ...(projectType ? [projectType] : [])] as const,
+  list: () => [...projectTemplateKeys.all, "list"] as const,
   byId: (templateId: string) => [...projectTemplateKeys.all, templateId] as const
 };
 
 export const useListProjectTemplates = (
-  type?: ProjectType,
   options?: Omit<
     UseQueryOptions<
       TProjectTemplate[],
@@ -28,11 +25,9 @@ export const useListProjectTemplates = (
   >
 ) => {
   return useQuery({
-    queryKey: projectTemplateKeys.list(type),
+    queryKey: projectTemplateKeys.list(),
     queryFn: async () => {
-      const { data } = await apiRequest.get<TListProjectTemplates>("/api/v1/project-templates", {
-        params: { type }
-      });
+      const { data } = await apiRequest.get<TListProjectTemplates>("/api/v1/project-templates");
 
       return data.projectTemplates;
     },
diff --git a/frontend/src/hooks/api/workspace/queries.tsx b/frontend/src/hooks/api/workspace/queries.tsx
index fa9240101..ff2a170af 100644
--- a/frontend/src/hooks/api/workspace/queries.tsx
+++ b/frontend/src/hooks/api/workspace/queries.tsx
@@ -154,16 +154,14 @@ export const useGetWorkspaceById = (
 
 export const useGetUserWorkspaces = ({
   includeRoles,
-  type = "all",
   options = {}
 }: {
   includeRoles?: boolean;
-  type?: ProjectType | "all";
   options?: { enabled?: boolean };
 } = {}) =>
   useQuery({
-    queryKey: workspaceKeys.getAllUserWorkspace(type),
-    queryFn: () => fetchUserWorkspaces(includeRoles, type),
+    queryKey: workspaceKeys.getAllUserWorkspace(),
+    queryFn: () => fetchUserWorkspaces(includeRoles),
     ...options
   });
 
@@ -257,17 +255,16 @@ export const useCreateWorkspace = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{ data: { project: Workspace } }, object, CreateWorkspaceDTO>({
-    mutationFn: async ({ projectName, projectDescription, kmsKeyId, template, type }) =>
+    mutationFn: async ({ projectName, projectDescription, kmsKeyId, template }) =>
       createWorkspace({
         projectName,
         projectDescription,
         kmsKeyId,
-        template,
-        type
+        template
       }),
-    onSuccess: (dto) => {
+    onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(dto.data.project.type)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
@@ -351,8 +348,8 @@ export const useUpdateWorkspaceVersionLimit = () => {
       });
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
     }
   });
 };
@@ -370,8 +367,8 @@ export const useUpdateWorkspaceAuditLogsRetention = () => {
       );
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
     }
   });
 };
@@ -384,8 +381,8 @@ export const useDeleteWorkspace = () => {
       const { data } = await apiRequest.delete(`/api/v1/workspace/${workspaceID}`);
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
       queryClient.invalidateQueries({
         queryKey: ["org-admin-projects"]
       });
diff --git a/frontend/src/hooks/api/workspace/query-keys.tsx b/frontend/src/hooks/api/workspace/query-keys.tsx
index 15317d2fd..aca6f48b7 100644
--- a/frontend/src/hooks/api/workspace/query-keys.tsx
+++ b/frontend/src/hooks/api/workspace/query-keys.tsx
@@ -12,8 +12,7 @@ export const workspaceKeys = {
   getWorkspaceMemberships: (orgId: string) => [{ orgId }, "workspace-memberships"],
   getWorkspaceAuthorization: (workspaceId: string) => [{ workspaceId }, "workspace-authorizations"],
   getWorkspaceIntegrations: (workspaceId: string) => [{ workspaceId }, "workspace-integrations"],
-  getAllUserWorkspace: (type?: string) =>
-    type ? ["workspaces", { type }] : (["workspaces"] as const),
+  getAllUserWorkspace: () => ["workspaces"] as const,
   getWorkspaceAuditLogs: (workspaceId: string) =>
     [{ workspaceId }, "workspace-audit-logs"] as const,
   getWorkspaceUsers: (
diff --git a/frontend/src/hooks/api/workspace/types.ts b/frontend/src/hooks/api/workspace/types.ts
index fbaea7742..79110cc44 100644
--- a/frontend/src/hooks/api/workspace/types.ts
+++ b/frontend/src/hooks/api/workspace/types.ts
@@ -71,7 +71,6 @@ export type CreateWorkspaceDTO = {
   projectDescription?: string;
   kmsKeyId?: string;
   template?: string;
-  type: ProjectType;
 };
 
 export type UpdateProjectDTO = {
@@ -181,7 +180,6 @@ export enum ProjectIdentityOrderBy {
   Name = "name"
 }
 export type TSearchProjectsDTO = {
-  type?: ProjectType;
   name?: string;
   limit?: number;
   offset?: number;
diff --git a/frontend/src/layouts/AdminLayout/Sidebar.tsx b/frontend/src/layouts/AdminLayout/Sidebar.tsx
index 09303731b..60240f72f 100644
--- a/frontend/src/layouts/AdminLayout/Sidebar.tsx
+++ b/frontend/src/layouts/AdminLayout/Sidebar.tsx
@@ -12,7 +12,6 @@ import {
   MenuItem
 } from "@app/components/v2";
 import { envConfig } from "@app/config/env";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/NavBar/Navbar";
 
@@ -74,7 +73,7 @@ export const AdminSidebar = () => {
     <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
       <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
         <div className="flex-grow">
-          <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
+          <Link to="/organization/projects">
             <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
               <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
               Back to organization
diff --git a/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx b/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx
index cfeb6e637..69028e67d 100644
--- a/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx
+++ b/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx
@@ -2,7 +2,6 @@ import { useTranslation } from "react-i18next";
 import { faMobile } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Outlet } from "@tanstack/react-router";
-import { twMerge } from "tailwind-merge";
 
 import { CreateOrgModal } from "@app/components/organization/CreateOrgModal";
 import { Banner } from "@app/components/page-frames/Banner";
diff --git a/frontend/src/layouts/OrganizationLayout/ProductsSideBar/ProjectOverviewSideBar.tsx b/frontend/src/layouts/OrganizationLayout/ProductsSideBar/ProjectOverviewSideBar.tsx
index 7162fc870..48678625d 100644
--- a/frontend/src/layouts/OrganizationLayout/ProductsSideBar/ProjectOverviewSideBar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/ProductsSideBar/ProjectOverviewSideBar.tsx
@@ -13,7 +13,7 @@ export const ProjectOverviewSideBar = ({ type }: TProjectOverviewSideBarProps) =
   const matchRoute = useMatchRoute();
 
   const isOverviewActive = !!matchRoute({
-    to: `/organization/${type}/overview`,
+    to: "/organization/projects",
     fuzzy: false
   });
 
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
index ce57a440a..07ea848a0 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
@@ -140,7 +140,7 @@ export const Navbar = () => {
   return (
     <div className="z-10 flex h-12 items-center gap-1 border-b border-mineshaft-600 bg-mineshaft-800 px-4 py-2">
       <div>
-        <Link to="/organization/secret-manager/overview">
+        <Link to="/organization/projects">
           <img alt="infisical logo" src="/images/logotransparent.png" className="h-4" />
         </Link>
       </div>
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
index b01f3c431..d0e256b47 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/OrgSidebar.tsx
@@ -38,7 +38,7 @@ export const OrgSidebar = () => {
         <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
           <Menu>
             <MenuGroup title="Overview">
-              <Link to="/organization/secret-manager/overview">
+              <Link to="/organization/projects">
                 {({ isActive }) => (
                   <MenuItem isSelected={isActive} icon="notification-bell">
                     Projects
diff --git a/frontend/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx b/frontend/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
index 5ae5edd37..c2835996a 100644
--- a/frontend/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
+++ b/frontend/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
@@ -11,10 +11,9 @@ import {
   DropdownMenuTrigger
 } from "@app/components/v2";
 import { envConfig } from "@app/config/env";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { InsecureConnectionBanner } from "../OrganizationLayout/components/InsecureConnectionBanner";
-import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar";
+import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/NavBar/Navbar";
 
 export const PersonalSettingsLayout = () => {
   const { t } = useTranslation();
@@ -27,7 +26,7 @@ export const PersonalSettingsLayout = () => {
           <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
             <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
               <div className="flex-grow">
-                <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
+                <Link to="/organization/projects">
                   <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
                     <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
                     Back to organization
diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
index 10d6889a5..800722f14 100644
--- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
+++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
@@ -22,7 +22,7 @@ import { usePopUp } from "@app/hooks";
 import { useGetUserWorkspaces } from "@app/hooks/api";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+import { Workspace } from "@app/hooks/api/workspace/types";
 
 type TWorkspaceWithFaveProp = Workspace & { isFavorite: boolean };
 
@@ -126,7 +126,7 @@ const ProjectOption = ({
 export const ProjectSelect = () => {
   const { currentWorkspace } = useWorkspace();
   const { currentOrg } = useOrganization();
-  const { data: workspaces = [] } = useGetUserWorkspaces({ type: currentWorkspace.type });
+  const { data: workspaces = [] } = useGetUserWorkspaces();
   const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg.id!);
 
   const { subscription } = useSubscription();
@@ -211,7 +211,6 @@ export const ProjectSelect = () => {
       <NewProjectModal
         isOpen={popUp.addNewWs.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("addNewWs", isOpen)}
-        projectType={currentWorkspace?.type || ProjectType.SecretManager}
       />
     </div>
   );
diff --git a/frontend/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx b/frontend/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
index d3c96ab66..dc74fdad5 100644
--- a/frontend/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
+++ b/frontend/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
@@ -14,7 +14,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger
 } from "@app/components/v2";
-import { useOrganization, useUser, useWorkspace } from "@app/context";
+import { useOrganization, useUser } from "@app/context";
 import { useGetOrganizations, useLogoutUser } from "@app/hooks/api";
 import { AuthMethod } from "@app/hooks/api/users/types";
 
@@ -24,7 +24,6 @@ type Prop = {
 
 export const SidebarHeader = ({ onChangeOrg }: Prop) => {
   const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
   const { user } = useUser();
   const navigate = useNavigate();
   const { data: orgs } = useGetOrganizations();
@@ -42,7 +41,7 @@ export const SidebarHeader = ({ onChangeOrg }: Prop) => {
 
   return (
     <div className="flex h-12 cursor-default items-center px-3 pt-6">
-      <Link to={`/organization/${currentWorkspace.type}/overview` as const}>
+      <Link to="/organization/projects">
         <div className="pl-1 pr-2 text-mineshaft-400 duration-200 hover:text-mineshaft-100">
           <FontAwesomeIcon icon={faArrowLeft} />
         </div>
diff --git a/frontend/src/pages/admin/layout.tsx b/frontend/src/pages/admin/layout.tsx
index f94484746..36ff5cf5e 100644
--- a/frontend/src/pages/admin/layout.tsx
+++ b/frontend/src/pages/admin/layout.tsx
@@ -7,7 +7,7 @@ export const Route = createFileRoute("/_authenticate/_inject-org-details/admin/_
   beforeLoad: ({ context }) => {
     if (!context.user.superAdmin) {
       throw redirect({
-        to: "/organization/secret-manager/overview"
+        to: "/organization/projects"
       });
     }
   }
diff --git a/frontend/src/pages/auth/LoginPage/Login.utils.tsx b/frontend/src/pages/auth/LoginPage/Login.utils.tsx
index 87164fc5d..9b20425c3 100644
--- a/frontend/src/pages/auth/LoginPage/Login.utils.tsx
+++ b/frontend/src/pages/auth/LoginPage/Login.utils.tsx
@@ -4,7 +4,6 @@ import { useServerConfig } from "@app/context";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { queryClient } from "@app/hooks/api/reactQuery";
 import { userKeys } from "@app/hooks/api/users";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: string) => {
   const userOrgs = await fetchOrganizations();
@@ -13,7 +12,7 @@ export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: s
 
   if (organizationId) {
     localStorage.setItem("orgData.id", organizationId);
-    navigate({ to: "/organization/secret-manager/overview" });
+    navigate({ to: "/organization/projects" });
     return;
   }
 
@@ -21,7 +20,7 @@ export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: s
     // user is part of at least 1 non-auth enforced org
     const userOrg = nonAuthEnforcedOrgs[0] && nonAuthEnforcedOrgs[0].id;
     localStorage.setItem("orgData.id", userOrg);
-    navigate({ to: `/organization/${ProjectType.SecretManager}/overview` as const });
+    navigate({ to: "/organization/projects" });
   } else {
     // user is not part of any non-auth enforced orgs
     localStorage.removeItem("orgData.id");
diff --git a/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx b/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
index fe27e5d7d..8471fc203 100644
--- a/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
+++ b/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
@@ -28,7 +28,6 @@ import {
 import { MfaMethod } from "@app/hooks/api/auth/types";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { isLoggedIn } from "@app/hooks/api/reactQuery";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 // eslint-disable-next-line new-cap
 const client = new jsrp.client();
@@ -204,7 +203,7 @@ export const SignupInvitePage = () => {
                 localStorage.setItem("orgData.id", orgId);
 
                 navigate({
-                  to: `/organization/${ProjectType.SecretManager}/overview` as const
+                  to: "/organization/projects"
                 });
               };
 
diff --git a/frontend/src/pages/auth/SignUpSsoPage/components/UserInfoSSOStep/UserInfoSSOStep.tsx b/frontend/src/pages/auth/SignUpSsoPage/components/UserInfoSSOStep/UserInfoSSOStep.tsx
index 2f2ade8e7..7e7c15c6d 100644
--- a/frontend/src/pages/auth/SignUpSsoPage/components/UserInfoSSOStep/UserInfoSSOStep.tsx
+++ b/frontend/src/pages/auth/SignUpSsoPage/components/UserInfoSSOStep/UserInfoSSOStep.tsx
@@ -18,7 +18,6 @@ import { useToggle } from "@app/hooks";
 import { completeAccountSignup, useSelectOrganization } from "@app/hooks/api/auth/queries";
 import { MfaMethod } from "@app/hooks/api/auth/types";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 // eslint-disable-next-line new-cap
 const client = new jsrp.client();
@@ -207,7 +206,7 @@ export const UserInfoSSOStep = ({
 
                   localStorage.setItem("orgData.id", orgId);
                   navigate({
-                    to: `/organization/${ProjectType.SecretManager}/overview` as const
+                    to: "/organization/projects"
                   });
                 } catch (error) {
                   setIsLoading(false);
diff --git a/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
index 5a7549b3c..21ed0dec8 100644
--- a/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -64,7 +64,7 @@ export const DeleteProjectSection = () => {
       });
 
       navigate({
-        to: `/organization/${ProjectType.SecretManager}/overview` as const
+        to: "/organization/projects"
       });
       handlePopUpClose("deleteWorkspace");
     } catch (err) {
diff --git a/frontend/src/pages/middlewares/restrict-login-signup.tsx b/frontend/src/pages/middlewares/restrict-login-signup.tsx
index 73964868a..68d3f0892 100644
--- a/frontend/src/pages/middlewares/restrict-login-signup.tsx
+++ b/frontend/src/pages/middlewares/restrict-login-signup.tsx
@@ -112,7 +112,7 @@ export const Route = createFileRoute("/_restrict-login-signup")({
       throw redirect({ to: "/login/select-organization" });
     }
     throw redirect({
-      to: `/organization/${ProjectType.SecretManager}/overview` as const
+      to: "/organization/projects"
     });
   },
   component: AuthConsentWrapper
diff --git a/frontend/src/pages/organization/BillingPage/BillingPage.tsx b/frontend/src/pages/organization/BillingPage/BillingPage.tsx
index d0b71cc21..a58a7f14d 100644
--- a/frontend/src/pages/organization/BillingPage/BillingPage.tsx
+++ b/frontend/src/pages/organization/BillingPage/BillingPage.tsx
@@ -5,6 +5,7 @@ import { OrgPermissionCan } from "@app/components/permissions";
 import { OrgPermissionBillingActions, OrgPermissionSubjects } from "@app/context";
 
 import { BillingTabGroup } from "./components";
+import { PageHeader } from "@app/components/v2";
 
 export const BillingPage = () => {
   const { t } = useTranslation();
@@ -18,10 +19,11 @@ export const BillingPage = () => {
       </Helmet>
       <div className="flex h-full w-full justify-center bg-bunker-800 text-white">
         <div className="w-full max-w-7xl px-6">
-          <div className="my-6">
-            <p className="text-3xl font-semibold text-gray-200">{t("billing.title")}</p>
-            <div />
-          </div>
+          <PageHeader
+            title={t("billing.title")}
+            description="View your billing plan, next billing cycle."
+          />
+
           <OrgPermissionCan
             passThrough={false}
             I={OrgPermissionBillingActions.Read}
diff --git a/frontend/src/pages/organization/BillingPage/route.tsx b/frontend/src/pages/organization/BillingPage/route.tsx
index d76f26195..f95a9a467 100644
--- a/frontend/src/pages/organization/BillingPage/route.tsx
+++ b/frontend/src/pages/organization/BillingPage/route.tsx
@@ -5,5 +5,14 @@ import { BillingPage } from "./BillingPage";
 export const Route = createFileRoute(
   "/_authenticate/_inject-org-details/_org-layout/organization/billing"
 )({
-  component: BillingPage
+  component: BillingPage,
+  beforeLoad: () => {
+    return {
+      breadcrumbs: [
+        {
+          label: "Billing"
+        }
+      ]
+    };
+  }
 });
diff --git a/frontend/src/pages/organization/CertManagerOverviewPage/CertManagerOverviewPage.tsx b/frontend/src/pages/organization/CertManagerOverviewPage/CertManagerOverviewPage.tsx
deleted file mode 100644
index 73626c3ef..000000000
--- a/frontend/src/pages/organization/CertManagerOverviewPage/CertManagerOverviewPage.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ProjectType } from "@app/hooks/api/workspace/types";
-
-import { ProductOverviewPage } from "../SecretManagerOverviewPage/SecretManagerOverviewPage";
-
-export const CertManagerOverviewPage = () => (
-  <ProductOverviewPage type={ProjectType.CertificateManager} />
-);
diff --git a/frontend/src/pages/organization/CertManagerOverviewPage/route.tsx b/frontend/src/pages/organization/CertManagerOverviewPage/route.tsx
deleted file mode 100644
index 1e3673189..000000000
--- a/frontend/src/pages/organization/CertManagerOverviewPage/route.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { createFileRoute, linkOptions } from "@tanstack/react-router";
-
-import { CertManagerOverviewPage } from "./CertManagerOverviewPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview"
-)({
-  component: CertManagerOverviewPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "Cert Management",
-        link: linkOptions({ to: "/organization/cert-manager/overview" })
-      }
-    ]
-  })
-});
diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
index e6d503e84..a0565d50d 100644
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
@@ -44,7 +44,7 @@ type Props = {
 
 const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
   const { currentOrg } = useOrganization();
-  const { data: workspaces = [] } = useGetUserWorkspaces({ type: "all" });
+  const { data: workspaces = [] } = useGetUserWorkspaces();
   const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace();
 
   const {
diff --git a/frontend/src/pages/organization/KmsOverviewPage/KmsOverviewPage.tsx b/frontend/src/pages/organization/KmsOverviewPage/KmsOverviewPage.tsx
deleted file mode 100644
index f336acc4a..000000000
--- a/frontend/src/pages/organization/KmsOverviewPage/KmsOverviewPage.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ProjectType } from "@app/hooks/api/workspace/types";
-
-import { ProductOverviewPage } from "../SecretManagerOverviewPage/SecretManagerOverviewPage";
-
-export const KmsOverviewPage = () => <ProductOverviewPage type={ProjectType.KMS} />;
diff --git a/frontend/src/pages/organization/KmsOverviewPage/route.tsx b/frontend/src/pages/organization/KmsOverviewPage/route.tsx
deleted file mode 100644
index 08f7ddf4a..000000000
--- a/frontend/src/pages/organization/KmsOverviewPage/route.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { createFileRoute, linkOptions } from "@tanstack/react-router";
-
-import { KmsOverviewPage } from "./KmsOverviewPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/kms/overview"
-)({
-  component: KmsOverviewPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "KMS",
-        link: linkOptions({ to: "/organization/kms/overview" })
-      }
-    ]
-  })
-});
diff --git a/frontend/src/pages/organization/SecretManagerOverviewPage/SecretManagerOverviewPage.tsx b/frontend/src/pages/organization/ProjectsPage/ProjectsPage.tsx
similarity index 76%
rename from frontend/src/pages/organization/SecretManagerOverviewPage/SecretManagerOverviewPage.tsx
rename to frontend/src/pages/organization/ProjectsPage/ProjectsPage.tsx
index a479e76a6..48f6e02f0 100644
--- a/frontend/src/pages/organization/SecretManagerOverviewPage/SecretManagerOverviewPage.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/ProjectsPage.tsx
@@ -10,31 +10,25 @@ import { NewProjectModal } from "@app/components/projects";
 import { PageHeader } from "@app/components/v2";
 import { useSubscription } from "@app/context";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 import { usePopUp } from "@app/hooks/usePopUp";
 
 import { AllProjectView } from "./components/AllProjectView";
 import { MyProjectView } from "./components/MyProjectView";
 import { ProjectListToggle, ProjectListView } from "./components/ProjectListToggle";
 
-const formatDescription = (type: ProjectType) => {
-  if (type === ProjectType.SecretManager)
-    return "Securely store, manage, and rotate various application secrets, such as database credentials, API keys, etc.";
-  if (type === ProjectType.CertificateManager)
-    return "Manage your PKI infrastructure and issue digital certificates for services, applications, and devices.";
-  if (type === ProjectType.KMS)
-    return "Centralize the management of keys for cryptographic operations, such as encryption and decryption.";
-  if (type === ProjectType.SecretScanning)
-    return "Connect and monitor data sources to prevent secret leaks.";
-  return "Infisical SSH lets you issue SSH credentials to users for short-lived, secure SSH access to infrastructure.";
-};
+// const formatDescription = (type: ProjectType) => {
+//   if (type === ProjectType.SecretManager)
+//     return "Securely store, manage, and rotate various application secrets, such as database credentials, API keys, etc.";
+//   if (type === ProjectType.CertificateManager)
+//     return "Manage your PKI infrastructure and issue digital certificates for services, applications, and devices.";
+//   if (type === ProjectType.KMS)
+//     return "Centralize the management of keys for cryptographic operations, such as encryption and decryption.";
+//   if (type === ProjectType.SecretScanning)
+//     return "Connect and monitor data sources to prevent secret leaks.";
+//   return "Infisical SSH lets you issue SSH credentials to users for short-lived, secure SSH access to infrastructure.";
+// };
 
-type Props = {
-  type: ProjectType;
-};
-
-// #TODO: Update all the workspaceIds
-export const ProductOverviewPage = ({ type }: Props) => {
+export const ProjectsPage = () => {
   const { t } = useTranslation();
 
   const [projectListView, setProjectListView] = useState(ProjectListView.MyProjects);
@@ -87,19 +81,17 @@ export const ProductOverviewPage = ({ type }: Props) => {
               <ProjectListToggle value={projectListView} onChange={setProjectListView} />
             </div>
           }
-          description={formatDescription(type)}
+          description="Your team's complete security toolkit - organized and ready when you need them."
         />
       </div>
       {projectListView === ProjectListView.MyProjects ? (
         <MyProjectView
-          type={type}
           onAddNewProject={() => handlePopUpOpen("addNewWs")}
           onUpgradePlan={() => handlePopUpOpen("upgradePlan")}
           isAddingProjectsAllowed={isAddingProjectsAllowed}
         />
       ) : (
         <AllProjectView
-          type={type}
           onAddNewProject={() => handlePopUpOpen("addNewWs")}
           onUpgradePlan={() => handlePopUpOpen("upgradePlan")}
           isAddingProjectsAllowed={isAddingProjectsAllowed}
@@ -108,7 +100,6 @@ export const ProductOverviewPage = ({ type }: Props) => {
       <NewProjectModal
         isOpen={popUp.addNewWs.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("addNewWs", isOpen)}
-        projectType={type}
       />
       <UpgradePlanModal
         isOpen={popUp.upgradePlan.isOpen}
@@ -118,7 +109,3 @@ export const ProductOverviewPage = ({ type }: Props) => {
     </div>
   );
 };
-
-export const SecretManagerOverviewPage = () => (
-  <ProductOverviewPage type={ProjectType.SecretManager} />
-);
diff --git a/frontend/src/pages/organization/SecretManagerOverviewPage/components/AllProjectView.tsx b/frontend/src/pages/organization/ProjectsPage/components/AllProjectView.tsx
similarity index 98%
rename from frontend/src/pages/organization/SecretManagerOverviewPage/components/AllProjectView.tsx
rename to frontend/src/pages/organization/ProjectsPage/components/AllProjectView.tsx
index 6be1a4554..daea79374 100644
--- a/frontend/src/pages/organization/SecretManagerOverviewPage/components/AllProjectView.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/components/AllProjectView.tsx
@@ -35,10 +35,9 @@ import {
 } from "@app/helpers/userTablePreferences";
 import { useDebounce, usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
 import { useRequestProjectAccess, useSearchProjects } from "@app/hooks/api";
-import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+import { Workspace } from "@app/hooks/api/workspace/types";
 
 type Props = {
-  type: ProjectType;
   onAddNewProject: () => void;
   onUpgradePlan: () => void;
   isAddingProjectsAllowed: boolean;
@@ -92,7 +91,6 @@ const RequestAccessModal = ({ projectId, onPopUpToggle }: RequestAccessModalProp
 };
 
 export const AllProjectView = ({
-  type,
   onAddNewProject,
   onUpgradePlan,
   isAddingProjectsAllowed
@@ -125,7 +123,6 @@ export const AllProjectView = ({
   const { data: searchedProjects, isPending: isProjectLoading } = useSearchProjects({
     limit,
     offset,
-    type,
     name: debouncedSearch || undefined,
     orderDirection
   });
diff --git a/frontend/src/pages/organization/SecretManagerOverviewPage/components/MyProjectView.tsx b/frontend/src/pages/organization/ProjectsPage/components/MyProjectView.tsx
similarity index 96%
rename from frontend/src/pages/organization/SecretManagerOverviewPage/components/MyProjectView.tsx
rename to frontend/src/pages/organization/ProjectsPage/components/MyProjectView.tsx
index a04b4e196..a6eb3f1e9 100644
--- a/frontend/src/pages/organization/SecretManagerOverviewPage/components/MyProjectView.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/components/MyProjectView.tsx
@@ -29,10 +29,9 @@ import { useGetUserWorkspaces } from "@app/hooks/api";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+import { Workspace } from "@app/hooks/api/workspace/types";
 
 type Props = {
-  type: ProjectType;
   onAddNewProject: () => void;
   onUpgradePlan: () => void;
   isAddingProjectsAllowed: boolean;
@@ -48,7 +47,6 @@ enum ProjectsViewMode {
 }
 
 export const MyProjectView = ({
-  type,
   onAddNewProject,
   onUpgradePlan,
   isAddingProjectsAllowed
@@ -56,9 +54,7 @@ export const MyProjectView = ({
   const navigate = useNavigate();
   const { currentOrg } = useOrganization();
 
-  const { data: workspaces = [], isPending: isWorkspaceLoading } = useGetUserWorkspaces({
-    type
-  });
+  const { data: workspaces = [], isPending: isWorkspaceLoading } = useGetUserWorkspaces();
   const {
     setPage,
     perPage,
@@ -202,11 +198,6 @@ export const MyProjectView = ({
       </div>
 
       <div className="flex w-full flex-row items-end justify-between place-self-end">
-        {type === ProjectType.SecretManager && (
-          <div className="mt-0 text-xs text-mineshaft-400">
-            {workspace.environments?.length || 0} environments
-          </div>
-        )}
         <button type="button">
           <div className="group ml-auto w-max cursor-pointer rounded-full border border-mineshaft-600 bg-mineshaft-900 px-4 py-2 text-sm text-mineshaft-300 transition-all hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200">
             Explore{" "}
@@ -239,11 +230,6 @@ export const MyProjectView = ({
         <div className="truncate text-sm text-mineshaft-100">{workspace.name}</div>
       </div>
       <div className="flex items-center justify-end sm:col-span-3 lg:col-span-2">
-        {type === ProjectType.SecretManager && (
-          <div className="text-center text-sm text-mineshaft-300">
-            {workspace.environments?.length || 0} environments
-          </div>
-        )}
         {isFavorite ? (
           <FontAwesomeIcon
             icon={faSolidStar}
diff --git a/frontend/src/pages/organization/SecretManagerOverviewPage/components/ProjectListToggle.tsx b/frontend/src/pages/organization/ProjectsPage/components/ProjectListToggle.tsx
similarity index 100%
rename from frontend/src/pages/organization/SecretManagerOverviewPage/components/ProjectListToggle.tsx
rename to frontend/src/pages/organization/ProjectsPage/components/ProjectListToggle.tsx
diff --git a/frontend/src/pages/organization/ProjectsPage/route.tsx b/frontend/src/pages/organization/ProjectsPage/route.tsx
new file mode 100644
index 000000000..b500d4e1d
--- /dev/null
+++ b/frontend/src/pages/organization/ProjectsPage/route.tsx
@@ -0,0 +1,16 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { ProjectsPage } from "./ProjectsPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/organization/projects"
+)({
+  component: ProjectsPage,
+  context: () => ({
+    breadcrumbs: [
+      {
+        label: "Projects"
+      }
+    ]
+  })
+});
diff --git a/frontend/src/pages/organization/SecretManagerOverviewPage/route.tsx b/frontend/src/pages/organization/SecretManagerOverviewPage/route.tsx
deleted file mode 100644
index daf048881..000000000
--- a/frontend/src/pages/organization/SecretManagerOverviewPage/route.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-
-import { SecretManagerOverviewPage } from "./SecretManagerOverviewPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview"
-)({
-  component: SecretManagerOverviewPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "Secret Management"
-      }
-    ]
-  })
-});
diff --git a/frontend/src/pages/organization/SecretScanningOverviewPage/SecretScanningOverviewPage.tsx b/frontend/src/pages/organization/SecretScanningOverviewPage/SecretScanningOverviewPage.tsx
deleted file mode 100644
index 7512ff8a4..000000000
--- a/frontend/src/pages/organization/SecretScanningOverviewPage/SecretScanningOverviewPage.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ProjectType } from "@app/hooks/api/workspace/types";
-
-import { ProductOverviewPage } from "../SecretManagerOverviewPage/SecretManagerOverviewPage";
-
-export const SecretScanningOverviewPage = () => (
-  <ProductOverviewPage type={ProjectType.SecretScanning} />
-);
diff --git a/frontend/src/pages/organization/SecretScanningOverviewPage/route.tsx b/frontend/src/pages/organization/SecretScanningOverviewPage/route.tsx
deleted file mode 100644
index a42b42b9b..000000000
--- a/frontend/src/pages/organization/SecretScanningOverviewPage/route.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { createFileRoute, linkOptions } from "@tanstack/react-router";
-
-import { SecretScanningOverviewPage } from "./SecretScanningOverviewPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview"
-)({
-  component: SecretScanningOverviewPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "Secret Scanning",
-        link: linkOptions({ to: "/organization/secret-scanning/overview" })
-      }
-    ]
-  })
-});
diff --git a/frontend/src/pages/organization/SshOverviewPage/SshOverviewPage.tsx b/frontend/src/pages/organization/SshOverviewPage/SshOverviewPage.tsx
deleted file mode 100644
index e381b6fc0..000000000
--- a/frontend/src/pages/organization/SshOverviewPage/SshOverviewPage.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ProjectType } from "@app/hooks/api/workspace/types";
-
-import { ProductOverviewPage } from "../SecretManagerOverviewPage/SecretManagerOverviewPage";
-
-export const SshOverviewPage = () => <ProductOverviewPage type={ProjectType.SSH} />;
diff --git a/frontend/src/pages/organization/SshOverviewPage/route.tsx b/frontend/src/pages/organization/SshOverviewPage/route.tsx
deleted file mode 100644
index 287151325..000000000
--- a/frontend/src/pages/organization/SshOverviewPage/route.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { createFileRoute, linkOptions } from "@tanstack/react-router";
-
-import { SshOverviewPage } from "./SshOverviewPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview"
-)({
-  component: SshOverviewPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "SSH",
-        link: linkOptions({ to: "/organization/ssh/overview" })
-      }
-    ]
-  })
-});
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretV2MigrationSection/SecretV2MigrationSection.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretV2MigrationSection/SecretV2MigrationSection.tsx
index 8c0a0fadf..14faa7e9e 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretV2MigrationSection/SecretV2MigrationSection.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretV2MigrationSection/SecretV2MigrationSection.tsx
@@ -12,7 +12,7 @@ import { useProjectPermission, useWorkspace } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useGetWorkspaceById, useMigrateProjectToV3, workspaceKeys } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectType, ProjectVersion } from "@app/hooks/api/workspace/types";
+import { ProjectVersion } from "@app/hooks/api/workspace/types";
 
 enum ProjectUpgradeStatus {
   InProgress = "IN_PROGRESS",
@@ -54,7 +54,7 @@ export const SecretV2MigrationSection = () => {
       createNotification({ type: "success", text: "Project upgrade completed successfully" });
       migrateProjectToV3.reset();
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   }, [isProjectUpgraded, Boolean(migrateProjectToV3.data)]);
diff --git a/frontend/src/routeTree.gen.ts b/frontend/src/routeTree.gen.ts
index 02a3e30d9..10d8b72b5 100644
--- a/frontend/src/routeTree.gen.ts
+++ b/frontend/src/routeTree.gen.ts
@@ -48,6 +48,7 @@ import { Route as adminEncryptionPageRouteImport } from './pages/admin/Encryptio
 import { Route as adminCachingPageRouteImport } from './pages/admin/CachingPage/route'
 import { Route as adminAuthenticationPageRouteImport } from './pages/admin/AuthenticationPage/route'
 import { Route as organizationSsoPageRouteImport } from './pages/organization/SsoPage/route'
+import { Route as organizationProjectsPageRouteImport } from './pages/organization/ProjectsPage/route'
 import { Route as organizationBillingPageRouteImport } from './pages/organization/BillingPage/route'
 import { Route as organizationAuditLogsPageRouteImport } from './pages/organization/AuditLogsPage/route'
 import { Route as organizationAdminPageRouteImport } from './pages/organization/AdminPage/route'
@@ -61,21 +62,11 @@ import { Route as certManagerLayoutImport } from './pages/cert-manager/layout'
 import { Route as adminUserIdentitiesResourcesPageRouteImport } from './pages/admin/UserIdentitiesResourcesPage/route'
 import { Route as adminOrganizationResourcesPageRouteImport } from './pages/admin/OrganizationResourcesPage/route'
 import { Route as adminMachineIdentitiesResourcesPageRouteImport } from './pages/admin/MachineIdentitiesResourcesPage/route'
-import { Route as organizationSshSettingsPageRouteImport } from './pages/organization/SshSettingsPage/route'
-import { Route as organizationSshOverviewPageRouteImport } from './pages/organization/SshOverviewPage/route'
 import { Route as organizationSecretSharingSettingsPageRouteImport } from './pages/organization/SecretSharingSettingsPage/route'
-import { Route as organizationSecretScanningSettingsPageRouteImport } from './pages/organization/SecretScanningSettingsPage/route'
-import { Route as organizationSecretScanningOverviewPageRouteImport } from './pages/organization/SecretScanningOverviewPage/route'
-import { Route as organizationSecretManagerSettingsPageRouteImport } from './pages/organization/SecretManagerSettingsPage/route'
-import { Route as organizationSecretManagerOverviewPageRouteImport } from './pages/organization/SecretManagerOverviewPage/route'
 import { Route as organizationRoleByIDPageRouteImport } from './pages/organization/RoleByIDPage/route'
 import { Route as organizationUserDetailsByIDPageRouteImport } from './pages/organization/UserDetailsByIDPage/route'
-import { Route as organizationKmsSettingsPageRouteImport } from './pages/organization/KmsSettingsPage/route'
-import { Route as organizationKmsOverviewPageRouteImport } from './pages/organization/KmsOverviewPage/route'
 import { Route as organizationIdentityDetailsByIDPageRouteImport } from './pages/organization/IdentityDetailsByIDPage/route'
 import { Route as organizationGroupDetailsByIDPageRouteImport } from './pages/organization/GroupDetailsByIDPage/route'
-import { Route as organizationCertManagerSettingsPageRouteImport } from './pages/organization/CertManagerSettingsPage/route'
-import { Route as organizationCertManagerOverviewPageRouteImport } from './pages/organization/CertManagerOverviewPage/route'
 import { Route as organizationSettingsPageRouteImport } from './pages/organization/SettingsPage/route'
 import { Route as organizationSecretSharingPageRouteImport } from './pages/organization/SecretSharingPage/route'
 import { Route as organizationGatewaysGatewayListPageRouteImport } from './pages/organization/Gateways/GatewayListPage/route'
@@ -639,6 +630,14 @@ const organizationSsoPageRouteRoute = organizationSsoPageRouteImport.update({
   getParentRoute: () => AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
 } as any)
 
+const organizationProjectsPageRouteRoute =
+  organizationProjectsPageRouteImport.update({
+    id: '/projects',
+    path: '/projects',
+    getParentRoute: () =>
+      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
+  } as any)
+
 const organizationBillingPageRouteRoute =
   organizationBillingPageRouteImport.update({
     id: '/billing',
@@ -727,22 +726,6 @@ const adminMachineIdentitiesResourcesPageRouteRoute =
     getParentRoute: () => adminLayoutRoute,
   } as any)
 
-const organizationSshSettingsPageRouteRoute =
-  organizationSshSettingsPageRouteImport.update({
-    id: '/ssh/settings',
-    path: '/ssh/settings',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationSshOverviewPageRouteRoute =
-  organizationSshOverviewPageRouteImport.update({
-    id: '/ssh/overview',
-    path: '/ssh/overview',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
 const organizationSecretSharingSettingsPageRouteRoute =
   organizationSecretSharingSettingsPageRouteImport.update({
     id: '/settings',
@@ -751,38 +734,6 @@ const organizationSecretSharingSettingsPageRouteRoute =
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRoute,
   } as any)
 
-const organizationSecretScanningSettingsPageRouteRoute =
-  organizationSecretScanningSettingsPageRouteImport.update({
-    id: '/secret-scanning/settings',
-    path: '/secret-scanning/settings',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationSecretScanningOverviewPageRouteRoute =
-  organizationSecretScanningOverviewPageRouteImport.update({
-    id: '/secret-scanning/overview',
-    path: '/secret-scanning/overview',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationSecretManagerSettingsPageRouteRoute =
-  organizationSecretManagerSettingsPageRouteImport.update({
-    id: '/secret-manager/settings',
-    path: '/secret-manager/settings',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationSecretManagerOverviewPageRouteRoute =
-  organizationSecretManagerOverviewPageRouteImport.update({
-    id: '/secret-manager/overview',
-    path: '/secret-manager/overview',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
 const organizationRoleByIDPageRouteRoute =
   organizationRoleByIDPageRouteImport.update({
     id: '/roles/$roleId',
@@ -799,22 +750,6 @@ const organizationUserDetailsByIDPageRouteRoute =
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
   } as any)
 
-const organizationKmsSettingsPageRouteRoute =
-  organizationKmsSettingsPageRouteImport.update({
-    id: '/kms/settings',
-    path: '/kms/settings',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationKmsOverviewPageRouteRoute =
-  organizationKmsOverviewPageRouteImport.update({
-    id: '/kms/overview',
-    path: '/kms/overview',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
 const organizationIdentityDetailsByIDPageRouteRoute =
   organizationIdentityDetailsByIDPageRouteImport.update({
     id: '/identities/$identityId',
@@ -831,22 +766,6 @@ const organizationGroupDetailsByIDPageRouteRoute =
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
   } as any)
 
-const organizationCertManagerSettingsPageRouteRoute =
-  organizationCertManagerSettingsPageRouteImport.update({
-    id: '/cert-manager/settings',
-    path: '/cert-manager/settings',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
-const organizationCertManagerOverviewPageRouteRoute =
-  organizationCertManagerOverviewPageRouteImport.update({
-    id: '/cert-manager/overview',
-    path: '/cert-manager/overview',
-    getParentRoute: () =>
-      AuthenticateInjectOrgDetailsOrgLayoutOrganizationRoute,
-  } as any)
-
 const organizationSettingsPageRouteRoute =
   organizationSettingsPageRouteImport.update({
     id: '/',
@@ -2332,6 +2251,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof organizationBillingPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
     }
+    '/_authenticate/_inject-org-details/_org-layout/organization/projects': {
+      id: '/_authenticate/_inject-org-details/_org-layout/organization/projects'
+      path: '/projects'
+      fullPath: '/organization/projects'
+      preLoaderRoute: typeof organizationProjectsPageRouteImport
+      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
+    }
     '/_authenticate/_inject-org-details/_org-layout/organization/sso': {
       id: '/_authenticate/_inject-org-details/_org-layout/organization/sso'
       path: '/sso'
@@ -2465,20 +2391,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof organizationSettingsPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationSettingsImport
     }
-    '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview'
-      path: '/cert-manager/overview'
-      fullPath: '/organization/cert-manager/overview'
-      preLoaderRoute: typeof organizationCertManagerOverviewPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings'
-      path: '/cert-manager/settings'
-      fullPath: '/organization/cert-manager/settings'
-      preLoaderRoute: typeof organizationCertManagerSettingsPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
     '/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId': {
       id: '/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId'
       path: '/groups/$groupId'
@@ -2493,20 +2405,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof organizationIdentityDetailsByIDPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
     }
-    '/_authenticate/_inject-org-details/_org-layout/organization/kms/overview': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/kms/overview'
-      path: '/kms/overview'
-      fullPath: '/organization/kms/overview'
-      preLoaderRoute: typeof organizationKmsOverviewPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/kms/settings': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/kms/settings'
-      path: '/kms/settings'
-      fullPath: '/organization/kms/settings'
-      preLoaderRoute: typeof organizationKmsSettingsPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
     '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId': {
       id: '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId'
       path: '/members/$membershipId'
@@ -2521,34 +2419,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof organizationRoleByIDPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
     }
-    '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview'
-      path: '/secret-manager/overview'
-      fullPath: '/organization/secret-manager/overview'
-      preLoaderRoute: typeof organizationSecretManagerOverviewPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings'
-      path: '/secret-manager/settings'
-      fullPath: '/organization/secret-manager/settings'
-      preLoaderRoute: typeof organizationSecretManagerSettingsPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview'
-      path: '/secret-scanning/overview'
-      fullPath: '/organization/secret-scanning/overview'
-      preLoaderRoute: typeof organizationSecretScanningOverviewPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings'
-      path: '/secret-scanning/settings'
-      fullPath: '/organization/secret-scanning/settings'
-      preLoaderRoute: typeof organizationSecretScanningSettingsPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
     '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings': {
       id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings'
       path: '/settings'
@@ -2556,20 +2426,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof organizationSecretSharingSettingsPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingImport
     }
-    '/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview'
-      path: '/ssh/overview'
-      fullPath: '/organization/ssh/overview'
-      preLoaderRoute: typeof organizationSshOverviewPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
-    '/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings'
-      path: '/ssh/settings'
-      fullPath: '/organization/ssh/settings'
-      preLoaderRoute: typeof organizationSshSettingsPageRouteImport
-      parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
-    }
     '/_authenticate/_inject-org-details/admin/_admin-layout/resources/machine-identities': {
       id: '/_authenticate/_inject-org-details/admin/_admin-layout/resources/machine-identities'
       path: '/resources/machine-identities'
@@ -3800,25 +3656,16 @@ interface AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteChildren {
   organizationAdminPageRouteRoute: typeof organizationAdminPageRouteRoute
   organizationAuditLogsPageRouteRoute: typeof organizationAuditLogsPageRouteRoute
   organizationBillingPageRouteRoute: typeof organizationBillingPageRouteRoute
+  organizationProjectsPageRouteRoute: typeof organizationProjectsPageRouteRoute
   organizationSsoPageRouteRoute: typeof organizationSsoPageRouteRoute
   AuthenticateInjectOrgDetailsOrgLayoutOrganizationAppConnectionsRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationAppConnectionsRouteWithChildren
   AuthenticateInjectOrgDetailsOrgLayoutOrganizationGatewaysRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationGatewaysRouteWithChildren
   AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteWithChildren
   AuthenticateInjectOrgDetailsOrgLayoutOrganizationSettingsRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationSettingsRouteWithChildren
-  organizationCertManagerOverviewPageRouteRoute: typeof organizationCertManagerOverviewPageRouteRoute
-  organizationCertManagerSettingsPageRouteRoute: typeof organizationCertManagerSettingsPageRouteRoute
   organizationGroupDetailsByIDPageRouteRoute: typeof organizationGroupDetailsByIDPageRouteRoute
   organizationIdentityDetailsByIDPageRouteRoute: typeof organizationIdentityDetailsByIDPageRouteRoute
-  organizationKmsOverviewPageRouteRoute: typeof organizationKmsOverviewPageRouteRoute
-  organizationKmsSettingsPageRouteRoute: typeof organizationKmsSettingsPageRouteRoute
   organizationUserDetailsByIDPageRouteRoute: typeof organizationUserDetailsByIDPageRouteRoute
   organizationRoleByIDPageRouteRoute: typeof organizationRoleByIDPageRouteRoute
-  organizationSecretManagerOverviewPageRouteRoute: typeof organizationSecretManagerOverviewPageRouteRoute
-  organizationSecretManagerSettingsPageRouteRoute: typeof organizationSecretManagerSettingsPageRouteRoute
-  organizationSecretScanningOverviewPageRouteRoute: typeof organizationSecretScanningOverviewPageRouteRoute
-  organizationSecretScanningSettingsPageRouteRoute: typeof organizationSecretScanningSettingsPageRouteRoute
-  organizationSshOverviewPageRouteRoute: typeof organizationSshOverviewPageRouteRoute
-  organizationSshSettingsPageRouteRoute: typeof organizationSshSettingsPageRouteRoute
 }
 
 const AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteChildren: AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteChildren =
@@ -3828,6 +3675,7 @@ const AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteChildren: Authentica
     organizationAdminPageRouteRoute: organizationAdminPageRouteRoute,
     organizationAuditLogsPageRouteRoute: organizationAuditLogsPageRouteRoute,
     organizationBillingPageRouteRoute: organizationBillingPageRouteRoute,
+    organizationProjectsPageRouteRoute: organizationProjectsPageRouteRoute,
     organizationSsoPageRouteRoute: organizationSsoPageRouteRoute,
     AuthenticateInjectOrgDetailsOrgLayoutOrganizationAppConnectionsRoute:
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationAppConnectionsRouteWithChildren,
@@ -3837,33 +3685,13 @@ const AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteChildren: Authentica
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteWithChildren,
     AuthenticateInjectOrgDetailsOrgLayoutOrganizationSettingsRoute:
       AuthenticateInjectOrgDetailsOrgLayoutOrganizationSettingsRouteWithChildren,
-    organizationCertManagerOverviewPageRouteRoute:
-      organizationCertManagerOverviewPageRouteRoute,
-    organizationCertManagerSettingsPageRouteRoute:
-      organizationCertManagerSettingsPageRouteRoute,
     organizationGroupDetailsByIDPageRouteRoute:
       organizationGroupDetailsByIDPageRouteRoute,
     organizationIdentityDetailsByIDPageRouteRoute:
       organizationIdentityDetailsByIDPageRouteRoute,
-    organizationKmsOverviewPageRouteRoute:
-      organizationKmsOverviewPageRouteRoute,
-    organizationKmsSettingsPageRouteRoute:
-      organizationKmsSettingsPageRouteRoute,
     organizationUserDetailsByIDPageRouteRoute:
       organizationUserDetailsByIDPageRouteRoute,
     organizationRoleByIDPageRouteRoute: organizationRoleByIDPageRouteRoute,
-    organizationSecretManagerOverviewPageRouteRoute:
-      organizationSecretManagerOverviewPageRouteRoute,
-    organizationSecretManagerSettingsPageRouteRoute:
-      organizationSecretManagerSettingsPageRouteRoute,
-    organizationSecretScanningOverviewPageRouteRoute:
-      organizationSecretScanningOverviewPageRouteRoute,
-    organizationSecretScanningSettingsPageRouteRoute:
-      organizationSecretScanningSettingsPageRouteRoute,
-    organizationSshOverviewPageRouteRoute:
-      organizationSshOverviewPageRouteRoute,
-    organizationSshSettingsPageRouteRoute:
-      organizationSshSettingsPageRouteRoute,
   }
 
 const AuthenticateInjectOrgDetailsOrgLayoutOrganizationRouteWithChildren =
@@ -4709,6 +4537,7 @@ export interface FileRoutesByFullPath {
   '/organization/admin': typeof organizationAdminPageRouteRoute
   '/organization/audit-logs': typeof organizationAuditLogsPageRouteRoute
   '/organization/billing': typeof organizationBillingPageRouteRoute
+  '/organization/projects': typeof organizationProjectsPageRouteRoute
   '/organization/sso': typeof organizationSsoPageRouteRoute
   '/admin/authentication': typeof adminAuthenticationPageRouteRoute
   '/admin/caching': typeof adminCachingPageRouteRoute
@@ -4728,21 +4557,11 @@ export interface FileRoutesByFullPath {
   '/organization/gateways/': typeof organizationGatewaysGatewayListPageRouteRoute
   '/organization/secret-sharing/': typeof organizationSecretSharingPageRouteRoute
   '/organization/settings/': typeof organizationSettingsPageRouteRoute
-  '/organization/cert-manager/overview': typeof organizationCertManagerOverviewPageRouteRoute
-  '/organization/cert-manager/settings': typeof organizationCertManagerSettingsPageRouteRoute
   '/organization/groups/$groupId': typeof organizationGroupDetailsByIDPageRouteRoute
   '/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
-  '/organization/kms/overview': typeof organizationKmsOverviewPageRouteRoute
-  '/organization/kms/settings': typeof organizationKmsSettingsPageRouteRoute
   '/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
   '/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
-  '/organization/secret-manager/overview': typeof organizationSecretManagerOverviewPageRouteRoute
-  '/organization/secret-manager/settings': typeof organizationSecretManagerSettingsPageRouteRoute
-  '/organization/secret-scanning/overview': typeof organizationSecretScanningOverviewPageRouteRoute
-  '/organization/secret-scanning/settings': typeof organizationSecretScanningSettingsPageRouteRoute
   '/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
-  '/organization/ssh/overview': typeof organizationSshOverviewPageRouteRoute
-  '/organization/ssh/settings': typeof organizationSshSettingsPageRouteRoute
   '/admin/resources/machine-identities': typeof adminMachineIdentitiesResourcesPageRouteRoute
   '/admin/resources/organizations': typeof adminOrganizationResourcesPageRouteRoute
   '/admin/resources/user-identities': typeof adminUserIdentitiesResourcesPageRouteRoute
@@ -4931,6 +4750,7 @@ export interface FileRoutesByTo {
   '/organization/admin': typeof organizationAdminPageRouteRoute
   '/organization/audit-logs': typeof organizationAuditLogsPageRouteRoute
   '/organization/billing': typeof organizationBillingPageRouteRoute
+  '/organization/projects': typeof organizationProjectsPageRouteRoute
   '/organization/sso': typeof organizationSsoPageRouteRoute
   '/admin/authentication': typeof adminAuthenticationPageRouteRoute
   '/admin/caching': typeof adminCachingPageRouteRoute
@@ -4946,21 +4766,11 @@ export interface FileRoutesByTo {
   '/organization/gateways': typeof organizationGatewaysGatewayListPageRouteRoute
   '/organization/secret-sharing': typeof organizationSecretSharingPageRouteRoute
   '/organization/settings': typeof organizationSettingsPageRouteRoute
-  '/organization/cert-manager/overview': typeof organizationCertManagerOverviewPageRouteRoute
-  '/organization/cert-manager/settings': typeof organizationCertManagerSettingsPageRouteRoute
   '/organization/groups/$groupId': typeof organizationGroupDetailsByIDPageRouteRoute
   '/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
-  '/organization/kms/overview': typeof organizationKmsOverviewPageRouteRoute
-  '/organization/kms/settings': typeof organizationKmsSettingsPageRouteRoute
   '/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
   '/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
-  '/organization/secret-manager/overview': typeof organizationSecretManagerOverviewPageRouteRoute
-  '/organization/secret-manager/settings': typeof organizationSecretManagerSettingsPageRouteRoute
-  '/organization/secret-scanning/overview': typeof organizationSecretScanningOverviewPageRouteRoute
-  '/organization/secret-scanning/settings': typeof organizationSecretScanningSettingsPageRouteRoute
   '/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
-  '/organization/ssh/overview': typeof organizationSshOverviewPageRouteRoute
-  '/organization/ssh/settings': typeof organizationSshSettingsPageRouteRoute
   '/admin/resources/machine-identities': typeof adminMachineIdentitiesResourcesPageRouteRoute
   '/admin/resources/organizations': typeof adminOrganizationResourcesPageRouteRoute
   '/admin/resources/user-identities': typeof adminUserIdentitiesResourcesPageRouteRoute
@@ -5153,6 +4963,7 @@ export interface FileRoutesById {
   '/_authenticate/_inject-org-details/_org-layout/organization/admin': typeof organizationAdminPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/audit-logs': typeof organizationAuditLogsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/billing': typeof organizationBillingPageRouteRoute
+  '/_authenticate/_inject-org-details/_org-layout/organization/projects': typeof organizationProjectsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/sso': typeof organizationSsoPageRouteRoute
   '/_authenticate/_inject-org-details/admin/_admin-layout/authentication': typeof adminAuthenticationPageRouteRoute
   '/_authenticate/_inject-org-details/admin/_admin-layout/caching': typeof adminCachingPageRouteRoute
@@ -5172,21 +4983,11 @@ export interface FileRoutesById {
   '/_authenticate/_inject-org-details/_org-layout/organization/gateways/': typeof organizationGatewaysGatewayListPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/': typeof organizationSecretSharingPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/settings/': typeof organizationSettingsPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview': typeof organizationCertManagerOverviewPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings': typeof organizationCertManagerSettingsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId': typeof organizationGroupDetailsByIDPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/kms/overview': typeof organizationKmsOverviewPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/kms/settings': typeof organizationKmsSettingsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview': typeof organizationSecretManagerOverviewPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings': typeof organizationSecretManagerSettingsPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview': typeof organizationSecretScanningOverviewPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings': typeof organizationSecretScanningSettingsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview': typeof organizationSshOverviewPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings': typeof organizationSshSettingsPageRouteRoute
   '/_authenticate/_inject-org-details/admin/_admin-layout/resources/machine-identities': typeof adminMachineIdentitiesResourcesPageRouteRoute
   '/_authenticate/_inject-org-details/admin/_admin-layout/resources/organizations': typeof adminOrganizationResourcesPageRouteRoute
   '/_authenticate/_inject-org-details/admin/_admin-layout/resources/user-identities': typeof adminUserIdentitiesResourcesPageRouteRoute
@@ -5386,6 +5187,7 @@ export interface FileRouteTypes {
     | '/organization/admin'
     | '/organization/audit-logs'
     | '/organization/billing'
+    | '/organization/projects'
     | '/organization/sso'
     | '/admin/authentication'
     | '/admin/caching'
@@ -5405,21 +5207,11 @@ export interface FileRouteTypes {
     | '/organization/gateways/'
     | '/organization/secret-sharing/'
     | '/organization/settings/'
-    | '/organization/cert-manager/overview'
-    | '/organization/cert-manager/settings'
     | '/organization/groups/$groupId'
     | '/organization/identities/$identityId'
-    | '/organization/kms/overview'
-    | '/organization/kms/settings'
     | '/organization/members/$membershipId'
     | '/organization/roles/$roleId'
-    | '/organization/secret-manager/overview'
-    | '/organization/secret-manager/settings'
-    | '/organization/secret-scanning/overview'
-    | '/organization/secret-scanning/settings'
     | '/organization/secret-sharing/settings'
-    | '/organization/ssh/overview'
-    | '/organization/ssh/settings'
     | '/admin/resources/machine-identities'
     | '/admin/resources/organizations'
     | '/admin/resources/user-identities'
@@ -5607,6 +5399,7 @@ export interface FileRouteTypes {
     | '/organization/admin'
     | '/organization/audit-logs'
     | '/organization/billing'
+    | '/organization/projects'
     | '/organization/sso'
     | '/admin/authentication'
     | '/admin/caching'
@@ -5622,21 +5415,11 @@ export interface FileRouteTypes {
     | '/organization/gateways'
     | '/organization/secret-sharing'
     | '/organization/settings'
-    | '/organization/cert-manager/overview'
-    | '/organization/cert-manager/settings'
     | '/organization/groups/$groupId'
     | '/organization/identities/$identityId'
-    | '/organization/kms/overview'
-    | '/organization/kms/settings'
     | '/organization/members/$membershipId'
     | '/organization/roles/$roleId'
-    | '/organization/secret-manager/overview'
-    | '/organization/secret-manager/settings'
-    | '/organization/secret-scanning/overview'
-    | '/organization/secret-scanning/settings'
     | '/organization/secret-sharing/settings'
-    | '/organization/ssh/overview'
-    | '/organization/ssh/settings'
     | '/admin/resources/machine-identities'
     | '/admin/resources/organizations'
     | '/admin/resources/user-identities'
@@ -5827,6 +5610,7 @@ export interface FileRouteTypes {
     | '/_authenticate/_inject-org-details/_org-layout/organization/admin'
     | '/_authenticate/_inject-org-details/_org-layout/organization/audit-logs'
     | '/_authenticate/_inject-org-details/_org-layout/organization/billing'
+    | '/_authenticate/_inject-org-details/_org-layout/organization/projects'
     | '/_authenticate/_inject-org-details/_org-layout/organization/sso'
     | '/_authenticate/_inject-org-details/admin/_admin-layout/authentication'
     | '/_authenticate/_inject-org-details/admin/_admin-layout/caching'
@@ -5846,21 +5630,11 @@ export interface FileRouteTypes {
     | '/_authenticate/_inject-org-details/_org-layout/organization/gateways/'
     | '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/'
     | '/_authenticate/_inject-org-details/_org-layout/organization/settings/'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings'
     | '/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId'
     | '/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/kms/overview'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/kms/settings'
     | '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId'
     | '/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings'
     | '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview'
-    | '/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings'
     | '/_authenticate/_inject-org-details/admin/_admin-layout/resources/machine-identities'
     | '/_authenticate/_inject-org-details/admin/_admin-layout/resources/organizations'
     | '/_authenticate/_inject-org-details/admin/_admin-layout/resources/user-identities'
@@ -6260,25 +6034,16 @@ export const routeTree = rootRoute
         "/_authenticate/_inject-org-details/_org-layout/organization/admin",
         "/_authenticate/_inject-org-details/_org-layout/organization/audit-logs",
         "/_authenticate/_inject-org-details/_org-layout/organization/billing",
+        "/_authenticate/_inject-org-details/_org-layout/organization/projects",
         "/_authenticate/_inject-org-details/_org-layout/organization/sso",
         "/_authenticate/_inject-org-details/_org-layout/organization/app-connections",
         "/_authenticate/_inject-org-details/_org-layout/organization/gateways",
         "/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing",
         "/_authenticate/_inject-org-details/_org-layout/organization/settings",
-        "/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview",
-        "/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings",
         "/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId",
         "/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId",
-        "/_authenticate/_inject-org-details/_org-layout/organization/kms/overview",
-        "/_authenticate/_inject-org-details/_org-layout/organization/kms/settings",
         "/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId",
-        "/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId",
-        "/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview",
-        "/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings",
-        "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview",
-        "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings",
-        "/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview",
-        "/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings"
+        "/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId"
       ]
     },
     "/_authenticate/_inject-org-details/admin/_admin-layout": {
@@ -6316,6 +6081,10 @@ export const routeTree = rootRoute
       "filePath": "organization/BillingPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
     },
+    "/_authenticate/_inject-org-details/_org-layout/organization/projects": {
+      "filePath": "organization/ProjectsPage/route.tsx",
+      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
+    },
     "/_authenticate/_inject-org-details/_org-layout/organization/sso": {
       "filePath": "organization/SsoPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
@@ -6422,14 +6191,6 @@ export const routeTree = rootRoute
       "filePath": "organization/SettingsPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization/settings"
     },
-    "/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview": {
-      "filePath": "organization/CertManagerOverviewPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/settings": {
-      "filePath": "organization/CertManagerSettingsPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
     "/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId": {
       "filePath": "organization/GroupDetailsByIDPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
@@ -6438,14 +6199,6 @@ export const routeTree = rootRoute
       "filePath": "organization/IdentityDetailsByIDPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
     },
-    "/_authenticate/_inject-org-details/_org-layout/organization/kms/overview": {
-      "filePath": "organization/KmsOverviewPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/kms/settings": {
-      "filePath": "organization/KmsSettingsPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
     "/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId": {
       "filePath": "organization/UserDetailsByIDPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
@@ -6454,34 +6207,10 @@ export const routeTree = rootRoute
       "filePath": "organization/RoleByIDPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
     },
-    "/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview": {
-      "filePath": "organization/SecretManagerOverviewPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/settings": {
-      "filePath": "organization/SecretManagerSettingsPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview": {
-      "filePath": "organization/SecretScanningOverviewPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings": {
-      "filePath": "organization/SecretScanningSettingsPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
     "/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings": {
       "filePath": "organization/SecretSharingSettingsPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing"
     },
-    "/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview": {
-      "filePath": "organization/SshOverviewPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
-    "/_authenticate/_inject-org-details/_org-layout/organization/ssh/settings": {
-      "filePath": "organization/SshSettingsPage/route.tsx",
-      "parent": "/_authenticate/_inject-org-details/_org-layout/organization"
-    },
     "/_authenticate/_inject-org-details/admin/_admin-layout/resources/machine-identities": {
       "filePath": "admin/MachineIdentitiesResourcesPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/admin/_admin-layout"
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 973e36fff..a44956ffa 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -18,16 +18,7 @@ const adminRoute = route("/admin", [
 ]);
 
 const organizationRoutes = route("/organization", [
-  route("/secret-manager/overview", "organization/SecretManagerOverviewPage/route.tsx"),
-  route("/secret-manager/settings", "organization/SecretManagerSettingsPage/route.tsx"),
-  route("/cert-manager/overview", "organization/CertManagerOverviewPage/route.tsx"),
-  route("/cert-manager/settings", "organization/CertManagerSettingsPage/route.tsx"),
-  route("/ssh/overview", "organization/SshOverviewPage/route.tsx"),
-  route("/ssh/settings", "organization/SshSettingsPage/route.tsx"),
-  route("/secret-scanning/overview", "organization/SecretScanningOverviewPage/route.tsx"),
-  route("/secret-scanning/settings", "organization/SecretScanningSettingsPage/route.tsx"),
-  route("/kms/overview", "organization/KmsOverviewPage/route.tsx"),
-  route("/kms/settings", "organization/KmsSettingsPage/route.tsx"),
+  route("/projects", "organization/ProjectsPage/route.tsx"),
   route("/access-management", "organization/AccessManagementPage/route.tsx"),
   route("/admin", "organization/AdminPage/route.tsx"),
   route("/audit-logs", "organization/AuditLogsPage/route.tsx"),
@@ -41,7 +32,6 @@ const organizationRoutes = route("/organization", [
     route("/oauth/callback", "organization/SettingsPage/OauthCallbackPage/route.tsx")
   ]),
   route("/sso", "organization/SsoPage/route.tsx"),
-  // route("/secret-scanning", "organization/SecretScanningPage/route.tsx"),
   route("/groups/$groupId", "organization/GroupDetailsByIDPage/route.tsx"),
   route("/members/$membershipId", "organization/UserDetailsByIDPage/route.tsx"),
   route("/roles/$roleId", "organization/RoleByIDPage/route.tsx"),