diff --git a/.env.local.example b/.env.local.example
index 0054f5790ed421df8dcd9d5587683da94a603db0..c418357e69941d28985a683433195ae11a9df12a 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -28,3 +28,5 @@ NETWORK_TOPOLOGY_API_URL="http://localhost:8080/api/v1/networks/topology"
 # Required by the Nextauth middleware
 NEXTAUTH_URL=http://localhost:3000/api/auth
 NEXTAUTH_SECRET="LR1a4CU9UVFr1OcVeu4ULDX/VHMMiI+s3wNvOkf6fdE=" # openssl rand -base64 32
+# Disable cache - usefull when in development
+NEXT_PUBLIC_DISABLE_CACHE=false
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 365e54806474d102f5ad3dc1695a3ed8f9bc27d1..2b233c2c16e7658398df30ce30d8c7412d3498ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "dependencies": {
         "@elastic/datemath": "^5.0.3",
-        "@elastic/eui": "^95.1.0",
+        "@elastic/eui": "^97.0.0",
         "@elfalem/leaflet-curve": "^0.9.2",
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.1",
         "@open-policy-agent/opa-wasm": "^1.8.1",
-        "@orchestrator-ui/orchestrator-ui-components": "2.4.0",
+        "@orchestrator-ui/orchestrator-ui-components": "2.8.1",
         "@reduxjs/toolkit": "^2.0.1",
         "axios": "^1.7.2",
         "cytoscape": "^3.29.2",
@@ -47,7 +47,7 @@
         "@types/cytoscape": "^3.21.2",
         "@types/cytoscape-fcose": "^2.2.4",
         "@types/leaflet": "^1.9.12",
-        "@types/node": "^20.10.5",
+        "@types/node": "^22.7.5",
         "@types/node-fetch": "^2.6.11",
         "@types/react": "^18.2.45",
         "@types/react-dom": "^18.2.18",
@@ -767,9 +767,10 @@
       }
     },
     "node_modules/@elastic/eui": {
-      "version": "95.1.0",
-      "resolved": "https://registry.npmjs.org/@elastic/eui/-/eui-95.1.0.tgz",
-      "integrity": "sha512-HabjjM/mhflYX5EL/m6WKIQZufVSsU8iILsyaq+5SCF3qdK3dQCgUVdPSPC0qX3QCdVKQZHyu9cQlxQszQvbBg==",
+      "version": "97.2.0",
+      "resolved": "https://registry.npmjs.org/@elastic/eui/-/eui-97.2.0.tgz",
+      "integrity": "sha512-n0puvtip72YtQMYtkrC9G5SeNqew61N8DNMP3DsYDJWn/eqOTARP0MbU7P7/P66ZmOVIeUaa+vSsHvqgU3GmLQ==",
+      "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "^16.6.0",
         "@types/lodash": "^4.14.202",
@@ -817,7 +818,7 @@
         "moment": "^2.13.0",
         "react": "^16.12 || ^17.0 || ^18.0",
         "react-dom": "^16.12 || ^17.0 || ^18.0",
-        "typescript": "~4.5.3"
+        "typescript": "~4.5.3 || ^5"
       }
     },
     "node_modules/@elfalem/leaflet-curve": {
@@ -2474,12 +2475,12 @@
       }
     },
     "node_modules/@orchestrator-ui/orchestrator-ui-components": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@orchestrator-ui/orchestrator-ui-components/-/orchestrator-ui-components-2.4.0.tgz",
-      "integrity": "sha512-rdESNUMMPEOr03mf3YFNfCDCZPj1fnMuN0KeNws70K5ZdLw50w7jHQdDnFBWP7b1PjJF04Q+NinWRMnoSdwWiQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@orchestrator-ui/orchestrator-ui-components/-/orchestrator-ui-components-2.8.1.tgz",
+      "integrity": "sha512-Tr7f0s6VPwwnEd6I6VxEkYWnD5HsLWOXLKHmI4mTt63mcX4GP0oLAiVBQsBq9gG+/7QGxfEe6yOhsVGAMOQo2A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@elastic/eui": "^95.1.0",
+        "@elastic/eui": "^97.0.0",
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.4",
         "@rtk-query/graphql-request-base-query": "^2.3.1",
@@ -3022,12 +3023,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.14.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.8.tgz",
-      "integrity": "sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==",
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.8"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -11682,10 +11684,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unherit": {
       "version": "1.1.3",
diff --git a/package.json b/package.json
index 0f22fb6e9a569a8c6c91be83b6a6df05849c946f..00b0fff155f1b78f669eee67df1372d39053d571 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,12 @@
   },
   "dependencies": {
     "@elastic/datemath": "^5.0.3",
-    "@elastic/eui": "^95.1.0",
+    "@elastic/eui": "^97.0.0",
     "@elfalem/leaflet-curve": "^0.9.2",
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@open-policy-agent/opa-wasm": "^1.8.1",
-    "@orchestrator-ui/orchestrator-ui-components": "2.4.0",
+    "@orchestrator-ui/orchestrator-ui-components": "2.8.1",
     "@reduxjs/toolkit": "^2.0.1",
     "axios": "^1.7.2",
     "cytoscape": "^3.29.2",
@@ -54,7 +54,7 @@
     "@types/cytoscape": "^3.21.2",
     "@types/cytoscape-fcose": "^2.2.4",
     "@types/leaflet": "^1.9.12",
-    "@types/node": "^20.10.5",
+    "@types/node": "^22.7.5",
     "@types/node-fetch": "^2.6.11",
     "@types/react": "^18.2.45",
     "@types/react-dom": "^18.2.18",
@@ -69,9 +69,6 @@
     "typescript": "^5.5.2"
   },
   "overrides": {
-    "@elastic/eui": {
-      "typescript": "^5.5.2"
-    },
     "react-no-ssr": {
       "react": "^18.3.1"
     }
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 821e89527b35538960aa0feba5f795586b4d300b..e7baea13b52cc41fecf618425f46392a0fd78d99 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -6,7 +6,6 @@ import { GsoConfigProvider, GsoConfig } from '@/contexts/GsoConfigContext';
 import { TranslationsProvider } from '@/translations/translationsProvider';
 import type { EuiSideNavItemType } from '@elastic/eui';
 import { EuiProvider, EuiThemeColorMode } from '@elastic/eui';
-import '@elastic/eui/dist/eui_theme_light.min.css';
 import {
   ColorModes,
   ConfirmationDialogContextWrapper,