diff --git a/frontend/package.json b/frontend/package.json
index 73e37bb0..a4e383c6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -80,7 +80,7 @@
 		"@types/inquirer": "^9.0.7",
 		"@types/jsdom": "^21.1.7",
 		"@types/lodash": "^4.17.7",
-		"@types/node": "^22.4.1",
+		"@types/node": "^22.5.0",
 		"@types/validator": "^13.12.0",
 		"@vitejs/plugin-vue": "^5.1.2",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
diff --git a/frontend/src/layouts/common/Navbar/items.tsx b/frontend/src/layouts/common/Navbar/items.tsx
index 3382d059..976eb444 100644
--- a/frontend/src/layouts/common/Navbar/items.tsx
+++ b/frontend/src/layouts/common/Navbar/items.tsx
@@ -12,10 +12,9 @@ const ConnectorsIcon = "carbon:hybrid-networking"
 const GraylogIcon = "majesticons:pulse-line"
 const AlertsIcon = "carbon:warning-hex"
 const ArtifactsIcon = "carbon:document-multiple-01"
-const SocIcon = "carbon:security"
+// const SocIcon = "carbon:security"
 const HealthcheckIcon = "ph:heartbeat"
 const CustomersIcon = "carbon:user-multiple"
-const UsersIcon = "carbon:group-security"
 const ExternalServicesIcon = "carbon:ibm-cloud-direct-link-2-dedicated"
 const ReportCreationIcon = "carbon:report-data"
 const SchedulerIcon = "material-symbols:autoplay"
@@ -152,6 +151,7 @@ export default function getItems(): MenuMixedOption[] {
 			key: "Artifacts",
 			icon: renderIcon(ArtifactsIcon)
 		},
+		/*
 		{
 			label: "SOC",
 			key: "Soc",
@@ -211,6 +211,7 @@ export default function getItems(): MenuMixedOption[] {
 				}
 			]
 		},
+		*/
 		{
 			label: "Incident Management",
 			key: "IncidentManagement",
@@ -285,20 +286,6 @@ export default function getItems(): MenuMixedOption[] {
 			key: "Customers",
 			icon: renderIcon(CustomersIcon)
 		},
-		{
-			label: () =>
-				h(
-					RouterLink,
-					{
-						to: {
-							name: "Users"
-						}
-					},
-					{ default: () => "Users" }
-				),
-			key: "Users",
-			icon: renderIcon(UsersIcon)
-		},
 		{
 			label: "External Services",
 			key: "ExternalServices",
diff --git a/frontend/src/layouts/common/Toolbar/Avatar.vue b/frontend/src/layouts/common/Toolbar/Avatar.vue
index 6c74c5f3..8e32cd8d 100644
--- a/frontend/src/layouts/common/Toolbar/Avatar.vue
+++ b/frontend/src/layouts/common/Toolbar/Avatar.vue
@@ -16,6 +16,7 @@ const LicenseIcon = "carbon:license"
 const LogoutIcon = "ion:log-out-outline"
 const LogsIcon = "carbon:cloud-logging"
 const ContactIcon = "ic:outline-alternate-email"
+const UsersIcon = "carbon:group-security"
 
 const router = useRouter()
 const authStore = useAuthStore()
@@ -33,6 +34,11 @@ const options = ref([
 		key: "route-License",
 		icon: renderIcon(LicenseIcon)
 	},
+	{
+		label: "Users",
+		key: "route-Users",
+		icon: renderIcon(UsersIcon)
+	},
 	{
 		label: "Logs",
 		key: "route-Logs",
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 4f7b0a1f..7f34e23b 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -92,6 +92,7 @@ const router = createRouter({
 			component: () => import("@/views/Artifacts.vue"),
 			meta: { title: "Artifacts", auth: true, roles: UserRole.All }
 		},
+		/*
 		{
 			path: "/soc",
 			redirect: "/soc/alerts",
@@ -126,6 +127,7 @@ const router = createRouter({
 				}
 			]
 		},
+		*/
 		{
 			path: "/incident-management",
 			redirect: "/incident-management/alerts",