diff --git a/frontend-v2/src/components/navigation/NavHeader.tsx b/frontend-v2/src/components/navigation/NavHeader.tsx
index 7412d3dcc..06e7b47bd 100644
--- a/frontend-v2/src/components/navigation/NavHeader.tsx
+++ b/frontend-v2/src/components/navigation/NavHeader.tsx
@@ -4,7 +4,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link, useParams } from "@tanstack/react-router";
 import { twMerge } from "tailwind-merge";
 
-import { ROUTE_PATHS } from "@app/const/routes";
 import { useOrganization, useWorkspace } from "@app/context";
 import { useToggle } from "@app/hooks";
 import { ProjectType } from "@app/hooks/api/workspace/types";
@@ -194,7 +193,7 @@ export default function NavHeader({
                   to={`/${ProjectType.SecretManager}/$projectId/secrets/$envSlug` as const}
                   params={{
                     projectId: currentWorkspace.id,
-                    envSlug: routerEnvSlug
+                    envSlug: routerEnvSlug || ""
                   }}
                   search={(query) => ({ ...query, secretPath: newSecretPath })}
                 >
diff --git a/frontend-v2/src/const/routes.ts b/frontend-v2/src/const/routes.ts
index 7b2555b79..5eeb5071e 100644
--- a/frontend-v2/src/const/routes.ts
+++ b/frontend-v2/src/const/routes.ts
@@ -1,13 +1,19 @@
 import { FileRouteTypes } from "@app/routeTree.gen";
 
 const setRoute = <TFull extends FileRouteTypes["fullPaths"], TId extends FileRouteTypes["id"]>(
-  full: TFull,
+  path: TFull,
   id: TId
-) => ({ full, id }) as const;
+) => ({ path, id }) as const;
 
 export const ROUTE_PATHS = Object.freeze({
   Auth: {
-    LoginSSO: setRoute("/login/sso", "/_restrict-login-signup/login/sso")
+    LoginSSO: setRoute("/login/sso", "/_restrict-login-signup/login/sso"),
+    ProviderSuccessPage: setRoute(
+      "/login/provider/success",
+      "/_restrict-login-signup/login/provider/success"
+    ),
+    SignUpSsoPage: setRoute("/signup/sso", "/_restrict-login-signup/signup/sso"),
+    PasswordResetPage: setRoute("/password-reset", "/_restrict-login-signup/password-reset")
   },
   Organization: {
     SecretScanning: setRoute(
@@ -17,6 +23,26 @@ export const ROUTE_PATHS = Object.freeze({
     SettingsPage: setRoute(
       "/organization/settings",
       "/_authenticate/_inject-org-details/organization/_layout/settings"
+    ),
+    GroupDetailsByIDPage: setRoute(
+      "/organization/groups/$groupId",
+      "/_authenticate/_inject-org-details/organization/_layout/groups/$groupId"
+    ),
+    IdentityDetailsByIDPage: setRoute(
+      "/organization/identities/$identityId",
+      "/_authenticate/_inject-org-details/organization/_layout/identities/$identityId"
+    ),
+    UserDetailsByIDPage: setRoute(
+      "/organization/members/$membershipId",
+      "/_authenticate/_inject-org-details/organization/_layout/members/$membershipId"
+    ),
+    AccessControlPage: setRoute(
+      "/organization/access-management",
+      "/_authenticate/_inject-org-details/organization/_layout/access-management"
+    ),
+    RoleByIDPage: setRoute(
+      "/organization/roles/$roleId",
+      "/_authenticate/_inject-org-details/organization/_layout/roles/$roleId"
     )
   },
   SecretManager: {
@@ -27,53 +53,27 @@ export const ROUTE_PATHS = Object.freeze({
     SecretDashboardPage: setRoute(
       "/secret-manager/$projectId/secrets/$envSlug",
       "/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/secrets/$envSlug"
+    ),
+    OverviewPage: setRoute(
+      "/secret-manager/$projectId/overview",
+      "/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/overview"
     )
   },
-  ProviderSuccessPage: setRoute(
-    "/login/provider/success",
-    "/_restrict-login-signup/login/provider/success"
-  ),
-  SignUpSsoPage: setRoute("/signup/sso", "/_restrict-login-signup/signup/sso"),
-  PasswordResetPage: setRoute("/password-reset", "/_restrict-login-signup/password-reset"),
-  ViewSharedSecretByIDPage: setRoute("/shared/secret/$secretId", "/shared/secret/$secretId"),
-  OrgGroupDetailsByIDPage: setRoute(
-    "/organization/groups/$groupId",
-    "/_authenticate/_inject-org-details/organization/_layout/groups/$groupId"
-  ),
-  OrgIdentityDetailsByIDPage: setRoute(
-    "/organization/identities/$identityId",
-    "/_authenticate/_inject-org-details/organization/_layout/identities/$identityId"
-  ),
-  OrgUserDetailsByIDPage: setRoute(
-    "/organization/members/$membershipId",
-    "/_authenticate/_inject-org-details/organization/_layout/members/$membershipId"
-  ),
-  OrgAccessControlPage: setRoute(
-    "/organization/access-management",
-    "/_authenticate/_inject-org-details/organization/_layout/access-management"
-  ),
-  OrgRoleByIDPage: setRoute(
-    "/organization/roles/$roleId",
-    "/_authenticate/_inject-org-details/organization/_layout/roles/$roleId"
-  ),
-  SecretOverviewPage: setRoute(
-    "/secret-manager/$projectId/overview",
-    "/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/overview"
-  ),
-  SecretDashboardPage: setRoute(
-    "/secret-manager/$projectId/secrets/$envSlug",
-    "/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/secrets/$envSlug"
-  ),
-  CertAuthDetailsByIDPage: setRoute(
-    "/cert-manager/$projectId/ca/$caId",
-    "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/ca/$caId"
-  ),
-  CertCertificatesPage: setRoute(
-    "/cert-manager/$projectId/overview",
-    "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/overview"
-  ),
-  CertPkiCollectionDetailsByIDPage: setRoute(
-    "/cert-manager/$projectId/pki-collections/$collectionId",
-    "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/pki-collections/$collectionId"
-  )
+  CertManager: {
+    CertAuthDetailsByIDPage: setRoute(
+      "/cert-manager/$projectId/ca/$caId",
+      "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/ca/$caId"
+    ),
+    OverviewPage: setRoute(
+      "/cert-manager/$projectId/overview",
+      "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/overview"
+    ),
+    PkiCollectionDetailsByIDPage: setRoute(
+      "/cert-manager/$projectId/pki-collections/$collectionId",
+      "/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/pki-collections/$collectionId"
+    )
+  },
+  Public: {
+    ViewSharedSecretByIDPage: setRoute("/shared/secret/$secretId", "/shared/secret/$secretId")
+  }
 });
diff --git a/frontend-v2/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx b/frontend-v2/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
index 5c8c7d0f2..ef71e4209 100644
--- a/frontend-v2/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
+++ b/frontend-v2/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
@@ -36,7 +36,7 @@ export const PasswordResetPage = () => {
   const [passwordErrorBreached, setPasswordErrorBreached] = useState(false);
 
   const navigate = useNavigate();
-  const search = useSearch({ from: ROUTE_PATHS.PasswordResetPage.id });
+  const search = useSearch({ from: ROUTE_PATHS.Auth.PasswordResetPage.id });
 
   const {
     mutateAsync: verifyPasswordResetCodeMutateAsync,
diff --git a/frontend-v2/src/pages/auth/ProviderSuccessPage/ProviderSuccessPage.tsx b/frontend-v2/src/pages/auth/ProviderSuccessPage/ProviderSuccessPage.tsx
index c335ae1ba..827ccf21b 100644
--- a/frontend-v2/src/pages/auth/ProviderSuccessPage/ProviderSuccessPage.tsx
+++ b/frontend-v2/src/pages/auth/ProviderSuccessPage/ProviderSuccessPage.tsx
@@ -6,7 +6,7 @@ import { ROUTE_PATHS } from "@app/const/routes";
 
 export const LoginProviderSuccessPage = () => {
   const search = useSearch({
-    from: ROUTE_PATHS.ProviderSuccessPage.id
+    from: ROUTE_PATHS.Auth.ProviderSuccessPage.id
   });
 
   useEffect(() => {
diff --git a/frontend-v2/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx b/frontend-v2/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
index 83d0221f4..b7872e612 100644
--- a/frontend-v2/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
+++ b/frontend-v2/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
@@ -12,7 +12,7 @@ import { UserInfoSSOStep } from "./components/UserInfoSSOStep";
 
 export const SignupSsoPage = () => {
   const { t } = useTranslation();
-  const search = useSearch({ from: ROUTE_PATHS.SignUpSsoPage.id });
+  const search = useSearch({ from: ROUTE_PATHS.Auth.SignUpSsoPage.id });
   const token = search.token as string;
 
   const [step, setStep] = useState(0);
diff --git a/frontend-v2/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx b/frontend-v2/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
index d7a2b4360..602e1a1ab 100644
--- a/frontend-v2/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
+++ b/frontend-v2/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
@@ -34,7 +34,7 @@ import {
 const Page = () => {
   const navigate = useNavigate();
   const params = useParams({
-    from: ROUTE_PATHS.CertAuthDetailsByIDPage.id
+    from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id
   });
   const caId = params.caId as string;
   const { data } = useGetCaById(caId);
diff --git a/frontend-v2/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx b/frontend-v2/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
index c2dc3b13b..c0f7b6e97 100644
--- a/frontend-v2/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
+++ b/frontend-v2/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
@@ -29,7 +29,7 @@ import { PkiCollectionDetailsSection, PkiCollectionItemsSection } from "./compon
 export const PkiCollectionPage = () => {
   const navigate = useNavigate();
   const params = useParams({
-    from: ROUTE_PATHS.CertPkiCollectionDetailsByIDPage.id
+    from: ROUTE_PATHS.CertManager.PkiCollectionDetailsByIDPage.id
   });
   const collectionId = params.collectionId as string;
   const { currentWorkspace } = useWorkspace();
diff --git a/frontend-v2/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx b/frontend-v2/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx
index 2aba0d84b..aa5c0757e 100644
--- a/frontend-v2/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx
+++ b/frontend-v2/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx
@@ -13,10 +13,10 @@ export const AccessManagementPage = () => {
   const { t } = useTranslation();
   const { permission } = useOrgPermission();
   const navigate = useNavigate({
-    from: ROUTE_PATHS.OrgAccessControlPage.full
+    from: ROUTE_PATHS.Organization.AccessControlPage.path
   });
   const selectedTab = useSearch({
-    from: ROUTE_PATHS.OrgAccessControlPage.id,
+    from: ROUTE_PATHS.Organization.AccessControlPage.id,
     select: (el) => el.selectedTab,
     structuralSharing: true
   });
diff --git a/frontend-v2/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx b/frontend-v2/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
index 6f2927ed6..cf2ef0fad 100644
--- a/frontend-v2/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
+++ b/frontend-v2/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
@@ -38,7 +38,7 @@ export enum TabSections {
 const Page = () => {
   const navigate = useNavigate();
   const params = useParams({
-    from: ROUTE_PATHS.OrgGroupDetailsByIDPage.id
+    from: ROUTE_PATHS.Organization.GroupDetailsByIDPage.id
   });
   const groupId = params.groupId as string;
 
diff --git a/frontend-v2/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend-v2/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
index 6699fd549..246cefce1 100644
--- a/frontend-v2/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend-v2/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -46,7 +46,7 @@ import {
 const Page = () => {
   const navigate = useNavigate();
   const params = useParams({
-    from: ROUTE_PATHS.OrgIdentityDetailsByIDPage.id
+    from: ROUTE_PATHS.Organization.IdentityDetailsByIDPage.id
   });
   const identityId = params.identityId as string;
   const { currentOrg } = useOrganization();
diff --git a/frontend-v2/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx b/frontend-v2/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx
index ece358b71..a8443957f 100644
--- a/frontend-v2/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx
+++ b/frontend-v2/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx
@@ -27,7 +27,7 @@ import { RoleDetailsSection, RoleModal, RolePermissionsSection } from "./compone
 export const Page = () => {
   const navigate = useNavigate();
   const params = useParams({
-    from: ROUTE_PATHS.OrgRoleByIDPage.id
+    from: ROUTE_PATHS.Organization.RoleByIDPage.id
   });
   const roleId = params.roleId as string;
   const { currentOrg } = useOrganization();
diff --git a/frontend-v2/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx b/frontend-v2/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx
index 80990280d..2a4e9ca57 100644
--- a/frontend-v2/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx
+++ b/frontend-v2/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx
@@ -41,7 +41,7 @@ const Page = withPermission(
   () => {
     const navigate = useNavigate();
     const search = useParams({
-      from: ROUTE_PATHS.OrgUserDetailsByIDPage.id
+      from: ROUTE_PATHS.Organization.UserDetailsByIDPage.id
     });
     const membershipId = search.membershipId as string;
     const { user } = useUser();
diff --git a/frontend-v2/src/pages/public/ViewSharedSecretByIDPage/ViewSharedSecretByIDPage.tsx b/frontend-v2/src/pages/public/ViewSharedSecretByIDPage/ViewSharedSecretByIDPage.tsx
index 2983e85cd..387982fbd 100644
--- a/frontend-v2/src/pages/public/ViewSharedSecretByIDPage/ViewSharedSecretByIDPage.tsx
+++ b/frontend-v2/src/pages/public/ViewSharedSecretByIDPage/ViewSharedSecretByIDPage.tsx
@@ -28,11 +28,11 @@ const extractDetailsFromUrl = (urlEncodedKey: string) => {
 
 export const ViewSharedSecretByIDPage = () => {
   const id = useParams({
-    from: ROUTE_PATHS.ViewSharedSecretByIDPage.id,
+    from: ROUTE_PATHS.Public.ViewSharedSecretByIDPage.id,
     select: (el) => el.secretId
   });
   const urlEncodedKey = useSearch({
-    from: ROUTE_PATHS.ViewSharedSecretByIDPage.id,
+    from: ROUTE_PATHS.Public.ViewSharedSecretByIDPage.id,
     select: (el) => el.key
   });
   const [password, setPassword] = useState<string>();
diff --git a/frontend-v2/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend-v2/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
index aeeacb953..6b7cdd0a3 100644
--- a/frontend-v2/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
+++ b/frontend-v2/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
@@ -111,10 +111,10 @@ export const OverviewPage = () => {
 
   const router = useRouter();
   const navigate = useNavigate({
-    from: ROUTE_PATHS.SecretOverviewPage.full
+    from: ROUTE_PATHS.SecretManager.OverviewPage.path
   });
   const routerSearch = useSearch({
-    from: ROUTE_PATHS.SecretOverviewPage.id,
+    from: ROUTE_PATHS.SecretManager.OverviewPage.id,
     select: (el) => ({
       secretPath: el.secretPath,
       search: el.search
diff --git a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
index a2bfd6c8b..b607458f6 100644
--- a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+++ b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
@@ -68,13 +68,13 @@ const Page = () => {
   const { t } = useTranslation();
   const { currentWorkspace } = useWorkspace();
   const navigate = useNavigate({
-    from: ROUTE_PATHS.SecretDashboardPage.full
+    from: ROUTE_PATHS.SecretManager.SecretDashboardPage.path
   });
   const routerQueryParams = useSearch({
-    from: ROUTE_PATHS.SecretDashboardPage.id
+    from: ROUTE_PATHS.SecretManager.SecretDashboardPage.id
   });
   const environment = useParams({
-    from: ROUTE_PATHS.SecretDashboardPage.id,
+    from: ROUTE_PATHS.SecretManager.SecretDashboardPage.id,
     select: (el) => el.envSlug
   });
 
diff --git a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx
index acfe61522..c9872f6f5 100644
--- a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx
+++ b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx
@@ -33,7 +33,7 @@ export const FolderListView = ({
     "updateFolder",
     "deleteFolder"
   ] as const);
-  const navigate = useNavigate({ from: ROUTE_PATHS.SecretManager.SecretDashboardPage.full });
+  const navigate = useNavigate({ from: ROUTE_PATHS.SecretManager.SecretDashboardPage.path });
   const secretPathQueryparam = useSearch({
     from: ROUTE_PATHS.SecretManager.SecretDashboardPage.id,
     select: (el) => el.secretPath