diff --git a/client/package.json b/client/package.json
index 787060b79c..1e49d341f5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -28,7 +28,7 @@
     "@patternfly/patternfly": "^5.0.2",
     "@patternfly/react-charts": "^7.1.0",
     "@patternfly/react-code-editor": "^5.1.0",
-    "@patternfly/react-core": "^5.1.0",
+    "@patternfly/react-core": "^5.2.1",
     "@patternfly/react-table": "^5.1.0",
     "@patternfly/react-tokens": "^5.1.0",
     "@react-keycloak/web": "^3.4.0",
diff --git a/package-lock.json b/package-lock.json
index 6ed9531d8d..1caa05e411 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "@patternfly/patternfly": "^5.0.2",
         "@patternfly/react-charts": "^7.1.0",
         "@patternfly/react-code-editor": "^5.1.0",
-        "@patternfly/react-core": "^5.1.0",
+        "@patternfly/react-core": "^5.2.1",
         "@patternfly/react-table": "^5.1.0",
         "@patternfly/react-tokens": "^5.1.0",
         "@react-keycloak/web": "^3.4.0",
@@ -1694,15 +1694,14 @@
       }
     },
     "node_modules/@patternfly/react-core": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.1.0.tgz",
-      "integrity": "sha512-m6MtCQsWiyGM40L4oLc2aEFlxT8egdoz/58Q2oW1fMkqUaosuNUiwy9/e8zOM3SLOPOo/Qo9cetQkIHVQppCvw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.2.1.tgz",
+      "integrity": "sha512-SWQHALhcjxjmwcIJ6V3tG6V7a2M0WkkUbc6F8mSPk6l9q6j3f+WvZ9HqgzVA+h+Q12UbtIrlQvgUx7pAxZekkg==",
       "dependencies": {
-        "@patternfly/patternfly": "5.0.2",
-        "@patternfly/react-icons": "^5.1.0",
-        "@patternfly/react-styles": "^5.1.0",
-        "@patternfly/react-tokens": "^5.1.0",
-        "focus-trap": "7.4.3",
+        "@patternfly/react-icons": "^5.2.1",
+        "@patternfly/react-styles": "^5.2.1",
+        "@patternfly/react-tokens": "^5.2.1",
+        "focus-trap": "7.5.2",
         "react-dropzone": "^14.2.3",
         "tslib": "^2.5.0"
       },
@@ -1711,40 +1710,19 @@
         "react-dom": "^17 || ^18"
       }
     },
-    "node_modules/@patternfly/react-core/node_modules/@patternfly/patternfly": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz",
-      "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ=="
-    },
     "node_modules/@patternfly/react-icons": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.1.0.tgz",
-      "integrity": "sha512-mSFAJMrT6QUQ10DifYYGSXOPlFob88lWPZXeOyPdstJ8cJRRRVTMYgoR/VnXsUO/vthwFbViY+sS6+/jL8pl9w==",
-      "dependencies": {
-        "@patternfly/patternfly": "5.0.2"
-      },
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.2.1.tgz",
+      "integrity": "sha512-aeJ0X+U2NDe8UmI5eQiT0iuR/wmUq97UkDtx3HoZcpRb9T6eUBfysllxjRqHS8rOOspdU8OWq+CUhQ/E2ZDibg==",
       "peerDependencies": {
         "react": "^17 || ^18",
         "react-dom": "^17 || ^18"
       }
     },
-    "node_modules/@patternfly/react-icons/node_modules/@patternfly/patternfly": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz",
-      "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ=="
-    },
     "node_modules/@patternfly/react-styles": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.1.0.tgz",
-      "integrity": "sha512-RnVS/v1PZuvnXXmPtJamuAprq1lg6tqw6dbeYbm9KmBNXSuB1Iu5fc6kjzrdoSLKBmf6rzpRmafYm2HRwFcrLw==",
-      "dependencies": {
-        "@patternfly/patternfly": "5.0.2"
-      }
-    },
-    "node_modules/@patternfly/react-styles/node_modules/@patternfly/patternfly": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz",
-      "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.2.1.tgz",
+      "integrity": "sha512-GT96hzI1QenBhq6Pfc51kxnj9aVLjL1zSLukKZXcYVe0HPOy0BFm90bT1Fo4e/z7V9cDYw4SqSX1XLc3O4jsTw=="
     },
     "node_modules/@patternfly/react-table": {
       "version": "5.1.0",
@@ -1764,17 +1742,9 @@
       }
     },
     "node_modules/@patternfly/react-tokens": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.1.0.tgz",
-      "integrity": "sha512-HRBoS3JMbW8vWqz91oW2NGUdLndC40TXvMnEaORNd/I25czOquxnx/HxVh+/bdSkNqByj6+fiTwH2X3fL2Cajg==",
-      "dependencies": {
-        "@patternfly/patternfly": "5.0.2"
-      }
-    },
-    "node_modules/@patternfly/react-tokens/node_modules/@patternfly/patternfly": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz",
-      "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.2.1.tgz",
+      "integrity": "sha512-8GYz/jnJTGAWUJt5eRAW5dtyiHPKETeFJBPGHaUQnvi/t1ZAkoy8i4Kd/RlHsDC7ktiu813SKCmlzwBwldAHKg=="
     },
     "node_modules/@pkgr/utils": {
       "version": "2.4.2",
@@ -7538,11 +7508,11 @@
       "dev": true
     },
     "node_modules/focus-trap": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.3.tgz",
-      "integrity": "sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz",
+      "integrity": "sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==",
       "dependencies": {
-        "tabbable": "^6.1.2"
+        "tabbable": "^6.2.0"
       }
     },
     "node_modules/follow-redirects": {