diff --git a/webpack/components/ConfirmModal.scss b/webpack/components/ConfirmModal.scss
index 16971e8e..0a5da91f 100644
--- a/webpack/components/ConfirmModal.scss
+++ b/webpack/components/ConfirmModal.scss
@@ -1,3 +1,3 @@
-.pf-c-backdrop {
+.pf-v5-c-backdrop {
   z-index: 1040;
 }
diff --git a/webpack/components/EmptyState.js b/webpack/components/EmptyState.js
index be7cfed1..f5d94806 100644
--- a/webpack/components/EmptyState.js
+++ b/webpack/components/EmptyState.js
@@ -39,7 +39,7 @@ const EmptyState = ({
   ouiaEmptyStateTitleId,
 }) => (
   <Bullseye>
-    <PfEmptyState variant={EmptyStateVariant.small}>
+    <PfEmptyState variant={EmptyStateVariant.sm}>
       <EmptyStateIcon error={!!error} search={search} lock={lock} />
       <Title ouiaId={ouiaEmptyStateTitleId} headingLevel="h2" size="lg">
         {title}
diff --git a/webpack/components/HostExtentions/HostKebabItems.js b/webpack/components/HostExtentions/HostKebabItems.js
index 76409e55..1d0ed977 100644
--- a/webpack/components/HostExtentions/HostKebabItems.js
+++ b/webpack/components/HostExtentions/HostKebabItems.js
@@ -1,6 +1,8 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { DropdownItem } from '@patternfly/react-core';
+import {
+	DropdownItem
+} from '@patternfly/react-core/deprecated';
 import { SecurityIcon } from '@patternfly/react-icons';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
diff --git a/webpack/components/IndexLayout.js b/webpack/components/IndexLayout.js
index e2057601..b0b63bd7 100644
--- a/webpack/components/IndexLayout.js
+++ b/webpack/components/IndexLayout.js
@@ -19,7 +19,7 @@ const IndexLayout = ({ pageTitle, children, contentWidthSpan }) => (
     </Helmet>
     <ToastsList />
     <Grid className="scap-page-grid">
-      <GridItem span={12} className="pf-u-pb-xl">
+      <GridItem span={12} className="pf-v5-u-pb-xl">
         <TextContent>
           <Text ouiaId="oscap-index-title" component={TextVariants.h1}>
             {pageTitle}
diff --git a/webpack/components/IndexTable/index.js b/webpack/components/IndexTable/index.js
index f96d8fa6..64244dcc 100644
--- a/webpack/components/IndexTable/index.js
+++ b/webpack/components/IndexTable/index.js
@@ -1,6 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import {
+	Table,
+	TableHeader,
+	TableBody
+} from '@patternfly/react-table/deprecated';
 import { Flex, FlexItem } from '@patternfly/react-core';
 import Pagination from 'foremanReact/components/Pagination';
 import { refreshPage } from './IndexTableHelper';
@@ -25,7 +29,7 @@ const IndexTable = ({
 
   return (
     <React.Fragment>
-      <Flex className="pf-u-pt-md">
+      <Flex className="pf-v5-u-pt-md">
         <FlexItem>{toolbarBtns}</FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
diff --git a/webpack/components/OpenscapRemediationWizard/Footer.js b/webpack/components/OpenscapRemediationWizard/Footer.js
index 870b3dcf..38eb631f 100644
--- a/webpack/components/OpenscapRemediationWizard/Footer.js
+++ b/webpack/components/OpenscapRemediationWizard/Footer.js
@@ -1,9 +1,11 @@
 import React from 'react';
 import {
-  Button,
-  WizardFooter,
-  WizardContextConsumer,
+	Button
 } from '@patternfly/react-core';
+import {
+	WizardFooter,
+	WizardContextConsumer
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { WIZARD_TITLES } from './constants';
 
diff --git a/webpack/components/OpenscapRemediationWizard/index.js b/webpack/components/OpenscapRemediationWizard/index.js
index 577c4530..35294a51 100644
--- a/webpack/components/OpenscapRemediationWizard/index.js
+++ b/webpack/components/OpenscapRemediationWizard/index.js
@@ -1,7 +1,12 @@
 import React, { useState, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { Button, Wizard } from '@patternfly/react-core';
+import {
+	Button
+} from '@patternfly/react-core';
+import {
+	Wizard
+} from '@patternfly/react-core/deprecated';
 
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
diff --git a/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js b/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js
index 24a247aa..48d4193e 100644
--- a/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js
+++ b/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js
@@ -152,7 +152,7 @@ const ReviewHosts = () => {
           if (!isSelecting) setIsAllHostsSelected(false);
         },
         isSelected: rowData.id === hostId || isSelected(rowData.id),
-        disable: rowData.id === hostId || false,
+        isDisabled: rowData.id === hostId || false,
       }}
     />
   );
diff --git a/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js b/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js
index 065984e4..3e70e411 100644
--- a/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js
+++ b/webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js
@@ -161,7 +161,7 @@ const ReviewRemediation = () => {
                   label={__('Reboot the system(s)')}
                   name="reboot-checkbox"
                   isChecked={isRebootSelected}
-                  onChange={selected => setIsRebootSelected(selected)}
+                  onChange={(_event, selected) => setIsRebootSelected(selected)}
                 />
               </GridItem>
             )}
diff --git a/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js b/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
index e70af826..7203183b 100644
--- a/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
+++ b/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
@@ -113,7 +113,7 @@ const SnippetSelect = () => {
               ouiaId="snippet-select"
               isRequired
               value={snippet}
-              onChange={value => setSnippet(value)}
+              onChange={(_event, value) => setSnippet(value)}
               aria-label="FormSelect Input"
             >
               <FormSelectOption