diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7dfb18246..7965ede2f 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -47,15 +47,9 @@
     "lint:style:fix": "yarn lint:style --fix"
   },
   "dependencies": {
-    "@kaoto-next/uniforms-patternfly": "^0.6.15",
+    "@kaoto-next/uniforms-patternfly": "^0.7.1",
     "@kie-tools-core/editor": "0.32.0",
     "@kie-tools-core/notifications": "0.32.0",
-    "@patternfly/patternfly": "5.3.1",
-    "@patternfly/react-code-editor": "5.3.4",
-    "@patternfly/react-core": "5.3.4",
-    "@patternfly/react-icons": "5.3.2",
-    "@patternfly/react-table": "5.3.4",
-    "@patternfly/react-topology": "5.4.0-prerelease.13",
     "@types/uuid": "^10.0.0",
     "ajv": "^8.12.0",
     "ajv-draft-04": "^1.0.0",
@@ -68,10 +62,6 @@
     "lodash.memoize": "^4.1.2",
     "lodash.set": "^4.3.2",
     "monaco-editor": "^0.50.0",
-    "monaco-yaml": "^5.1.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-monaco-editor": "^0.56.0",
     "react-router-dom": "^6.14.1",
     "simple-zustand-devtools": "^1.1.0",
     "uniforms": "4.0.0-alpha.5",
@@ -81,12 +71,30 @@
     "yaml": "^2.3.2",
     "zustand": "^4.3.9"
   },
+  "peerDependencies": {
+    "@patternfly/patternfly": "^5.3.0",
+    "@patternfly/react-code-editor": "^5.3.0",
+    "@patternfly/react-core": "^5.3.0",
+    "@patternfly/react-icons": "^5.3.0",
+    "@patternfly/react-table": "^5.3.0",
+    "@patternfly/react-topology": "^5.3.0",
+    "monaco-yaml": "^5.1.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-monaco-editor": "^0.56.0"
+  },
   "devDependencies": {
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.21.5",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.21.5",
     "@kaoto/camel-catalog": "workspace:*",
+    "@patternfly/patternfly": "5.3.1",
+    "@patternfly/react-code-editor": "5.3.4",
+    "@patternfly/react-core": "5.3.4",
+    "@patternfly/react-icons": "5.3.2",
+    "@patternfly/react-table": "5.3.4",
+    "@patternfly/react-topology": "5.4.0-prerelease.13",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
@@ -116,7 +124,11 @@
     "jest": "^29.4.2",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.4.2",
+    "monaco-yaml": "^5.1.1",
     "prettier": "^3.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-monaco-editor": "^0.56.0",
     "react-test-renderer": "^18.2.0",
     "rimraf": "^6.0.0",
     "sass": "^1.63.6",
diff --git a/yarn.lock b/yarn.lock
index 8a3ee077d..368ab616f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2343,16 +2343,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kaoto-next/uniforms-patternfly@npm:^0.6.15":
-  version: 0.6.15
-  resolution: "@kaoto-next/uniforms-patternfly@npm:0.6.15"
+"@kaoto-next/uniforms-patternfly@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "@kaoto-next/uniforms-patternfly@npm:0.7.1"
   dependencies:
     invariant: ^2.2.4
-    lodash: ^4.17.21
+    lodash.clonedeep: ^4.5.0
+    uniforms: 4.0.0-alpha.5
+  peerDependencies:
+    "@patternfly/react-core": ^5.0.0
+    "@patternfly/react-icons": ^5.0.0
     react: ^18.2.0
     react-dom: ^18.2.0
-    uniforms: 4.0.0-alpha.5
-  checksum: 7be378c7867962bf1d458fb9787eb3ec1699c198ee4fc958b90d868f3ad4be62c40db78bdec9899be85980bad8e96afb397ef28b86593e4310b77e72eba6d23c
+  checksum: d07b18d0438dd6aabfe995851fc7177eb27bdfb632e299a8cdb4fe366ccd5000d6756fb2f3042c70ef4c13ac73c676461b9608b45904e26486aeadea57115293
   languageName: node
   linkType: hard
 
@@ -2442,7 +2445,7 @@ __metadata:
     "@babel/preset-env": ^7.21.5
     "@babel/preset-react": ^7.18.6
     "@babel/preset-typescript": ^7.21.5
-    "@kaoto-next/uniforms-patternfly": ^0.6.15
+    "@kaoto-next/uniforms-patternfly": ^0.7.1
     "@kaoto/camel-catalog": "workspace:*"
     "@kie-tools-core/editor": 0.32.0
     "@kie-tools-core/notifications": 0.32.0
@@ -2518,6 +2521,17 @@ __metadata:
     vite-plugin-static-copy: ^1.0.6
     yaml: ^2.3.2
     zustand: ^4.3.9
+  peerDependencies:
+    "@patternfly/patternfly": ^5.3.0
+    "@patternfly/react-code-editor": ^5.3.0
+    "@patternfly/react-core": ^5.3.0
+    "@patternfly/react-icons": ^5.3.0
+    "@patternfly/react-table": ^5.3.0
+    "@patternfly/react-topology": ^5.3.0
+    monaco-yaml: ^5.1.1
+    react: ^18.2.0
+    react-dom: ^18.2.0
+    react-monaco-editor: ^0.56.0
   languageName: unknown
   linkType: soft