diff --git a/package-lock.json b/package-lock.json
index 4e41542da..95468809c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4806,9 +4806,9 @@
       }
     },
     "node_modules/@patternfly/react-charts": {
-      "version": "6.94.19",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.94.19.tgz",
-      "integrity": "sha512-+yYwXAy/GBH2bTHFzMpdVKc8LUJCCNEqqS7bqovNkNLd0m3FP3q9fKJ22QxNnP9NeFHK6UFa4KfouQAb2fInfQ==",
+      "version": "6.94.18",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.94.18.tgz",
+      "integrity": "sha512-56WxnZYC3blRX41mW67JaPxJ3YhXViLvwGpEsZrYCccla/rTV8JgKK0gjHnqtzPQiVBfpn+3ewOyNCOR5uRoSw==",
       "peer": true,
       "dependencies": {
         "@patternfly/react-styles": "^4.92.6",
@@ -4839,22 +4839,22 @@
       }
     },
     "node_modules/@patternfly/react-core": {
-      "version": "4.221.3",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.221.3.tgz",
-      "integrity": "sha512-I33TnX5Xn8ypXYjHc7G5kIVsYjB4PnDxxmJG6rBLqFslrnGUBzvb0sflnP43QlI0camamVIoaBRjedj8WXqaRg==",
+      "version": "4.276.6",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.6.tgz",
+      "integrity": "sha512-G0K+378jf9jw9g+hCAoKnsAe/UGTRspqPeuAYypF2FgNr+dC7dUpc7/VkNhZBVqSJzUWVEK8NyXcqkfi0IemIg==",
       "peer": true,
       "dependencies": {
-        "@patternfly/react-icons": "^4.72.3",
-        "@patternfly/react-styles": "^4.71.3",
-        "@patternfly/react-tokens": "^4.73.3",
+        "@patternfly/react-icons": "^4.93.6",
+        "@patternfly/react-styles": "^4.92.6",
+        "@patternfly/react-tokens": "^4.94.6",
         "focus-trap": "6.9.2",
         "react-dropzone": "9.0.0",
         "tippy.js": "5.1.2",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "react": "^16.8 || ^17 || ^18",
+        "react-dom": "^16.8 || ^17 || ^18"
       }
     },
     "node_modules/@patternfly/react-icons": {
@@ -4874,21 +4874,21 @@
       "peer": true
     },
     "node_modules/@patternfly/react-table": {
-      "version": "4.90.3",
-      "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.90.3.tgz",
-      "integrity": "sha512-RsSvs1IdvzOFcWgNc42COHfPJ/Dhl8gCHgwnC0ER/yD+IXOOdP+0u7+ZHGfF9+anAHZhQRJ2lGlQnp2HZM8b3A==",
+      "version": "4.112.39",
+      "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.112.39.tgz",
+      "integrity": "sha512-U+hOMgYlbghGH4M5MX+qt0GkVi/ocrGnxDnm11YiS3CtEGsd6Rr0NeqMmk0uoR46Od4Pr5tKuXxZhPP32sCL/w==",
       "peer": true,
       "dependencies": {
-        "@patternfly/react-core": "^4.221.3",
-        "@patternfly/react-icons": "^4.72.3",
-        "@patternfly/react-styles": "^4.71.3",
-        "@patternfly/react-tokens": "^4.73.3",
+        "@patternfly/react-core": "^4.276.6",
+        "@patternfly/react-icons": "^4.93.6",
+        "@patternfly/react-styles": "^4.92.6",
+        "@patternfly/react-tokens": "^4.94.6",
         "lodash": "^4.17.19",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "react": "^16.8 || ^17 || ^18",
+        "react-dom": "^16.8 || ^17 || ^18"
       }
     },
     "node_modules/@patternfly/react-tokens": {
@@ -31393,8 +31393,8 @@
       "peerDependencies": {
         "@openshift-console/dynamic-plugin-sdk": "0.0.18",
         "@openshift/dynamic-plugin-sdk": "3.0.0",
-        "@patternfly/react-core": "4.221.3",
-        "@patternfly/react-table": "4.90.3",
+        "@patternfly/react-core": "4.276.6",
+        "@patternfly/react-table": "4.112.39",
         "react": "^17.0.1",
         "react-i18next": "^11.7.3",
         "react-query": "^3.39.2",
@@ -31412,7 +31412,7 @@
     },
     "packages/forklift-console-plugin": {
       "name": "@kubev2v/forklift-console-plugin",
-      "version": "2.5.0",
+      "version": "2.5.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@kubev2v/common": "*",
@@ -31446,11 +31446,11 @@
       "peerDependencies": {
         "@openshift-console/dynamic-plugin-sdk": "0.0.18",
         "@openshift/dynamic-plugin-sdk": "3.0.0",
-        "@patternfly/react-charts": "6.94.19",
-        "@patternfly/react-core": "4.221.3",
-        "@patternfly/react-table": "4.90.3",
+        "@patternfly/react-charts": "6.94.18",
+        "@patternfly/react-core": "4.276.6",
+        "@patternfly/react-table": "4.112.39",
         "react": "^17.0.1",
-        "react-dom": "^17",
+        "react-dom": "^17.0.1",
         "react-i18next": "^11.7.3",
         "react-router": "5.2.0",
         "react-router-dom": "5.2.0"
@@ -31471,8 +31471,8 @@
       "peerDependencies": {
         "@migtools/lib-ui": "8.4.1",
         "@openshift-console/dynamic-plugin-sdk": "0.0.18",
-        "@patternfly/react-core": "4.221.3",
-        "@patternfly/react-table": "4.90.3",
+        "@patternfly/react-core": "4.276.6",
+        "@patternfly/react-table": "4.112.39",
         "axios": "^0.21.2",
         "classnames": "2.x",
         "dayjs": "^1.11.5",
diff --git a/packages/common/package.json b/packages/common/package.json
index d68102e88..8bb3cd2d6 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -30,8 +30,8 @@
   "peerDependencies": {
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
     "@openshift/dynamic-plugin-sdk": "3.0.0",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
     "react": "^17.0.1",
     "react-i18next": "^11.7.3",
     "react-query": "^3.39.2",
@@ -55,4 +55,4 @@
     "sass": "^1.63.3",
     "storybook": "^7.0.14"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/common/src/components-stories/TableView/TableView.stories.tsx b/packages/common/src/components-stories/TableView/TableView.stories.tsx
index c1a322dd8..4bc94ee82 100644
--- a/packages/common/src/components-stories/TableView/TableView.stories.tsx
+++ b/packages/common/src/components-stories/TableView/TableView.stories.tsx
@@ -89,7 +89,7 @@ const visibleColumns: ResourceField[] = [
 
 function SimpleRow<T>({ resourceFields, resourceData }: RowProps<T>) {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => (
         <Td key={resourceFieldId} dataLabel={label}>
           {String(resourceData[resourceFieldId] ?? '')}
diff --git a/packages/common/src/components/Filter/FreetextFilter.tsx b/packages/common/src/components/Filter/FreetextFilter.tsx
index 2132ced40..add16fdab 100644
--- a/packages/common/src/components/Filter/FreetextFilter.tsx
+++ b/packages/common/src/components/Filter/FreetextFilter.tsx
@@ -47,10 +47,7 @@ export const FreetextFilter = ({
           placeholder={placeholderLabel}
           value={inputValue}
           onChange={(event, value) => {
-            // starting with react-core 4.273.0 parameters were re-ordered
-            // the workaround can be removed when last supported Console version is 4.13
-            const isReactCoreBefore4_273_0 = typeof value === 'object';
-            setInputValue(isReactCoreBefore4_273_0 ? event : value);
+            setInputValue(value);
           }}
           onSearch={onTextInput}
           onClear={() => setInputValue('')}
diff --git a/packages/forklift-console-plugin/package.json b/packages/forklift-console-plugin/package.json
index 0331ae387..a4c5bc960 100644
--- a/packages/forklift-console-plugin/package.json
+++ b/packages/forklift-console-plugin/package.json
@@ -34,10 +34,10 @@
   "peerDependencies": {
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
     "@openshift/dynamic-plugin-sdk": "3.0.0",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
-    "@patternfly/react-charts": "6.94.19",
-    "react-dom": "^17",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
+    "@patternfly/react-charts": "6.94.18",
+    "react-dom": "^17.0.1",
     "react": "^17.0.1",
     "react-i18next": "^11.7.3",
     "react-router": "5.2.0",
diff --git a/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx b/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx
index 3a93de8ae..0abe38ba6 100644
--- a/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx
+++ b/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx
@@ -121,7 +121,7 @@ function MappingRow<T extends CommonMapping>({
   );
   return (
     <>
-      <Tr ouiaId={undefined} ouiaSafe={undefined}>
+      <Tr>
         <Td
           expand={{
             rowIndex,
@@ -153,7 +153,7 @@ function MappingRow<T extends CommonMapping>({
           );
         })}
       </Tr>
-      <Tr isExpanded={isRowExpanded} ouiaId={undefined} ouiaSafe={undefined}>
+      <Tr isExpanded={isRowExpanded}>
         <Td dataLabel={t('Mapping graph')} noPadding colSpan={resourceFields.length}>
           {isRowExpanded && (
             <ExpandableRowContent>
diff --git a/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx b/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx
index 68be39462..7300cab78 100644
--- a/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx
+++ b/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx
@@ -11,7 +11,7 @@ afterEach(cleanup);
 
 function SimpleRow<T>({ resourceFields, resourceData }: RowProps<T>) {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => (
         <Td key={resourceFieldId} dataLabel={label}>
           {String(resourceData[resourceFieldId] ?? '')}
diff --git a/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx b/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx
index 37f556c3a..a1954e244 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx
@@ -201,7 +201,7 @@ const PlanRow = ({
 }: RowProps<FlatPlan>) => {
   const primaryAction = getPrimaryActionFromPlanState(resourceData.status);
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => {
         const Cell = cellCreator[resourceFieldId] ?? TextCell;
         return resourceFieldId === C.DESCRIPTION ? (
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx
index edd026f92..7a0d267cb 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx
@@ -20,7 +20,7 @@ export const VSphereHostsRow: React.FC<RowProps<InventoryHostPair>> = ({
   resourceIndex: rowIndex,
 }) => {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {!!toggleSelect && (
         <Td
           select={{
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx
index b034f27ab..40ef0ca90 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx
@@ -35,7 +35,7 @@ import {
  */
 export const ProviderRow: React.FC<RowProps<ProviderData>> = ({ resourceFields, resourceData }) => {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId }) =>
         renderTd({ resourceData, resourceFieldId, resourceFields }),
       )}
diff --git a/packages/legacy/package.json b/packages/legacy/package.json
index 84b7079a3..57aa2aefb 100644
--- a/packages/legacy/package.json
+++ b/packages/legacy/package.json
@@ -62,8 +62,8 @@
   "peerDependencies": {
     "@migtools/lib-ui": "8.4.1",
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
     "axios": "^0.21.2",
     "classnames": "2.x",
     "dayjs": "^1.11.5",
@@ -85,4 +85,4 @@
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx b/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx
index a4fdc433d..e19d8ab89 100644
--- a/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx
+++ b/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx
@@ -100,7 +100,7 @@ export const CutoverConfirmModal: React.FunctionComponent<ICutoverConfirmModalPr
                   <>
                     <InputGroup className={spacing.mtSm}>
                       <DatePicker
-                        onChange={(_inputDate, newDate) => {
+                        onChange={(event, _inputDate, newDate) => {
                           if (newDate && isValidDate(newDate)) {
                             setCutoverDay(newDate);
                           } else {
@@ -114,7 +114,7 @@ export const CutoverConfirmModal: React.FunctionComponent<ICutoverConfirmModalPr
                       <TimePicker
                         aria-label="Cutover scheduled time"
                         style={{ width: '150px' }}
-                        onChange={(_time, hour, minute) => {
+                        onChange={(event, _time, hour, minute) => {
                           if ((hour || hour === 0) && (minute || minute === 0)) {
                             setCutoverTime({ hour, minute });
                           } else {