diff --git a/api-catalog-services/build.gradle b/api-catalog-services/build.gradle
index c081c08dc4..1d24cc8382 100644
--- a/api-catalog-services/build.gradle
+++ b/api-catalog-services/build.gradle
@@ -75,7 +75,7 @@ dependencies {
     implementation libs.spring.boot.configuration.processor
     implementation libs.spring.cloud.commons
     implementation libs.spring.cloud.starter.bootstrap
-    implementation libs.spring.eureka.client.v3
+    implementation libs.spring.cloud.starter.eureka
     implementation libs.spring.cloud.starter.hystrix
     implementation libs.spring.retry
     implementation libs.jackson.annotations
diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json
index 29066f1076..5d7819d142 100644
--- a/api-catalog-ui/frontend/package-lock.json
+++ b/api-catalog-ui/frontend/package-lock.json
@@ -19,7 +19,7 @@
                 "@mui/material": "5.15.18",
                 "@react-loadable/revised": "1.5.0",
                 "@types/enzyme": "3.10.18",
-                "@types/jest": "29.5.12",
+                "@types/jest": "29.5.13",
                 "@types/react": "18.2.79",
                 "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
                 "agentkeepalive": "4.5.0",
@@ -30,7 +30,7 @@
                 "htmr": "1.0.2",
                 "install": "0.13.0",
                 "lodash": "4.17.21",
-                "loglevel": "1.9.1",
+                "loglevel": "1.9.2",
                 "openapi-snippet": "0.14.0",
                 "react": "18.3.1",
                 "react-app-polyfill": "3.0.0",
@@ -38,7 +38,7 @@
                 "react-hook-form": "7.51.5",
                 "react-redux": "9.1.2",
                 "react-router-dom": "5.3.4",
-                "react-toastify": "10.0.5",
+                "react-toastify": "10.0.6",
                 "redux": "5.0.1",
                 "redux-catch": "1.3.1",
                 "redux-logger": "3.0.6",
@@ -67,7 +67,7 @@
                 "ajv": "8.13.0",
                 "ansi-regex": "5.0.1",
                 "body-parser": "1.20.3",
-                "caniuse-lite": "1.0.30001655",
+                "caniuse-lite": "1.0.30001669",
                 "concurrently": "5.3.0",
                 "cors": "2.8.5",
                 "cross-env": "7.0.3",
@@ -106,7 +106,7 @@
                 "redux-mock-store": "1.5.4",
                 "rimraf": "3.0.2",
                 "source-map-explorer": "2.5.3",
-                "start-server-and-test": "2.0.5",
+                "start-server-and-test": "2.0.8",
                 "tmpl": "1.0.5",
                 "yaml": "1.10.2"
             },
@@ -5405,9 +5405,9 @@
             }
         },
         "node_modules/@types/jest": {
-            "version": "29.5.12",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/jest/-/jest-29.5.12.tgz",
-            "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+            "version": "29.5.13",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/jest/-/jest-29.5.13.tgz",
+            "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
             "dependencies": {
                 "expect": "^29.0.0",
                 "pretty-format": "^29.0.0"
@@ -5419,6 +5419,9 @@
             "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
             "engines": {
                 "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
         "node_modules/@types/jest/node_modules/pretty-format": {
@@ -6661,9 +6664,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.4",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.4.tgz",
-            "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+            "version": "1.7.7",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
                 "form-data": "^4.0.0",
@@ -6671,9 +6674,9 @@
             }
         },
         "node_modules/axios/node_modules/form-data": {
-            "version": "4.0.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/form-data/-/form-data-4.0.0.tgz",
-            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "version": "4.0.1",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/form-data/-/form-data-4.0.1.tgz",
+            "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
@@ -7409,9 +7412,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001655",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-            "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+            "version": "1.0.30001669",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+            "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -9399,9 +9402,9 @@
             }
         },
         "node_modules/dompurify": {
-            "version": "3.1.6",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/dompurify/-/dompurify-3.1.6.tgz",
-            "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ=="
+            "version": "3.1.7",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/dompurify/-/dompurify-3.1.7.tgz",
+            "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ=="
         },
         "node_modules/domutils": {
             "version": "3.1.0",
@@ -17808,11 +17811,15 @@
             }
         },
         "node_modules/loglevel": {
-            "version": "1.9.1",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/loglevel/-/loglevel-1.9.1.tgz",
-            "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==",
+            "version": "1.9.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/loglevel/-/loglevel-1.9.2.tgz",
+            "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==",
             "engines": {
                 "node": ">= 0.6.0"
+            },
+            "funding": {
+                "type": "tidelift",
+                "url": "https://tidelift.com/funding/github/npm/loglevel"
             }
         },
         "node_modules/loose-envify": {
@@ -23008,9 +23015,9 @@
             }
         },
         "node_modules/react-toastify": {
-            "version": "10.0.5",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-toastify/-/react-toastify-10.0.5.tgz",
-            "integrity": "sha512-mNKt2jBXJg4O7pSdbNUfDdTsK9FIdikfsIE/yUCxbAEXl4HMyJaivrVFcn3Elvt5xvCQYhUZm+hqTIu1UXM3Pw==",
+            "version": "10.0.6",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-toastify/-/react-toastify-10.0.6.tgz",
+            "integrity": "sha512-yYjp+omCDf9lhZcrZHKbSq7YMuK0zcYkDFTzfRFgTXkTFHZ1ToxwAonzA4JI5CxA91JpjFLmwEsZEgfYfOqI1A==",
             "dependencies": {
                 "clsx": "^2.1.0"
             },
@@ -24501,20 +24508,83 @@
             }
         },
         "node_modules/serve-static": {
-            "version": "1.16.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.0.tgz",
-            "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
+            "version": "1.16.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
             "dev": true,
             "dependencies": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/serve-static/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/serve-static/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/serve-static/node_modules/encodeurl": {
+            "version": "2.0.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/serve-static/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
+        },
+        "node_modules/serve-static/node_modules/send": {
+            "version": "0.19.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
             },
             "engines": {
                 "node": ">= 0.8.0"
             }
         },
+        "node_modules/serve-static/node_modules/send/node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
         "node_modules/set-blocking": {
             "version": "2.0.0",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -25320,19 +25390,19 @@
             "dev": true
         },
         "node_modules/start-server-and-test": {
-            "version": "2.0.5",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/start-server-and-test/-/start-server-and-test-2.0.5.tgz",
-            "integrity": "sha512-2CV4pz69NJVJKQmJeSr+O+SPtOreu0yxvhPmSXclzmAKkPREuMabyMh+Txpzemjx0RDzXOcG2XkhiUuxjztSQw==",
+            "version": "2.0.8",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/start-server-and-test/-/start-server-and-test-2.0.8.tgz",
+            "integrity": "sha512-v2fV6NV2F7tL1ocwfI4Wpait+IKjRbT5l3ZZ+ZikXdMLmxYsS8ynGAsCQAUVXkVyGyS+UibsRnvgHkMvJIvCsw==",
             "dev": true,
             "dependencies": {
                 "arg": "^5.0.2",
                 "bluebird": "3.7.2",
                 "check-more-types": "2.24.0",
-                "debug": "4.3.6",
+                "debug": "4.3.7",
                 "execa": "5.1.1",
                 "lazy-ass": "1.6.0",
                 "ps-tree": "1.2.0",
-                "wait-on": "7.2.0"
+                "wait-on": "8.0.1"
             },
             "bin": {
                 "server-test": "src/bin/start.js",
@@ -25343,6 +25413,23 @@
                 "node": ">=16"
             }
         },
+        "node_modules/start-server-and-test/node_modules/debug": {
+            "version": "4.3.7",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/debug/-/debug-4.3.7.tgz",
+            "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/start-server-and-test/node_modules/execa": {
             "version": "5.1.1",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/execa/-/execa-5.1.1.tgz",
@@ -25387,6 +25474,12 @@
                 "node": ">=10.17.0"
             }
         },
+        "node_modules/start-server-and-test/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
+        },
         "node_modules/static-eval": {
             "version": "2.0.2",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/static-eval/-/static-eval-2.0.2.tgz",
@@ -27463,13 +27556,13 @@
             }
         },
         "node_modules/wait-on": {
-            "version": "7.2.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wait-on/-/wait-on-7.2.0.tgz",
-            "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
+            "version": "8.0.1",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wait-on/-/wait-on-8.0.1.tgz",
+            "integrity": "sha512-1wWQOyR2LVVtaqrcIL2+OM+x7bkpmzVROa0Nf6FryXkS+er5Sa1kzFGjzZRqLnHa3n1rACFLeTwUqE1ETL9Mig==",
             "dev": true,
             "dependencies": {
-                "axios": "^1.6.1",
-                "joi": "^17.11.0",
+                "axios": "^1.7.7",
+                "joi": "^17.13.3",
                 "lodash": "^4.17.21",
                 "minimist": "^1.2.8",
                 "rxjs": "^7.8.1"
diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json
index 524403c109..e43b3ec255 100644
--- a/api-catalog-ui/frontend/package.json
+++ b/api-catalog-ui/frontend/package.json
@@ -15,7 +15,7 @@
         "@mui/material": "5.15.18",
         "@react-loadable/revised": "1.5.0",
         "@types/enzyme": "3.10.18",
-        "@types/jest": "29.5.12",
+        "@types/jest": "29.5.13",
         "@types/react": "18.2.79",
         "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
         "agentkeepalive": "4.5.0",
@@ -26,7 +26,7 @@
         "htmr": "1.0.2",
         "install": "0.13.0",
         "lodash": "4.17.21",
-        "loglevel": "1.9.1",
+        "loglevel": "1.9.2",
         "openapi-snippet": "0.14.0",
         "react": "18.3.1",
         "react-app-polyfill": "3.0.0",
@@ -34,7 +34,7 @@
         "react-hook-form": "7.51.5",
         "react-redux": "9.1.2",
         "react-router-dom": "5.3.4",
-        "react-toastify": "10.0.5",
+        "react-toastify": "10.0.6",
         "redux": "5.0.1",
         "redux-catch": "1.3.1",
         "redux-logger": "3.0.6",
@@ -87,7 +87,7 @@
         "ajv": "8.13.0",
         "ansi-regex": "5.0.1",
         "body-parser": "1.20.3",
-        "caniuse-lite": "1.0.30001655",
+        "caniuse-lite": "1.0.30001669",
         "concurrently": "5.3.0",
         "cors": "2.8.5",
         "cross-env": "7.0.3",
@@ -126,7 +126,7 @@
         "redux-mock-store": "1.5.4",
         "rimraf": "3.0.2",
         "source-map-explorer": "2.5.3",
-        "start-server-and-test": "2.0.5",
+        "start-server-and-test": "2.0.8",
         "tmpl": "1.0.5",
         "yaml": "1.10.2"
     },
@@ -141,10 +141,10 @@
         "lodash": "4.17.21",
         "semver": "7.6.3",
         "@babel/traverse": "7.24.7",
-        "dompurify": "3.1.6",
-        "serve-static": "1.16.0",
+        "dompurify": "3.1.7",
+        "serve-static": "1.16.2",
         "body-parser": "1.20.3",
-        "axios": "1.7.4"
+        "axios": "1.7.7"
     },
     "engines": {
         "npm": "=9.3.1",
diff --git a/apiml-common/build.gradle b/apiml-common/build.gradle
index a417bc38ac..d5ab44727d 100644
--- a/apiml-common/build.gradle
+++ b/apiml-common/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     implementation libs.spring.boot.starter.actuator
     implementation libs.spring.cloud.commons
     implementation libs.spring.cloud.starter.bootstrap
-    implementation libs.spring.eureka.client.v3
+    implementation libs.spring.cloud.starter.eureka
     implementation libs.spring.boot.starter.web
     implementation libs.spring.web
     implementation libs.spring.webmvc
diff --git a/cloud-gateway-service/build.gradle b/cloud-gateway-service/build.gradle
index 9cbbf6bc38..cde3737d9b 100644
--- a/cloud-gateway-service/build.gradle
+++ b/cloud-gateway-service/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation libs.netty.reactor.core
     implementation libs.netty.reactor.http
 
-    implementation libs.spring.eureka.client.v3
+    implementation libs.spring.cloud.starter.eureka
     implementation libs.spring.boot.starter.security
 
     implementation libs.jackson.databind
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index 73d48fe739..876ffa1ff9 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -7,8 +7,9 @@ dependencyResolutionManagement {
 
             version('springBoot', '2.7.18')
             version('springCloud', '2.2.10.RELEASE')
-            version('springCloudCommons', '3.1.8')
-            version('springCloudVersion3', '3.1.8')
+            version('springCloudCommons', '3.1.9')
+            version('springCloudVersion3', '3.1.9')
+            version('springCloudNetflix', '3.1.8')
             version('springCloudCB', '2.1.8')
             version('springCloudGateway', '3.1.9')
             version('springSecurity') {
@@ -26,7 +27,7 @@ dependencyResolutionManagement {
             version('zosUtils', '2.0.5')
             version('archaius', '0.7.12')
             version('awaitility', '4.2.2')
-            version('awsJavaSdk', '1.12.770')
+            version('awsJavaSdk', '1.12.773')
             version('bouncyCastle', '1.78.1')
             // forced version in root gradle.build file. Version 3.x requieres Java 11
             version('caffeine', '2.9.3')
@@ -40,7 +41,7 @@ dependencyResolutionManagement {
             version('ehCache', '3.10.8')
             version('eureka', '1.10.18')
             version('findBugs', '3.0.2')
-            version('githubClassgraph', '4.8.175')
+            version('githubClassgraph', '4.8.177')
             version('gradleGitProperties', '2.2.4') // Used in classpath dependencies
             version('gradleNode', '3.6.0') // Used in classpath dependencies
             version('gson', '2.11.0')
@@ -98,11 +99,11 @@ dependencyResolutionManagement {
             }
             version('netflixCommonsUtil', '0.3.0')
             version('netflixServo', '0.13.2')
-            version('netty', '4.1.112.Final')
-            version('nettyReactor', '1.1.22')
+            version('netty', '4.1.114.Final')
+            version('nettyReactor', '1.1.23')
             version('nimbusJoseJwt', '9.40')
             version('openApiDiff', '2.0.1')
-            version('ow2asm', '9.7')
+            version('ow2asm', '9.7.1')
             version('picocli', '4.7.6')
 
             // version 2.4 has a breaking change, ie. missing DefaultClientConfigImpl
@@ -123,13 +124,13 @@ dependencyResolutionManagement {
                 strictly '[1.6.15, 1.7.0['
                 prefer '1.6.15'
             }
-            version('swagger3Core', '2.2.23')
+            version('swagger3Core', '2.2.25')
             version('swagger3Parser', '2.1.22')
             version('swaggerCore', '1.6.14')
             version('swaggerInflector', '2.0.12')
-            version('swaggerJaxrs2', '2.2.23')
+            version('swaggerJaxrs2', '2.2.25')
             version('thymeleaf', '3.1.2.RELEASE')
-            version('tomcat', '9.0.93')
+            version('tomcat', '9.0.96')
             version('velocity', '2.4')
             version('woodstoxCore', '6.7.0')
             version('woodstoxStax2', '4.2.2')
@@ -187,9 +188,8 @@ dependencyResolutionManagement {
             library('spring_cloud_starter', 'org.springframework.cloud', 'spring-cloud-starter').versionRef('springCloudVersion3')
             library('spring_cloud_starter_bootstrap', 'org.springframework.cloud', 'spring-cloud-starter-bootstrap').versionRef('springCloudVersion3')
             library('spring_cloud_starter_zuul', 'org.springframework.cloud', 'spring-cloud-starter-netflix-zuul').versionRef('springCloud')
-            library('spring_cloud_starter_eureka', 'org.springframework.cloud', 'spring-cloud-starter-netflix-eureka-client').versionRef('springCloudVersion3')
-            library('spring_eureka_client_v3', 'org.springframework.cloud', 'spring-cloud-starter-netflix-eureka-client').versionRef('springCloudVersion3')
-            library('spring_cloud_starter_eureka_server', 'org.springframework.cloud', 'spring-cloud-starter-netflix-eureka-server').versionRef('springCloudVersion3')
+            library('spring_cloud_starter_eureka', 'org.springframework.cloud', 'spring-cloud-starter-netflix-eureka-client').versionRef('springCloudNetflix')
+            library('spring_cloud_starter_eureka_server', 'org.springframework.cloud', 'spring-cloud-starter-netflix-eureka-server').versionRef('springCloudNetflix')
             library('spring_cloud_starter_ribbon', 'org.springframework.cloud', 'spring-cloud-starter-netflix-ribbon').versionRef('springCloud')
             library('spring_cloud_starter_hystrix', 'org.springframework.cloud', 'spring-cloud-starter-netflix-hystrix').versionRef('springCloud')
             library('spring_cloud_starter_turbine', 'org.springframework.cloud', 'spring-cloud-starter-netflix-turbine').versionRef('springCloud')
diff --git a/metrics-service-ui/frontend/package-lock.json b/metrics-service-ui/frontend/package-lock.json
index 1a7515d9c3..fca17f58b1 100644
--- a/metrics-service-ui/frontend/package-lock.json
+++ b/metrics-service-ui/frontend/package-lock.json
@@ -11,7 +11,7 @@
                 "@material-ui/core": "4.12.4",
                 "@material-ui/icons": "4.11.3",
                 "@wojtekmaj/enzyme-adapter-react-17": "0.6.7",
-                "axios": "1.7.4",
+                "axios": "1.7.7",
                 "history": "4.10.1",
                 "lodash": "4.17.21",
                 "loglevel": "1.7.1",
@@ -5424,9 +5424,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.4",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.4.tgz",
-            "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+            "version": "1.7.7",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
                 "form-data": "^4.0.0",
@@ -8073,9 +8073,9 @@
             }
         },
         "node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "version": "2.0.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
             "dev": true,
             "engines": {
                 "node": ">= 0.8"
@@ -9420,60 +9420,12 @@
                 "node": ">= 0.8"
             }
         },
-        "node_modules/express/node_modules/encodeurl": {
-            "version": "2.0.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
         "node_modules/express/node_modules/ms": {
             "version": "2.0.0",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
             "dev": true
         },
-        "node_modules/express/node_modules/send": {
-            "version": "0.19.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
-            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-            "dev": true,
-            "dependencies": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/express/node_modules/send/node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/express/node_modules/send/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true
-        },
         "node_modules/express/node_modules/statuses": {
             "version": "2.0.1",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/statuses/-/statuses-2.0.1.tgz",
@@ -9786,15 +9738,6 @@
                 "ms": "2.0.0"
             }
         },
-        "node_modules/finalhandler/node_modules/encodeurl": {
-            "version": "2.0.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
         "node_modules/finalhandler/node_modules/ms": {
             "version": "2.0.0",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.0.0.tgz",
@@ -9856,9 +9799,9 @@
             "license": "ISC"
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.8",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/follow-redirects/-/follow-redirects-1.15.8.tgz",
-            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
+            "version": "1.15.9",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -21929,9 +21872,9 @@
             }
         },
         "node_modules/send": {
-            "version": "0.18.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "version": "0.19.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
             "dev": true,
             "dependencies": {
                 "debug": "2.6.9",
@@ -21976,6 +21919,15 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/send/node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
         "node_modules/send/node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
@@ -22054,15 +22006,15 @@
             "license": "ISC"
         },
         "node_modules/serve-static": {
-            "version": "1.16.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.0.tgz",
-            "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
+            "version": "1.16.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
             "dev": true,
             "dependencies": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
             },
             "engines": {
                 "node": ">= 0.8.0"
@@ -28377,11 +28329,11 @@
             "dev": true
         },
         "axios": {
-            "version": "1.7.4",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.4.tgz",
-            "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+            "version": "1.7.7",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "requires": {
-                "follow-redirects": "1.15.8",
+                "follow-redirects": "1.15.9",
                 "form-data": "^4.0.0",
                 "proxy-from-env": "^1.1.0"
             },
@@ -30137,9 +30089,9 @@
             "dev": true
         },
         "encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "version": "2.0.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
             "dev": true
         },
         "end-of-stream": {
@@ -31022,7 +30974,7 @@
                 "range-parser": "~1.2.1",
                 "safe-buffer": "5.2.1",
                 "send": "0.19.0",
-                "serve-static": "1.16.0",
+                "serve-static": "1.16.2",
                 "setprototypeof": "1.2.0",
                 "statuses": "2.0.1",
                 "type-is": "~1.6.18",
@@ -31045,53 +30997,12 @@
                     "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
                     "dev": true
                 },
-                "encodeurl": {
-                    "version": "2.0.0",
-                    "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-                    "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-                    "dev": true
-                },
                 "ms": {
                     "version": "2.0.0",
                     "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.0.0.tgz",
                     "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
                     "dev": true
                 },
-                "send": {
-                    "version": "0.19.0",
-                    "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
-                    "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-                    "dev": true,
-                    "requires": {
-                        "debug": "2.6.9",
-                        "depd": "2.0.0",
-                        "destroy": "1.2.0",
-                        "encodeurl": "~1.0.2",
-                        "escape-html": "~1.0.3",
-                        "etag": "~1.8.1",
-                        "fresh": "0.5.2",
-                        "http-errors": "2.0.0",
-                        "mime": "1.6.0",
-                        "ms": "2.1.3",
-                        "on-finished": "2.4.1",
-                        "range-parser": "~1.2.1",
-                        "statuses": "2.0.1"
-                    },
-                    "dependencies": {
-                        "encodeurl": {
-                            "version": "1.0.2",
-                            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
-                            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-                            "dev": true
-                        },
-                        "ms": {
-                            "version": "2.1.3",
-                            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
-                            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-                            "dev": true
-                        }
-                    }
-                },
                 "statuses": {
                     "version": "2.0.1",
                     "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/statuses/-/statuses-2.0.1.tgz",
@@ -31313,12 +31224,6 @@
                         "ms": "2.0.0"
                     }
                 },
-                "encodeurl": {
-                    "version": "2.0.0",
-                    "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-                    "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-                    "dev": true
-                },
                 "ms": {
                     "version": "2.0.0",
                     "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.0.0.tgz",
@@ -31363,9 +31268,9 @@
             "dev": true
         },
         "follow-redirects": {
-            "version": "1.15.8",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/follow-redirects/-/follow-redirects-1.15.8.tgz",
-            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig=="
+            "version": "1.15.9",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
         },
         "for-each": {
             "version": "0.3.3",
@@ -31995,7 +31900,7 @@
             "dev": true,
             "requires": {
                 "eventemitter3": "^4.0.0",
-                "follow-redirects": "1.15.8",
+                "follow-redirects": "1.15.9",
                 "requires-port": "^1.0.0"
             }
         },
@@ -39272,9 +39177,9 @@
             "dev": true
         },
         "send": {
-            "version": "0.18.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "version": "0.19.0",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
@@ -39315,6 +39220,12 @@
                     "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
                     "dev": true
                 },
+                "encodeurl": {
+                    "version": "1.0.2",
+                    "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
+                    "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+                    "dev": true
+                },
                 "ms": {
                     "version": "2.1.3",
                     "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.3.tgz",
@@ -39381,15 +39292,15 @@
             }
         },
         "serve-static": {
-            "version": "1.16.0",
-            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.0.tgz",
-            "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
+            "version": "1.16.2",
+            "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
             "dev": true,
             "requires": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
             }
         },
         "set-function-length": {
diff --git a/metrics-service-ui/frontend/package.json b/metrics-service-ui/frontend/package.json
index eab2082a82..5ce22f76a1 100644
--- a/metrics-service-ui/frontend/package.json
+++ b/metrics-service-ui/frontend/package.json
@@ -7,7 +7,7 @@
         "@material-ui/core": "4.12.4",
         "@material-ui/icons": "4.11.3",
         "@wojtekmaj/enzyme-adapter-react-17": "0.6.7",
-        "axios": "1.7.4",
+        "axios": "1.7.7",
         "history": "4.10.1",
         "lodash": "4.17.21",
         "loglevel": "1.7.1",
@@ -69,10 +69,10 @@
         "got": "12.1.0",
         "tough-cookie": "4.1.4",
         "resolve-url-loader": "5.0.0",
-        "follow-redirects": "1.15.8",
+        "follow-redirects": "1.15.9",
         "webpack-dev-middleware": "5.3.4",
         "@babel/traverse": "7.24.7",
-        "serve-static": "1.16.0",
+        "serve-static": "1.16.2",
         "body-parser": "1.20.3"
     },
     "scripts": {
diff --git a/onboarding-enabler-nodejs-sample-app/package-lock.json b/onboarding-enabler-nodejs-sample-app/package-lock.json
index d795458faf..e89bf05b04 100644
--- a/onboarding-enabler-nodejs-sample-app/package-lock.json
+++ b/onboarding-enabler-nodejs-sample-app/package-lock.json
@@ -286,9 +286,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -389,14 +389,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/extend/-/extend-3.0.2.tgz",
@@ -437,14 +429,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/finalhandler/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -932,14 +916,14 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "0.19.1",
+      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/send/-/send-0.19.1.tgz",
+      "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
@@ -955,14 +939,14 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.16.0",
-      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.0.tgz",
-      "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
+      "version": "1.16.2",
+      "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
diff --git a/onboarding-enabler-nodejs-sample-app/package.json b/onboarding-enabler-nodejs-sample-app/package.json
index 2623299987..86897db8f8 100755
--- a/onboarding-enabler-nodejs-sample-app/package.json
+++ b/onboarding-enabler-nodejs-sample-app/package.json
@@ -20,9 +20,9 @@
   "overrides": {
     "tough-cookie": "4.1.4",
     "ms": "2.1.3",
-    "serve-static": "1.16.0",
+    "serve-static": "1.16.2",
     "body-parser": "1.20.3",
-    "send": "0.19.0"
+    "send": "0.19.1"
   },
   "engines": {
     "npm": "=8.19.4",