diff --git a/frontend/package.json b/frontend/package.json
index af1658dc0a9..e4612ce7d52 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -132,23 +132,24 @@
   },
   "dependencies": {
     "@patternfly-5/patternfly": "npm:@patternfly/patternfly@5.4.2",
-    "@patternfly/patternfly": "^6.2.3",
+    "@patternfly/patternfly": "^6.4.0",
     "@patternfly/quickstarts": "^6.4.0",
-    "@patternfly/react-catalog-view-extension": "^6.1.0",
-    "@patternfly/react-charts": "^8.2.2",
-    "@patternfly/react-code-editor": "^6.2.2",
-    "@patternfly/react-component-groups": "^6.3.0",
-    "@patternfly/react-core": "^6.2.2",
-    "@patternfly/react-data-view": "^6.2.0",
-    "@patternfly/react-icons": "^6.2.2",
-    "@patternfly/react-log-viewer": "6.3.0-prerelease.2",
-    "@patternfly/react-styles": "^6.2.2",
-    "@patternfly/react-table": "^6.2.2",
-    "@patternfly/react-templates": "^6.2.2",
-    "@patternfly/react-tokens": "^6.2.2",
-    "@patternfly/react-topology": "^6.2.0",
-    "@patternfly/react-user-feedback": "^6.1.0",
-    "@patternfly/react-virtualized-extension": "^6.0.0",
+    "@patternfly/react-catalog-view-extension": "^6.3.0",
+    "@patternfly/react-charts": "^8.4.0",
+    "@patternfly/react-code-editor": "^6.4.0",
+    "@patternfly/react-component-groups": "^6.4.0",
+    "@patternfly/react-core": "^6.4.0",
+    "@patternfly/react-data-view": "^6.4.0",
+    "@patternfly/react-drag-drop": "^6.4.0",
+    "@patternfly/react-icons": "^6.4.0",
+    "@patternfly/react-log-viewer": "^6.3.0",
+    "@patternfly/react-styles": "^6.4.0",
+    "@patternfly/react-table": "^6.4.0",
+    "@patternfly/react-templates": "^6.4.0",
+    "@patternfly/react-tokens": "^6.4.0",
+    "@patternfly/react-topology": "^6.4.0",
+    "@patternfly/react-user-feedback": "^6.2.0",
+    "@patternfly/react-virtualized-extension": "^6.2.0",
     "@rjsf/core": "^4.2.3",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/xterm": "^5.5.0",
@@ -312,7 +313,6 @@
     "node": ">=22.x"
   },
   "resolutions": {
-    "@patternfly/react-component-groups": "6.3.0",
     "@types/lodash": "4.14.106",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "5.3.x",
diff --git a/frontend/packages/console-app/src/components/access-modes/access-mode.tsx b/frontend/packages/console-app/src/components/access-modes/access-mode.tsx
index e20951da8d9..ebb53f92972 100644
--- a/frontend/packages/console-app/src/components/access-modes/access-mode.tsx
+++ b/frontend/packages/console-app/src/components/access-modes/access-mode.tsx
@@ -137,7 +137,6 @@ export const AccessModeSelector: React.FC<AccessModeSelectorProps> = (props) =>
         <Select
           isOpen={isOpen}
           selected={selected}
-          // @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
           onSelect={onSelect}
           onOpenChange={(open) => setIsOpen(open)}
           toggle={toggle}
diff --git a/frontend/packages/console-app/src/components/favorite/FavoriteButton.tsx b/frontend/packages/console-app/src/components/favorite/FavoriteButton.tsx
index 3ca676573e1..5e9b2350206 100644
--- a/frontend/packages/console-app/src/components/favorite/FavoriteButton.tsx
+++ b/frontend/packages/console-app/src/components/favorite/FavoriteButton.tsx
@@ -10,7 +10,6 @@ import {
   Tooltip,
 } from '@patternfly/react-core';
 import { ModalVariant } from '@patternfly/react-core/deprecated';
-import { StarIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import Modal from '@console/shared/src/components/modal/Modal';
 import { useTelemetry } from '@console/shared/src/hooks/useTelemetry';
@@ -138,7 +137,8 @@ export const FavoriteButton = ({ defaultName }: FavoriteButtonProps) => {
     <div className="co-fav-actions-icon">
       <Tooltip content={tooltipText} position="top">
         <Button
-          icon={<StarIcon color={isStarred ? 'gold' : 'gray'} />}
+          isFavorite
+          isFavorited={isStarred}
           className="co-xl-icon-button"
           data-test="favorite-button"
           variant="plain"
diff --git a/frontend/packages/console-app/src/components/favorite/FavoriteNavItems.tsx b/frontend/packages/console-app/src/components/favorite/FavoriteNavItems.tsx
index 523e7a3f1b6..81c324375f1 100644
--- a/frontend/packages/console-app/src/components/favorite/FavoriteNavItems.tsx
+++ b/frontend/packages/console-app/src/components/favorite/FavoriteNavItems.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { NavExpandable, Button, FlexItem, Flex, Truncate } from '@patternfly/react-core';
-import { StarIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { useTranslation } from 'react-i18next';
 import { useTelemetry } from '@console/shared/src/hooks/useTelemetry';
@@ -78,13 +77,14 @@ export const FavoriteNavItems: React.FC = () => {
           </FlexItem>
           <FlexItem className="pf-v6-u-mr-xs">
             <Button
+              isFavorite
+              isFavorited
               variant="plain"
               aria-label={`Unfavorite ${favorite.name}`}
               onClick={(e) => {
                 e.preventDefault();
                 handleUnfavorite(favorite.url);
               }}
-              icon={<StarIcon color="gold" />}
               data-test="remove-favorite-button"
             />
           </FlexItem>
diff --git a/frontend/packages/console-dynamic-plugin-sdk/README.md b/frontend/packages/console-dynamic-plugin-sdk/README.md
index f28cb8d7e5b..4c30f9f1977 100644
--- a/frontend/packages/console-dynamic-plugin-sdk/README.md
+++ b/frontend/packages/console-dynamic-plugin-sdk/README.md
@@ -216,6 +216,10 @@ This section documents notable changes in Console provided shared modules and ot
 - Removed `co-external-link` styling. Use PatternFly Buttons with `variant="link"` instead.
 - Removed `co-disabled` styling.
 
+#### Console 4.22.x
+
+- Updated PatternFly 6 shared modules to [PatternFly 6.4](https://www.patternfly.org/get-started/release-highlights#patternfly-6.4).
+
 ### PatternFly 5+ dynamic modules
 
 Newer versions of `@openshift-console/dynamic-plugin-sdk-webpack` package include support for automatic
diff --git a/frontend/packages/console-shared/src/components/editor/BasicCodeEditor.tsx b/frontend/packages/console-shared/src/components/editor/BasicCodeEditor.tsx
index 2b1a4758df1..c99a98f4b4a 100644
--- a/frontend/packages/console-shared/src/components/editor/BasicCodeEditor.tsx
+++ b/frontend/packages/console-shared/src/components/editor/BasicCodeEditor.tsx
@@ -7,7 +7,6 @@ import { useTranslation } from 'react-i18next';
 import { BasicCodeEditorProps } from '@console/dynamic-plugin-sdk';
 import { ThemeContext } from '@console/internal/components/ThemeProvider';
 import { ErrorBoundaryInline } from '@console/shared/src/components/error';
-import { defineThemes } from './theme';
 import './BasicCodeEditor.scss';
 
 // Avoid using monaco from CDN
@@ -39,13 +38,11 @@ export const BasicCodeEditor: FC<BasicCodeEditorProps> = (props) => {
         emptyStateButton={t('Browse')}
         emptyStateLink={t('Start from scratch')}
         emptyStateTitle={t('Start editing')}
+        isDarkTheme={theme === 'dark'}
         {...props}
         className={css('co-code-editor', props.className)}
         editorProps={{
-          theme: `console-${theme}`,
-          ...props?.editorProps,
           beforeMount: (monacoInstance) => {
-            defineThemes(monacoInstance?.editor);
             window.monaco = monacoInstance; // for e2e tests
             props?.editorProps?.beforeMount?.(monacoInstance);
           },
diff --git a/frontend/packages/console-shared/src/components/editor/theme.ts b/frontend/packages/console-shared/src/components/editor/theme.ts
deleted file mode 100644
index 62bd204189a..00000000000
--- a/frontend/packages/console-shared/src/components/editor/theme.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
-  t_color_green_70,
-  t_color_yellow_70,
-  t_color_blue_70,
-  t_color_purple_70,
-  t_color_green_30,
-  t_color_blue_30,
-  t_color_yellow_30,
-  t_color_purple_30,
-  t_color_white,
-  t_color_gray_20,
-  t_color_gray_60,
-  t_color_gray_90,
-  t_color_black,
-} from '@patternfly/react-tokens';
-import type { editor as monacoEditor } from 'monaco-editor/esm/vs/editor/editor.api';
-
-/**
- * Define the themes `console-light` and `console-dark` for an instance of Monaco editor.
- */
-export const defineThemes = (editor: typeof monacoEditor) => {
-  editor.defineTheme('console-light', {
-    base: 'vs',
-    inherit: true,
-    colors: {
-      'editor.background': t_color_white.value,
-      'editorLineNumber.activeForeground': t_color_black.value,
-      'editorLineNumber.foreground': t_color_gray_60.value,
-    },
-    rules: [
-      { token: 'number', foreground: t_color_green_70.value },
-      { token: 'type', foreground: t_color_yellow_70.value },
-      { token: 'string', foreground: t_color_blue_70.value },
-      { token: 'keyword', foreground: t_color_purple_70.value },
-    ],
-  });
-
-  editor.defineTheme('console-dark', {
-    base: 'vs-dark',
-    inherit: true,
-    colors: {
-      'editor.background': t_color_gray_90.value,
-      'editorLineNumber.activeForeground': t_color_white.value,
-      'editorLineNumber.foreground': t_color_gray_20.value,
-    },
-    rules: [
-      { token: 'number', foreground: t_color_green_30.value },
-      { token: 'type', foreground: t_color_blue_30.value },
-      { token: 'string', foreground: t_color_yellow_30.value },
-      { token: 'keyword', foreground: t_color_purple_30.value },
-    ],
-  });
-};
diff --git a/frontend/packages/console-shared/src/components/links/ExternalLinkButton.tsx b/frontend/packages/console-shared/src/components/links/ExternalLinkButton.tsx
index 92ddfa47206..70d4e535424 100644
--- a/frontend/packages/console-shared/src/components/links/ExternalLinkButton.tsx
+++ b/frontend/packages/console-shared/src/components/links/ExternalLinkButton.tsx
@@ -1,11 +1,10 @@
-import { Button, ButtonProps } from '@patternfly/react-core';
-import type { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
+import {
+  ExternalLinkButton as PfExternalLinkButton,
+  ExternalLinkButtonProps,
+} from '@patternfly/react-component-groups';
 import { useTranslation } from 'react-i18next';
 
-export type ExternalLinkButtonProps = ButtonProps & {
-  iconProps?: SVGIconProps;
-};
+export type { ExternalLinkButtonProps } from '@patternfly/react-component-groups';
 
 /**
  * A PatternFly Button that opens an external link in a new tab.
@@ -14,13 +13,6 @@ export const ExternalLinkButton = ({ iconProps, ...props }: ExternalLinkButtonPr
   const { t } = useTranslation('console-shared');
 
   return (
-    <Button
-      target="_blank"
-      rel="noopener noreferrer"
-      component="a"
-      iconPosition="right"
-      icon={<ExternalLinkAltIcon title={t('(Opens in new tab)')} {...iconProps} />}
-      {...props}
-    />
+    <PfExternalLinkButton iconProps={{ title: t('(Opens in new tab)'), ...iconProps }} {...props} />
   );
 };
diff --git a/frontend/packages/console-shared/src/utils/multiselectdropdown.tsx b/frontend/packages/console-shared/src/utils/multiselectdropdown.tsx
index ab61b074b94..11e4b178b17 100644
--- a/frontend/packages/console-shared/src/utils/multiselectdropdown.tsx
+++ b/frontend/packages/console-shared/src/utils/multiselectdropdown.tsx
@@ -17,7 +17,7 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
     [selected, options],
   );
 
-  const onSelect = (event: React.MouseEvent | React.ChangeEvent, selections: string[]) => {
+  const onSelect = (event: React.UIEvent, selections: string[]) => {
     event.preventDefault();
     setSelected(selections);
     onChange(selections);
@@ -28,7 +28,6 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
       initialOptions={initialOptions}
       placeholder={placeholder || t('console-shared~Select options')}
       noOptionsFoundMessage={t('console-shared~No results found')}
-      // @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
       onSelectionChange={onSelect}
       aria-label={t('console-shared~Select input')}
       aria-labelledby={id}
diff --git a/frontend/packages/console-telemetry-plugin/src/components/TelemetryConfiguration.tsx b/frontend/packages/console-telemetry-plugin/src/components/TelemetryConfiguration.tsx
index c1ef5636709..f0c54563835 100644
--- a/frontend/packages/console-telemetry-plugin/src/components/TelemetryConfiguration.tsx
+++ b/frontend/packages/console-telemetry-plugin/src/components/TelemetryConfiguration.tsx
@@ -90,7 +90,6 @@ const TelemetryAnalyticsSelect: React.FC<{
       <Select
         toggle={toggle}
         isOpen={isOpen}
-        // @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
         onSelect={(_, selectedValue: TelemetryAnalyticsSelectOptions) => {
           if (selectedValue && !disabled) {
             onChange(selectedValue);
diff --git a/frontend/packages/console-telemetry-plugin/src/components/TelemetryUserPreferenceDropdown.tsx b/frontend/packages/console-telemetry-plugin/src/components/TelemetryUserPreferenceDropdown.tsx
index c8c88098221..40aa9b5ff0d 100644
--- a/frontend/packages/console-telemetry-plugin/src/components/TelemetryUserPreferenceDropdown.tsx
+++ b/frontend/packages/console-telemetry-plugin/src/components/TelemetryUserPreferenceDropdown.tsx
@@ -66,8 +66,6 @@ const TelemetryAnalyticsSelect: React.FC<{
     <Select
       toggle={toggle}
       isOpen={isOpen}
-      toggleId="telemetry"
-      // @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
       onSelect={(_, selectedValue?: TelemetryAnalyticsSelectOptions) => {
         if (selectedValue) {
           onChange(selectedValue);
@@ -75,7 +73,6 @@ const TelemetryAnalyticsSelect: React.FC<{
         setIsOpen(false);
       }}
       aria-label={t('console-telemetry-plugin~Select option')}
-      maxHeight={300}
       onOpenChange={(open) => setIsOpen(open)}
     >
       <SelectList>
diff --git a/frontend/packages/topology/src/components/modals/MoveConnectionModal.tsx b/frontend/packages/topology/src/components/modals/MoveConnectionModal.tsx
index ec48335809a..bc3ce474793 100644
--- a/frontend/packages/topology/src/components/modals/MoveConnectionModal.tsx
+++ b/frontend/packages/topology/src/components/modals/MoveConnectionModal.tsx
@@ -97,7 +97,6 @@ const MoveConnectionForm: React.FC<
           <FormGroup fieldId="target-node" label="Target">
             <Select
               id="target-node-dropdown"
-              // @ts-expect-error FIXME: PatternFly's onSelect is typed wrong (value should be any)
               onSelect={(_, value: Node) => {
                 if (value) {
                   values.target = value;
diff --git a/frontend/public/components/masthead/masthead.tsx b/frontend/public/components/masthead/masthead.tsx
index c93173bbe3d..25fc45978d7 100644
--- a/frontend/public/components/masthead/masthead.tsx
+++ b/frontend/public/components/masthead/masthead.tsx
@@ -9,7 +9,6 @@ import {
   MastheadBrand,
   PageToggleButton,
 } from '@patternfly/react-core';
-import { BarsIcon } from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import { useNavigate } from 'react-router-dom-v5-compat';
 import { ReactSVG } from 'react-svg';
 import { MastheadToolbar } from './masthead-toolbar';
@@ -59,9 +58,11 @@ export const Masthead = memo(({ isMastheadStacked, isNavOpen, onNavToggle }: Mas
     <PfMasthead id="page-main-header" display={{ default: isMastheadStacked ? 'stack' : 'inline' }}>
       <MastheadMain>
         <MastheadToggle>
-          <PageToggleButton onSidebarToggle={onNavToggle} isSidebarOpen={isNavOpen}>
-            <BarsIcon />
-          </PageToggleButton>
+          <PageToggleButton
+            onSidebarToggle={onNavToggle}
+            isSidebarOpen={isNavOpen}
+            isHamburgerButton
+          />
         </MastheadToggle>
         <MastheadBrand>
           <MastheadLogo
diff --git a/frontend/public/components/modals/edit-yaml-settings-modal.tsx b/frontend/public/components/modals/edit-yaml-settings-modal.tsx
index abf4a4cbf4a..2b238c68259 100644
--- a/frontend/public/components/modals/edit-yaml-settings-modal.tsx
+++ b/frontend/public/components/modals/edit-yaml-settings-modal.tsx
@@ -1,5 +1,4 @@
 import { CodeEditorControl } from '@patternfly/react-code-editor';
-import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
 import { useUserSettingsCompatibility } from '@console/shared/src/hooks/useUserSettingsCompatibility';
 import {
   Flex,
@@ -12,7 +11,7 @@ import {
   Switch,
   SwitchProps,
 } from '@patternfly/react-core';
-import { CogIcon } from '@patternfly/react-icons';
+import { CogIcon ,PaintRollerIcon, FontIcon, ICursorIcon, MouseIcon } from '@patternfly/react-icons';
 import { FC, ReactNode, ComponentProps, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -27,57 +26,6 @@ import {
 } from '@console/shared/src/constants/common';
 import { SimpleSelect, SimpleSelectOption } from '@patternfly/react-templates';
 
-/**!
- * Font Awesome Free 6.7.2 - https://fontawesome.com
- * License - https://fontawesome.com/license/free
- * Copyright 2025 Fonticons, Inc.
- */
-const PaintRollerIcon = createIcon({
-  name: 'PaintRollerIcon',
-  width: 512,
-  height: 512,
-  svgPath:
-    'M416 128V32c0-17.67-14.33-32-32-32H32C14.33 0 0 14.33 0 32v96c0 17.67 14.33 32 32 32h352c17.67 0 32-14.33 32-32zm32-64v128c0 17.67-14.33 32-32 32H256c-35.35 0-64 28.65-64 64v32c-17.67 0-32 14.33-32 32v128c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V352c0-17.67-14.33-32-32-32v-32h160c53.02 0 96-42.98 96-96v-64c0-35.35-28.65-64-64-64z',
-});
-
-/**!
- * Font Awesome Free 6.7.2 - https://fontawesome.com
- * License - https://fontawesome.com/license/free
- * Copyright 2025 Fonticons, Inc.
- */
-const FontIcon = createIcon({
-  name: 'FontIcon',
-  width: 448,
-  height: 512,
-  svgPath:
-    'M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z',
-});
-/**!
- * Font Awesome Free 6.7.2 - https://fontawesome.com
- * License - https://fontawesome.com/license/free
- * Copyright 2025 Fonticons, Inc.
- */
-const ICursorIcon = createIcon({
-  name: 'ICursorIcon',
-  width: 256,
-  height: 512,
-  svgPath:
-    'M.1 29.3C-1.4 47 11.7 62.4 29.3 63.9l8 .7C70.5 67.3 96 95 96 128.3L96 224l-32 0c-17.7 0-32 14.3-32 32s14.3 32 32 32l32 0 0 95.7c0 33.3-25.5 61-58.7 63.8l-8 .7C11.7 449.6-1.4 465 .1 482.7s16.9 30.7 34.5 29.2l8-.7c34.1-2.8 64.2-18.9 85.4-42.9c21.2 24 51.2 40 85.4 42.9l8 .7c17.6 1.5 33.1-11.6 34.5-29.2s-11.6-33.1-29.2-34.5l-8-.7C185.5 444.7 160 417 160 383.7l0-95.7 32 0c17.7 0 32-14.3 32-32s-14.3-32-32-32l-32 0 0-95.7c0-33.3 25.5-61 58.7-63.8l8-.7c17.6-1.5 30.7-16.9 29.2-34.5S239-1.4 221.3 .1l-8 .7C179.2 3.6 149.2 19.7 128 43.7c-21.2-24-51.2-40-85.4-42.9l-8-.7C17-1.4 1.6 11.7 .1 29.3z',
-});
-
-/**!
- * Font Awesome Free 6.7.2 - https://fontawesome.com
- * License - https://fontawesome.com/license/free
- * Copyright 2025 Fonticons, Inc.
- */
-const MouseIcon = createIcon({
-  name: 'MouseIcon',
-  width: 384,
-  height: 512,
-  svgPath:
-    'M0 192l176 0L176 0 160 0C71.6 0 0 71.6 0 160l0 32zm0 32L0 352c0 88.4 71.6 160 160 160l64 0c88.4 0 160-71.6 160-160l0-128-192 0L0 224zm384-32l0-32C384 71.6 312.4 0 224 0L208 0l0 192 176 0z',
-});
-
 /*
  * The following is taken entirely from the PatternFly example
  *
diff --git a/frontend/public/components/utils/horizontal-nav.tsx b/frontend/public/components/utils/horizontal-nav.tsx
index 444392c4cc2..ad5569c8def 100644
--- a/frontend/public/components/utils/horizontal-nav.tsx
+++ b/frontend/public/components/utils/horizontal-nav.tsx
@@ -193,11 +193,7 @@ export const NavBar: React.FC<NavBarProps> = ({ pages }) => {
   // the div wrapper prevents the tabs from collapsing in a flexbox
   const tabs = (
     <div>
-      <Tabs
-        activeKey={defaultPage ? '' : lastElement}
-        component="nav"
-        className="co-horizontal-nav"
-      >
+      <Tabs activeKey={defaultPage ? '' : lastElement} component="nav" usePageInsets>
         {pages.map(({ name, nameKey, href }) => {
           const to = `${baseURL.replace(/\/$/, '')}/${encodeURIComponent(href)}`;
 
diff --git a/frontend/public/components/utils/resource-log.tsx b/frontend/public/components/utils/resource-log.tsx
index 60f886e0896..cffa14d663e 100644
--- a/frontend/public/components/utils/resource-log.tsx
+++ b/frontend/public/components/utils/resource-log.tsx
@@ -38,7 +38,6 @@ import {
 import { LogViewer, LogViewerSearch } from '@patternfly/react-log-viewer';
 import {
   BugIcon,
-  CogIcon,
   CompressIcon,
   DownloadIcon,
   ExpandIcon,
@@ -354,7 +353,7 @@ const LogControls: React.FCC<LogControlsProps> = ({
           ref={toggleRef}
           onClick={() => setIsOptionsOpen((isOpen) => !isOpen)}
           isExpanded={isOptionsOpen}
-          icon={<CogIcon />}
+          isSettings
           data-test="resource-log-options-toggle"
         >
           <span className="pf-v6-u-display-none pf-v6-u-display-inline-on-lg">{t('Options')}</span>
diff --git a/frontend/public/style/_overrides.scss b/frontend/public/style/_overrides.scss
index 75f667eca51..f072071ea2f 100644
--- a/frontend/public/style/_overrides.scss
+++ b/frontend/public/style/_overrides.scss
@@ -4,11 +4,6 @@
 
 $masthead-logo-max-height: 60px;
 
-// TODO: Remove when upgrading to PF 6.3.0: https://github.com/patternfly/patternfly/pull/7420
-.catalog-tile-pf-title {
-  @include co-break-word;
-}
-
 .co-catalog-tile {
   .catalog-tile-pf-icon {
     font-size: unset !important;
@@ -49,14 +44,6 @@ $masthead-logo-max-height: 60px;
   }
 }
 
-// Workaround for https://github.com/patternfly/patternfly/issues/7376
-// to align pf-v6-c-tabs--inset with PageSection
-.co-horizontal-nav {
-  --pf-v6-c-tabs--inset: #{$pf-v6-global-gutter-x};
-  --pf-v6-c-tabs--m-vertical--inset: #{$pf-v6-global-gutter-x};
-  --pf-v6-c-tabs--m-vertical--m-box--inset: #{$pf-v6-global-gutter-x};
-}
-
 .odc-catalog-tile {
   // Get rid of weird stretching of catalog grid items
   .pf-v6-c-card__header-main {
diff --git a/frontend/public/style/_vars.scss b/frontend/public/style/_vars.scss
index 587b42c2db8..fd5bd7dcdbe 100644
--- a/frontend/public/style/_vars.scss
+++ b/frontend/public/style/_vars.scss
@@ -22,7 +22,7 @@ $pf-v6-global--breakpoint--lg-max: calc(#{$pf-v6-global--breakpoint--lg} - 1);
 
 $pf-v6-global-gutter-x: calc(
   var(--pf-v6-c-page__main-section--PaddingInlineStart) -
-    var(--pf-v6-c-page__main-container--BorderWidth)
+    var(--pf-v6-c-page__main-container--BorderInlineStartWidth)
 ); // Matches pf-v6-c-page__main-section
 $pf-v6-global-gutter-y: var(--pf-t--global--spacer--md); // Matches pf-v6-c-page__main-section
 
diff --git a/frontend/scripts/check-patternfly-modules.ts b/frontend/scripts/check-patternfly-modules.ts
index 4c75a2406b3..e7277c94386 100644
--- a/frontend/scripts/check-patternfly-modules.ts
+++ b/frontend/scripts/check-patternfly-modules.ts
@@ -25,6 +25,7 @@ const PKGS_TO_CHECK: Array<{ name: string; semver: string }> = [
   { name: '@patternfly/react-component-groups', semver: '6.x' },
   { name: '@patternfly/react-core', semver: '6.x' },
   { name: '@patternfly/react-data-view', semver: '6.x' },
+  { name: '@patternfly/react-drag-drop', semver: '6.x' },
   { name: '@patternfly/react-icons', semver: '6.x' },
   { name: '@patternfly/react-log-viewer', semver: '6.x' },
   { name: '@patternfly/react-styles', semver: '6.x' },
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 7184833be47..f8b5421c45d 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -775,7 +775,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.0", "@babel/runtime@^7.26.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.23.2", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.0", "@babel/runtime@^7.26.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.27.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
   integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
@@ -938,6 +938,45 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@dnd-kit/accessibility@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz#3b4202bd6bb370a0730f6734867785919beac6af"
+  integrity sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==
+  dependencies:
+    tslib "^2.0.0"
+
+"@dnd-kit/core@^6.3.1":
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.3.1.tgz#4c36406a62c7baac499726f899935f93f0e6d003"
+  integrity sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==
+  dependencies:
+    "@dnd-kit/accessibility" "^3.1.1"
+    "@dnd-kit/utilities" "^3.2.2"
+    tslib "^2.0.0"
+
+"@dnd-kit/modifiers@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-9.0.0.tgz#96a0280c77b10c716ef79d9792ce7ad04370771d"
+  integrity sha512-ybiLc66qRGuZoC20wdSSG6pDXFikui/dCNGthxv4Ndy8ylErY0N3KVxY2bgo7AWwIbxDmXDg3ylAFmnrjcbVvw==
+  dependencies:
+    "@dnd-kit/utilities" "^3.2.2"
+    tslib "^2.0.0"
+
+"@dnd-kit/sortable@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-10.0.0.tgz#1f9382b90d835cd5c65d92824fa9dafb78c4c3e8"
+  integrity sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==
+  dependencies:
+    "@dnd-kit/utilities" "^3.2.2"
+    tslib "^2.0.0"
+
+"@dnd-kit/utilities@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.2.tgz#5a32b6af356dc5f74d61b37d6f7129a4040ced7b"
+  integrity sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==
+  dependencies:
+    tslib "^2.0.0"
+
 "@emotion/is-prop-valid@^0.7.3":
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc"
@@ -1711,10 +1750,10 @@
   resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.4.2.tgz#4a87d6a5fb2ffd526b4b9597b651f13ecf8ddd4f"
   integrity sha512-+BaokNR8/AmTYMESxby9UtQXPGACg449BXQd0KejAvW/uGxlgO6mY1X1205DeBEHoK3e/vXkYXjvZPpv/tcxSA==
 
-"@patternfly/patternfly@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.2.3.tgz#cf7678e442aa31101befe389651bca4256fd1c7f"
-  integrity sha512-FR027W7JygcQpvlRU/Iom936Vm0apzfi2o5lvtlcWW6IaeZCCTtTaDxehoYuELHlemzkLziQAgu6LuCJEVayjw==
+"@patternfly/patternfly@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.4.0.tgz#8ccc792573a525440f828ca1fb11eade864afb4d"
+  integrity sha512-4drFhg74sEc/fftark5wZevODIog17qR4pwLCdB3j5iK3Uu5oMA2SdLhsEeEQggalfnFzve/Km87MdVR0ghhvQ==
 
 "@patternfly/quickstarts@^6.4.0":
   version "6.4.0"
@@ -1724,41 +1763,41 @@
     dompurify "^3.2.4"
     history "^5.0.0"
 
-"@patternfly/react-catalog-view-extension@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-6.1.0.tgz#6caec6d55d385ae6d77864585b13f9dfbe98ea23"
-  integrity sha512-cQnafDmY/PwcImWx8xI498jXxFwF9WlOl3d5MzGzmpZbKLHHHsKz+khh/CRtUA+Ws0GztlkFBlNpVMMuX4IdmA==
+"@patternfly/react-catalog-view-extension@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-6.3.0.tgz#e0bd54c2b460ebb12f16b73fe306de3a1eaca2d5"
+  integrity sha512-/trhnBAid8RCna+xnghiB36/alG7lQd9Ohazv49Rey6iddKKSPBva2+JA2NrMbkr7BwRJF8pPRxsDW3bXfqWNg==
   dependencies:
     "@patternfly/react-core" "^6.1.0"
     "@patternfly/react-styles" "^6.1.0"
 
-"@patternfly/react-charts@^8.2.2":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.2.2.tgz#5aa320ed889ebd005b160e32c5450f0ae27676f5"
-  integrity sha512-p9mCCfW2WbuyZkMR1hcpRpv6U76IQ09CXiZfI8Pegpxw5yLnyjBeVZTwawdfXGYHAl4imvBzh8UuFbRaCR6pHA==
+"@patternfly/react-charts@^8.4.0":
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.4.0.tgz#2671542c91c714ecbec03798cfb2adab81bd44af"
+  integrity sha512-lxfH2gVDg4Pd+D6TQ2SSqc5fQPk1UvhHbuP+7YZJdPhk2PzhhbaT3CE+kp5ZEU2y/lJb8L5kZ5lOk8tvPn6PQw==
   dependencies:
-    "@patternfly/react-styles" "^6.2.2"
-    "@patternfly/react-tokens" "^6.2.2"
+    "@patternfly/react-styles" "^6.4.0"
+    "@patternfly/react-tokens" "^6.4.0"
     hoist-non-react-statics "^3.3.2"
     lodash "^4.17.21"
     tslib "^2.8.1"
 
-"@patternfly/react-code-editor@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.2.2.tgz#a2b76931fcb06e748d0ed70fa870c854538ed82d"
-  integrity sha512-KPnkNP769afD2rvoNQtgCx+SYscamM5QSRmw2FJ9QPHVMksarwTsMvrdMxvu+n6Dhs/T40vQLU5UR7X2yPrURg==
+"@patternfly/react-code-editor@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.4.0.tgz#a1d8b4302d29107391bc5b3286445b1762c5bc0e"
+  integrity sha512-jZK4qzytcriZalug3KvwTD+h8lNjUfm79opAsLJwGfuq2DD5pzrDwF4GysZrR4hUMdN0jUJqh5yvAqwZtJI/UA==
   dependencies:
     "@monaco-editor/react" "^4.6.0"
-    "@patternfly/react-core" "^6.2.2"
-    "@patternfly/react-icons" "^6.2.2"
-    "@patternfly/react-styles" "^6.2.2"
+    "@patternfly/react-core" "^6.4.0"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-styles" "^6.4.0"
     react-dropzone "14.3.5"
     tslib "^2.8.1"
 
-"@patternfly/react-component-groups@6.3.0", "@patternfly/react-component-groups@^6.1.0", "@patternfly/react-component-groups@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-component-groups/-/react-component-groups-6.3.0.tgz#7ac83b6a9be1fe7692a9ee4d936b0b33279478d0"
-  integrity sha512-W8vSYD4KrAhDnjRLCPK+irVhG9GORQ7PveBFJ9FAvjCc4lGv73smDY4M1Lv2peNHQaXQpn6DSPsuynaReRvIhg==
+"@patternfly/react-component-groups@^6.1.0", "@patternfly/react-component-groups@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-component-groups/-/react-component-groups-6.4.0.tgz#f657eefb059cd41ff91af2e273e14bf8c48f77a2"
+  integrity sha512-vg0761nQ/7hfggbp6+XowRcQQSd9oIToh77+4lmsyrs41MkA5ppQIPBCZ4lUZW87kmEPhkHqglpJcVfsrrIM/g==
   dependencies:
     "@patternfly/react-core" "^6.0.0"
     "@patternfly/react-icons" "^6.0.0"
@@ -1766,82 +1805,95 @@
     "@patternfly/react-table" "^6.0.0"
     react-jss "^10.10.0"
 
-"@patternfly/react-core@^6.0.0", "@patternfly/react-core@^6.0.0-prerelease.21", "@patternfly/react-core@^6.1.0", "@patternfly/react-core@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.2.2.tgz#8965a727b64506366bdf4682bf86b9c2c7fc0fb3"
-  integrity sha512-JUrZ57JQ4bkmed1kxaciXb0ZpIVYyCHc2HjtzoKQ5UNRlx204zR2isATSHjdw2GFcWvwpkC5/fU2BR+oT3opbg==
+"@patternfly/react-core@^6.0.0", "@patternfly/react-core@^6.0.0-prerelease.21", "@patternfly/react-core@^6.1.0", "@patternfly/react-core@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.4.0.tgz#a2c0b60c1a4f34f708d079e92e86b007b0c88c3c"
+  integrity sha512-zMgJmcFohp2FqgAoZHg7EXZS7gnaFESquk0qIavemYI0FsqspVlzV2/PUru7w+86+jXfqebRhgubPRsv1eJwEg==
   dependencies:
-    "@patternfly/react-icons" "^6.2.2"
-    "@patternfly/react-styles" "^6.2.2"
-    "@patternfly/react-tokens" "^6.2.2"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-styles" "^6.4.0"
+    "@patternfly/react-tokens" "^6.4.0"
     focus-trap "7.6.4"
     react-dropzone "^14.3.5"
     tslib "^2.8.1"
 
-"@patternfly/react-data-view@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-data-view/-/react-data-view-6.2.0.tgz#4205638ea6604fcd9aa5627243b88156d8e1f647"
-  integrity sha512-d8o1MUD0+s87afV4kxF3dZlhYvCb7H3DZTmrk4Bj0UDLoo2DDi3El4P94ZtjLmUiaJ9dYGUrXSbgZUmz5TIyLg==
+"@patternfly/react-data-view@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-data-view/-/react-data-view-6.4.0.tgz#0f89c28b74f7a755fa2837c2087772b20fde4d10"
+  integrity sha512-AYIJvWLSoZaf3askvBjyyFQEvSCiquw5PFzEOiTsNoM2pDYkRagzppjclpI+MRJr44ZrfpljC6ZKE4f5Ni2p+w==
   dependencies:
     "@patternfly/react-component-groups" "^6.1.0"
-    "@patternfly/react-core" "^6.0.0"
-    "@patternfly/react-icons" "^6.0.0"
-    "@patternfly/react-table" "^6.0.0"
+    "@patternfly/react-core" "^6.4.0"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-table" "^6.4.0"
     clsx "^2.1.1"
     react-jss "^10.10.0"
 
-"@patternfly/react-icons@^6.0.0", "@patternfly/react-icons@^6.0.0-prerelease.7", "@patternfly/react-icons@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.2.2.tgz#6b19359df7618ea4ec6aa6da3af2a9a287666f23"
-  integrity sha512-XkBwzuV/uiolX+T6QgB3RIqphM1m+vAZjAe3McYtyY22j1rsOdlWDE4RtRrJ1q7EoIZwyZHj0h8T9vMfUsLn4Q==
+"@patternfly/react-drag-drop@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-drag-drop/-/react-drag-drop-6.4.0.tgz#78dad53798d32fef37f4d27a751f647f9d2d3acd"
+  integrity sha512-571HWmMbfwxCHC7KWPuazFHpgwvGJkxBg3i+4K/Ie8bQz8M/z2psaEnIOQCBL2tCGO6xNkfeojPXXjSClHLhzQ==
+  dependencies:
+    "@dnd-kit/core" "^6.3.1"
+    "@dnd-kit/modifiers" "^9.0.0"
+    "@dnd-kit/sortable" "^10.0.0"
+    "@patternfly/react-core" "^6.4.0"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-styles" "^6.4.0"
+    resize-observer-polyfill "^1.5.1"
+
+"@patternfly/react-icons@^6.0.0", "@patternfly/react-icons@^6.0.0-prerelease.7", "@patternfly/react-icons@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.4.0.tgz#563d5a51e76084dea8c752b587fc479dfe10fc31"
+  integrity sha512-SPjzatm73NUYv/BL6A/cjRA5sFQ15NkiyPAcT8gmklI7HY+ptd6/eg49uBDFmxTQcSwbb5ISW/R6wwCQBY2M+Q==
 
-"@patternfly/react-log-viewer@6.3.0-prerelease.2":
-  version "6.3.0-prerelease.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-log-viewer/-/react-log-viewer-6.3.0-prerelease.2.tgz#e36b6837d9cfb7da22aacc51120ad379f0605f75"
-  integrity sha512-x/mKpWOJxerGQIOgT3JIZr+yW8Q+dMERKcaaxqlRIJ5rOZFhPKby4l4ts9TeTgKTxR2of2TLa7Fy2LTc0QpjWQ==
+"@patternfly/react-log-viewer@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-log-viewer/-/react-log-viewer-6.3.0.tgz#4e56deb2128a3a85e574a07a6a71ca9825c578ed"
+  integrity sha512-W+PMPDKH1+bWVvL0IPKQOdd6m2fF/fqejwfl/j27FgbGyFNTnuF2FTwxRKxsrBv/gS2sHkwslHDWZJwogAPsUg==
   dependencies:
     "@patternfly/react-core" "^6.0.0"
     "@patternfly/react-icons" "^6.0.0"
     "@patternfly/react-styles" "^6.0.0"
     memoize-one "^5.1.0"
 
-"@patternfly/react-styles@^6.0.0", "@patternfly/react-styles@^6.0.0-prerelease.6", "@patternfly/react-styles@^6.1.0", "@patternfly/react-styles@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.2.2.tgz#ff6d31266ba03df9be8095f189d1399a8cc3b66d"
-  integrity sha512-rncRDq66H8VnLyb9DrHHlZtPddlpNL9+W0XuQC0L7F6p78hOwSZmoGTW2Vq8/wJplDj8h/61qRpfRF9VEYPW0g==
+"@patternfly/react-styles@^6.0.0", "@patternfly/react-styles@^6.0.0-prerelease.6", "@patternfly/react-styles@^6.1.0", "@patternfly/react-styles@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.4.0.tgz#2e29d59a4e3df737e742de58dc1525a27287415d"
+  integrity sha512-EXmHA67s5sy+Wy/0uxWoUQ52jr9lsH2wV3QcgtvVc5zxpyBX89gShpqv4jfVqaowznHGDoL6fVBBrSe9BYOliQ==
 
-"@patternfly/react-table@^6.0.0", "@patternfly/react-table@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.2.2.tgz#9ca4f1b4e5558cafd712c66a599b097a475acb30"
-  integrity sha512-7CxVKhnpA+f8dLJ0hVvzZOe4Djx/nE+w70ipeAHf4Yi5JwfDWmbK97YvjYPfamp/bsXTLtPcK2n4AoY5DQX6Pg==
+"@patternfly/react-table@^6.0.0", "@patternfly/react-table@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.4.0.tgz#5bfa35f97000920749e38bbdd0a4108679860877"
+  integrity sha512-yv0sFOLGts8a2q9C1xUegjp50ayYyVRe0wKjMf+aMSNIK8sVYu8qu0yfBsCDybsUCldue7+qsYKRLFZosTllWQ==
   dependencies:
-    "@patternfly/react-core" "^6.2.2"
-    "@patternfly/react-icons" "^6.2.2"
-    "@patternfly/react-styles" "^6.2.2"
-    "@patternfly/react-tokens" "^6.2.2"
+    "@patternfly/react-core" "^6.4.0"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-styles" "^6.4.0"
+    "@patternfly/react-tokens" "^6.4.0"
     lodash "^4.17.21"
     tslib "^2.8.1"
 
-"@patternfly/react-templates@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.2.2.tgz#a284e7086f15b8c683843833ec3e94b9fbcd616e"
-  integrity sha512-Onmv6zhgEOjtmgZ0D89PNlBeoxBSYo6yzTDcALSTStNVYuXMLPaClZhXd8UYEg4Jr8I/HsNHBU2pGTJuSct6TQ==
+"@patternfly/react-templates@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.4.0.tgz#43a3a56173abaf1d2fb4ae06b5f3248380c40678"
+  integrity sha512-n3/CWJ3jEv7d7ZjDa6g0B+k1N9kdw6WV259O44GqGSUd/cgMNZp+B9iIcOKQhekvCEPqvqzsAJT2b9X3YQNwkg==
   dependencies:
-    "@patternfly/react-core" "^6.2.2"
-    "@patternfly/react-icons" "^6.2.2"
-    "@patternfly/react-styles" "^6.2.2"
-    "@patternfly/react-tokens" "^6.2.2"
+    "@patternfly/react-core" "^6.4.0"
+    "@patternfly/react-icons" "^6.4.0"
+    "@patternfly/react-styles" "^6.4.0"
+    "@patternfly/react-tokens" "^6.4.0"
     tslib "^2.8.1"
 
-"@patternfly/react-tokens@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.2.2.tgz#4ab12cf77fab60a730f52aed2433dbf892d47509"
-  integrity sha512-2GRWDPBTrcTlGNFc5NPJjrjEVU90RpgcGX/CIe2MplLgM32tpVIkeUtqIoJPLRk5GrbhyFuHJYRU+O93gU4o3Q==
+"@patternfly/react-tokens@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.4.0.tgz#15e0deb5205db8322bed064958162fb98046966f"
+  integrity sha512-iZthBoXSGQ/+PfGTdPFJVulaJZI3rwE+7A/whOXPGp3Jyq3k6X52pr1+5nlO6WHasbZ9FyeZGqXf4fazUZNjbw==
 
-"@patternfly/react-topology@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-6.2.0.tgz#3a853731c6a3aa5b014596ec368cfc34fb0927b3"
-  integrity sha512-tqLW9MBJOVq+R1b7MtHsz9zh+kjQ6wW5Ef3ub4cRJPHS3+2kVLv/943MdvSfHDa4uwsjT854Wr0roxlfRtRtvA==
+"@patternfly/react-topology@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-6.4.0.tgz#d5ddd2f76ee4c3b585462ec94cb533b16bf6be04"
+  integrity sha512-Uy2ofRnI0apYiPWUYIAlXifl+4QPx/sqsVku1WglCkqjMPwuR8vC/GTIJEq2qW7mucDAcWSTFAPc5+zqyPRrlQ==
   dependencies:
     "@dagrejs/dagre" "1.1.2"
     "@patternfly/react-core" "^6.0.0"
@@ -1849,28 +1901,26 @@
     "@patternfly/react-styles" "^6.0.0"
     "@types/d3" "^7.4.0"
     "@types/d3-force" "^1.2.1"
-    "@types/react-measure" "^2.0.6"
     d3 "^7.8.0"
     mobx "^6.9.0"
     mobx-react "^7.6.0"
     point-in-svg-path "^1.0.1"
     popper.js "^1.16.1"
-    react-measure "^2.3.0"
     tslib "^2.0.0"
     webcola "3.4.0"
 
-"@patternfly/react-user-feedback@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-user-feedback/-/react-user-feedback-6.1.0.tgz#658d3f37631cc65bb3b4f8cc64bcd6f297b09f04"
-  integrity sha512-eOLDku1l6odwWSjcdMIk683GRhRnRYhuVXguW1YtnbWlTEfLgyPao0zqISEbJSzugMgccw5AVdQGun+nVhys0Q==
+"@patternfly/react-user-feedback@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-user-feedback/-/react-user-feedback-6.2.0.tgz#82bd2d1b4b42b1fcee03799f66eccc9447b5793e"
+  integrity sha512-grhaZQwcESNZD2ifpbPoodCJ/NRTt4B24jVNYgDi23EVvQ0oGpyIXAvbUhX3siSkLjdqdYLsY9o5wNRJM78VkA==
   dependencies:
     "@patternfly/react-core" "^6.0.0"
     "@patternfly/react-icons" "^6.0.0"
 
-"@patternfly/react-virtualized-extension@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-virtualized-extension/-/react-virtualized-extension-6.0.0.tgz#b02ef6269640fe9cd7f7c004d89a0a55849c397d"
-  integrity sha512-nTcuKDkyx2qtVW4kND9Wf+fDtiKKGY0o4WY6AgXoz7Z5FBXvRhEu15b5ttowZcWA2NqeMLW5SW+799rGvrG0cA==
+"@patternfly/react-virtualized-extension@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-virtualized-extension/-/react-virtualized-extension-6.2.0.tgz#64a41ba3330d7051fe69576149c54918df2c1eb2"
+  integrity sha512-a3bKXsN8m7cUZHU94TrCnMg+xEjdfbCVb/1oBcTDZnYHewR7RPNetw74BiLQrcdu8cmhEw9ovE+iB0RE2mo9dg==
   dependencies:
     "@patternfly/react-core" "^6.0.0-prerelease.21"
     "@patternfly/react-icons" "^6.0.0-prerelease.7"
@@ -2577,13 +2627,6 @@
     "@types/json-schema" "*"
     "@types/react" "*"
 
-"@types/react-measure@^2.0.6":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@types/react-measure/-/react-measure-2.0.8.tgz#3615956c685e6d9fed8380aac53590b333fae34f"
-  integrity sha512-Pu4/hQ/1AKVN6efoawtcM+l376WYOI8e1fiM6ir4pdLkHilDCkJLjUGvAm0mWKJ0GE6hzu55yCrcJ/xNyEdFwA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-redux@^7.1.20":
   version "7.1.34"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.34.tgz#83613e1957c481521e6776beeac4fd506d11bd0e"
@@ -8506,11 +8549,6 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
-get-node-dimensions@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz#fb7b4bb57060fb4247dd51c9d690dfbec56b0823"
-  integrity sha512-2MSPMu7S1iOTL+BOa6K1S62hB2zUAYNF/lV0gSVlOaacd087lc6nR1H1r0e3B1CerTo+RceOmi1iJW+vp21xcQ==
-
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
@@ -13945,16 +13983,6 @@ react-linkify@^0.2.2:
     prop-types "^15.5.8"
     tlds "^1.57.0"
 
-react-measure@^2.3.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/react-measure/-/react-measure-2.5.2.tgz#4ffc410e8b9cb836d9455a9ff18fc1f0fca67f89"
-  integrity sha512-M+rpbTLWJ3FD6FXvYV6YEGvQ5tMayQ3fGrZhRPHrE9bVlBYfDCLuDcgNttYfk8IqfOI03jz6cbpqMRTUclQnaA==
-  dependencies:
-    "@babel/runtime" "^7.2.0"
-    get-node-dimensions "^1.2.1"
-    prop-types "^15.6.2"
-    resize-observer-polyfill "^1.5.0"
-
 react-modal@^3.16.3:
   version "3.16.3"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.16.3.tgz#c412d41915782e3c261253435d01468e2439b11b"
@@ -14503,7 +14531,7 @@ reselect@4.x:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
   integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
 
-resize-observer-polyfill@^1.5.0:
+resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==