diff --git a/package-lock.json b/package-lock.json
index cfe9d46f..4df1062d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
       "dependencies": {
         "@patternfly/patternfly": "^5.1.0",
         "@patternfly/react-charts": "^7.2.0-prerelease.2",
+        "@patternfly/react-component-groups": "^5.0.0",
         "@patternfly/react-core": "^5.1.1",
         "@patternfly/react-icons": "^5.1.1",
         "@patternfly/react-table": "^5.1.1",
@@ -2249,9 +2250,9 @@
       "integrity": "sha512-yqVFYsDIuGXSnSLwn7/pUW363StWjasc8jAUIDWUQ9PwidMv8Vp4TLdZ9QwycwNlkZyl+TVHroU0+2Oylkjhvw=="
     },
     "node_modules/@patternfly/react-component-groups": {
-      "version": "5.0.0-prerelease.7",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-component-groups/-/react-component-groups-5.0.0-prerelease.7.tgz",
-      "integrity": "sha512-i/rfl7fN9JrVlIbZ7GYVtcF4bXX40NEwdgb/IZppsvi+O5yEjbjGuBVHCj5e+9N69K+um92VukWfaBFfuYNTaA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-component-groups/-/react-component-groups-5.0.0.tgz",
+      "integrity": "sha512-ON4h4SKOCgLRgZLd/FOj44wU19ytvFPjflxPSYU0KfCWlVgb6F62+l316/Va/tzDo/AwZypnUxOEksXDv+C2+A==",
       "dependencies": {
         "@patternfly/react-core": "^5.1.1",
         "@patternfly/react-icons": "^5.1.1",
diff --git a/package.json b/package.json
index e11746b2..225a4af7 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
   "dependencies": {
     "@patternfly/patternfly": "^5.1.0",
     "@patternfly/react-charts": "^7.2.0-prerelease.2",
+    "@patternfly/react-component-groups": "^5.0.0",
     "@patternfly/react-core": "^5.1.1",
     "@patternfly/react-icons": "^5.1.1",
     "@patternfly/react-table": "^5.1.1",
diff --git a/src/routes/state/not-authorized/NotAuthorizedState.tsx b/src/routes/state/not-authorized/NotAuthorizedState.tsx
index 1249f634..257c556a 100644
--- a/src/routes/state/not-authorized/NotAuthorizedState.tsx
+++ b/src/routes/state/not-authorized/NotAuthorizedState.tsx
@@ -1,4 +1,4 @@
-import NotAuthorized from '@redhat-cloud-services/frontend-components/NotAuthorized';
+import NotAuthorized from '@patternfly/react-component-groups/dist/esm/NotAuthorized';
 import messages from 'locales/messages';
 import React from 'react';
 import { useIntl } from 'react-intl';
diff --git a/src/routes/state/not-available/NotAvailable.tsx b/src/routes/state/not-available/NotAvailable.tsx
index 17fbeea7..5dcdcc34 100644
--- a/src/routes/state/not-available/NotAvailable.tsx
+++ b/src/routes/state/not-available/NotAvailable.tsx
@@ -1,6 +1,6 @@
+import Unavailable from '@patternfly/react-component-groups/dist/esm/UnavailableContent';
 import { PageSection } from '@patternfly/react-core';
 import PageHeader, { PageHeaderTitle } from '@redhat-cloud-services/frontend-components/PageHeader';
-import Unavailable from '@redhat-cloud-services/frontend-components/Unavailable';
 import React from 'react';
 
 interface NotAvailablePropsOwnProps {