diff --git a/springdoc-openapi-starter-common-mcp/src/main/frontend/package-lock.json b/springdoc-openapi-starter-common-mcp/src/main/frontend/package-lock.json
index 1700c6b8fe..e69eafe6a1 100644
--- a/springdoc-openapi-starter-common-mcp/src/main/frontend/package-lock.json
+++ b/springdoc-openapi-starter-common-mcp/src/main/frontend/package-lock.json
@@ -8,7 +8,7 @@
       "name": "mcp-dashboard",
       "version": "0.0.0",
       "dependencies": {
-        "@rjsf/core": "^5.24.7",
+        "@rjsf/core": "^6.11.0",
         "@rjsf/utils": "^5.24.7",
         "@rjsf/validator-ajv8": "^5.24.7",
         "@tanstack/react-query": "^5.105.3",
@@ -857,22 +857,19 @@
       }
     },
     "node_modules/@rjsf/core": {
-      "version": "5.24.13",
-      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.24.13.tgz",
-      "integrity": "sha512-ONTr14s7LFIjx2VRFLuOpagL76sM/HPy6/OhdBfq6UukINmTIs6+aFN0GgcR0aXQHFDXQ7f/fel0o/SO05Htdg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.11.0.tgz",
+      "integrity": "sha512-8Hp3nd2RysjfmxHKy3/1GJtdAaDBt9VkU/c+pSXrs332BvliJM/Tp/QXTTnHYKYUSi1klFTygnvq1ujSefpcug==",
       "license": "Apache-2.0",
       "dependencies": {
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "markdown-to-jsx": "^7.4.1",
-        "prop-types": "^15.8.1"
+        "markdown-to-jsx": "^9.8.2"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=20"
       },
       "peerDependencies": {
-        "@rjsf/utils": "^5.24.x",
-        "react": "^16.14.0 || >=17"
+        "@rjsf/utils": "^6.11.0",
+        "react": ">=18"
       }
     },
     "node_modules/@rjsf/utils": {
@@ -2030,6 +2027,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/jsesc": {
@@ -2128,18 +2126,6 @@
       "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
       "license": "MIT"
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -2160,19 +2146,30 @@
       }
     },
     "node_modules/markdown-to-jsx": {
-      "version": "7.7.17",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.7.17.tgz",
-      "integrity": "sha512-7mG/1feQ0TX5I7YyMZVDgCC/y2I3CiEhIRQIhyov9nGBP5eoVrOXXHuL5ZP8GRfxVZKRiXWJgwXkb9It+nQZfQ==",
+      "version": "9.10.4",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-9.10.4.tgz",
+      "integrity": "sha512-l0jxHMVbWzE2AWzBpNrxZAMcjZfpUOMjzK/AWTzvto2Oc+eki3WNEMMwTYHeM/ZogjbHbg1A518ytYMsHcMjVQ==",
       "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "react": ">= 0.14.0"
+        "react": ">= 16.0.0",
+        "solid-js": ">=1.0.0",
+        "vue": ">=3.0.0"
       },
       "peerDependenciesMeta": {
         "react": {
           "optional": true
+        },
+        "react-native": {
+          "optional": true
+        },
+        "solid-js": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
         }
       }
     },
@@ -2262,6 +2259,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -2487,23 +2485,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/prop-types/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
diff --git a/springdoc-openapi-starter-common-mcp/src/main/frontend/package.json b/springdoc-openapi-starter-common-mcp/src/main/frontend/package.json
index 6c15a8f2f9..e077183eac 100644
--- a/springdoc-openapi-starter-common-mcp/src/main/frontend/package.json
+++ b/springdoc-openapi-starter-common-mcp/src/main/frontend/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@rjsf/core": "^5.24.7",
+    "@rjsf/core": "^6.11.0",
     "@rjsf/utils": "^5.24.7",
     "@rjsf/validator-ajv8": "^5.24.7",
     "@tanstack/react-query": "^5.105.3",