diff --git a/packages/common/babel.config.js b/packages/common/babel.config.js
index d1e3dc596..8c45abc5f 100644
--- a/packages/common/babel.config.js
+++ b/packages/common/babel.config.js
@@ -3,7 +3,7 @@ const path = require('path');
 const glob = require('glob');
 
 const mapper = {
-  TextVariants: 'Text',
+  ContentVariants: 'Content',
   ButtonVariant: 'Button',
   TextListVariants: 'TextList',
   TextListItemVariants: 'TextListItem',
@@ -13,7 +13,7 @@ const mapper = {
   FormHelperText: 'Form',
   FormGroup: 'Form',
   GridItem: 'Grid',
-  TextContent: 'Text',
+  Content: 'Content',
   HelperTextItem: 'HelperText',
   ActionGroup: 'Form',
   Tab: 'Tabs',
diff --git a/packages/pf4-component-mapper/package.json b/packages/pf4-component-mapper/package.json
index 66b0a3992..488281e3e 100644
--- a/packages/pf4-component-mapper/package.json
+++ b/packages/pf4-component-mapper/package.json
@@ -30,13 +30,13 @@
     "javascript"
   ],
   "devDependencies": {
-    "@patternfly/react-core": "^5.0.0",
-    "@patternfly/react-icons": "^5.0.0"
+    "@patternfly/react-core": "^6.0.0",
+    "@patternfly/react-icons": "^6.0.0"
   },
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "*",
-    "@patternfly/react-core": "^5.0.0",
-    "@patternfly/react-icons": "^5.0.0",
+    "@patternfly/react-core": "^6.0.0",
+    "@patternfly/react-icons": "^6.0.0",
     "react": "^17.0.2 || ^18.0.0",
     "react-dom": "^17.0.2 || ^18.0.0"
   },
diff --git a/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js b/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
index 70fbe8521..b8bbd9ac4 100644
--- a/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { DualListSelector } from '@patternfly/react-core';
+import { DualListSelector } from '@patternfly/react-core/deprecated';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import isEqual from 'lodash/isEqual';
 
diff --git a/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js b/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
index 30b92de7f..a3c978efa 100644
--- a/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
+++ b/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
@@ -11,6 +11,7 @@ const DualListSortButton = ({ position, ...rest }) => {
 
   return (
     <Button
+      icon={sortConfig[position] === 'asc' ? <PficonSortCommonAscIcon /> : <PficonSortCommonDescIcon />}
       variant={ButtonVariant.plain}
       onClick={
         sortConfig[position] === 'asc'
@@ -19,9 +20,7 @@ const DualListSortButton = ({ position, ...rest }) => {
       }
       aria-label="Sort"
       {...rest}
-    >
-      {sortConfig[position] === 'asc' ? <PficonSortCommonAscIcon /> : <PficonSortCommonDescIcon />}
-    </Button>
+    />
   );
 };
 
diff --git a/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js b/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
index 33deaced0..390f74ea9 100644
--- a/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
+++ b/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { DualListSelector } from '@patternfly/react-core';
+import { DualListSelector } from '@patternfly/react-core/deprecated';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import isEqual from 'lodash/isEqual';
 
diff --git a/packages/pf4-component-mapper/src/field-array/field-array.js b/packages/pf4-component-mapper/src/field-array/field-array.js
index f5dd1bdda..974aba937 100644
--- a/packages/pf4-component-mapper/src/field-array/field-array.js
+++ b/packages/pf4-component-mapper/src/field-array/field-array.js
@@ -32,13 +32,12 @@ const ArrayItem = memo(
           <FlexItem>
             {editedFields[0].label && <Spacer />}
             <Button
+              icon={<TrashIcon />}
               variant="plain"
               aria-label={buttonLabels.remove}
               disabled={isRemoveDisabled}
               {...(!isRemoveDisabled && { onClick: () => remove(fieldIndex) })}
-            >
-              <TrashIcon />
-            </Button>
+            />
           </FlexItem>
         </Flex>
         {!isLast && editedFields.length > 1 && <hr className="ddf-final-form-hr" />}
diff --git a/packages/pf4-component-mapper/src/form-group/form-group.js b/packages/pf4-component-mapper/src/form-group/form-group.js
index cced08451..4ca0dfe52 100644
--- a/packages/pf4-component-mapper/src/form-group/form-group.js
+++ b/packages/pf4-component-mapper/src/form-group/form-group.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormGroup as Pf4FormGroup, TextContent, Text, FormHelperText, HelperText, HelperTextItem } from '@patternfly/react-core';
+import { FormGroup as Pf4FormGroup, Content, FormHelperText, HelperText, HelperTextItem } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 
 import showError from '../show-error/show-error';
@@ -10,9 +10,9 @@ const FormGroup = ({ label, isRequired, helperText, meta, validateOnMount, descr
   return (
     <Pf4FormGroup isRequired={isRequired} label={!hideLabel && label} fieldId={id} aria-label={meta.error || meta.submitError} {...FormGroupProps}>
       {description && (
-        <TextContent>
-          <Text component="small">{description}</Text>
-        </TextContent>
+        <Content>
+          <Content component="small">{description}</Content>
+        </Content>
       )}
       {children}
       {(helperText || ['error', 'warning'].includes(validated)) && (
diff --git a/packages/pf4-component-mapper/src/form-template/form-template.js b/packages/pf4-component-mapper/src/form-template/form-template.js
index c7514bdd0..da064e7ba 100644
--- a/packages/pf4-component-mapper/src/form-template/form-template.js
+++ b/packages/pf4-component-mapper/src/form-template/form-template.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import FormTemplate from '@data-driven-forms/common/form-template';
 
-import { Button as PF4Button, ActionGroup, Form, TextContent, Text, TextVariants, Alert } from '@patternfly/react-core';
+import { Button as PF4Button, ActionGroup, Form, Content, ContentVariants, Alert } from '@patternfly/react-core';
 
 export const Button = ({ label, bsStyle, children, disabled, buttonType, ...props }) => (
   <PF4Button variant={buttonType === 'cancel' ? 'link' : bsStyle || 'secondary'} isDisabled={disabled} {...props}>
@@ -27,11 +27,11 @@ ButtonGroup.propTypes = {
 };
 
 export const Title = ({ children, ...props }) => (
-  <TextContent>
-    <Text component={TextVariants.h1} {...props}>
+  <Content>
+    <Content component={ContentVariants.h1} {...props}>
       {children}
-    </Text>
-  </TextContent>
+    </Content>
+  </Content>
 );
 
 Title.propTypes = {
@@ -39,11 +39,11 @@ Title.propTypes = {
 };
 
 export const Description = ({ children, ...props }) => (
-  <TextContent>
-    <Text component={TextVariants.p} {...props}>
+  <Content>
+    <Content component={ContentVariants.p} {...props}>
       {children}
-    </Text>
-  </TextContent>
+    </Content>
+  </Content>
 );
 
 Description.propTypes = {
diff --git a/packages/pf4-component-mapper/src/plain-text/plain-text.d.ts b/packages/pf4-component-mapper/src/plain-text/plain-text.d.ts
index d4c87cb4e..2a88cd681 100644
--- a/packages/pf4-component-mapper/src/plain-text/plain-text.d.ts
+++ b/packages/pf4-component-mapper/src/plain-text/plain-text.d.ts
@@ -1,5 +1,5 @@
 import { ReactNode } from "react";
-import { TextProps, TextContentProps } from "@patternfly/react-core";
+import { ContentProps, TextContentProps } from "@patternfly/react-core";
 
 interface InternalPlainTextProps {
   label: ReactNode;
@@ -8,7 +8,7 @@ interface InternalPlainTextProps {
   TextContentProps: TextContentProps,
 }
 
-export type PlainTextProps = InternalPlainTextProps & TextProps;
+export type PlainTextProps = InternalPlainTextProps & ContentProps;
 
 declare const PlainText: React.ComponentType<PlainTextProps>;
 
diff --git a/packages/pf4-component-mapper/src/plain-text/plain-text.js b/packages/pf4-component-mapper/src/plain-text/plain-text.js
index fea25b440..b36cfd8da 100644
--- a/packages/pf4-component-mapper/src/plain-text/plain-text.js
+++ b/packages/pf4-component-mapper/src/plain-text/plain-text.js
@@ -1,19 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { TextContent, Text } from '@patternfly/react-core';
+import { Content } from '@patternfly/react-core';
 import validTextFields from '@data-driven-forms/common/utils/valid-text-fields';
 
 const PlainText = ({ component, label, name, variant = 'p', TextContentProps, ...rest }) => (
-  <TextContent {...TextContentProps}>
+  <Content {...TextContentProps}>
     {typeof label === 'string'
       ? label.split('\n').map((paragraph, index) => (
-          <Text component={variant} {...rest} key={`${name}-${index}`}>
+          <Content component={variant} {...rest} key={`${name}-${index}`}>
             {paragraph}
-          </Text>
+          </Content>
         ))
       : label}
-  </TextContent>
+  </Content>
 );
 
 PlainText.propTypes = {
diff --git a/packages/pf4-component-mapper/src/select/select/clear-indicator.js b/packages/pf4-component-mapper/src/select/select/clear-indicator.js
index 24e51d585..7f8e0981d 100644
--- a/packages/pf4-component-mapper/src/select/select/clear-indicator.js
+++ b/packages/pf4-component-mapper/src/select/select/clear-indicator.js
@@ -10,7 +10,7 @@ const ClearIndicator = ({ clearSelection }) => (
       clearSelection();
       event.stopPropagation();
     }}
-    className="pf-v5-c-button pf-v5-c-select__toggle-clear pf-v5-u-p-0"
+    className="pf-v6-c-button pf-v6-c-menu-toggle-clear pf-v6-u-p-0"
     type="button"
     aria-label="Clear all"
   >
diff --git a/packages/pf4-component-mapper/src/select/select/empty-options.js b/packages/pf4-component-mapper/src/select/select/empty-options.js
index e5c74da09..6ab042b34 100644
--- a/packages/pf4-component-mapper/src/select/select/empty-options.js
+++ b/packages/pf4-component-mapper/src/select/select/empty-options.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 const EmptyOptions = ({ noOptionsMessage, noResultsMessage, getInputProps, isSearchable, isFetching }) => {
   const { value } = getInputProps();
   const message = isFetching ? noOptionsMessage() : isSearchable && value ? noResultsMessage : noOptionsMessage();
-  return <div className="pf-v5-c-select__menu-item pf-m-disabled">{message}</div>;
+  return <div className="pf-v6-c-menu__item pf-m-disabled">{message}</div>;
 };
 
 EmptyOptions.propTypes = {
diff --git a/packages/pf4-component-mapper/src/select/select/input.js b/packages/pf4-component-mapper/src/select/select/input.js
index 6371be2cd..c9645515e 100644
--- a/packages/pf4-component-mapper/src/select/select/input.js
+++ b/packages/pf4-component-mapper/src/select/select/input.js
@@ -24,22 +24,26 @@ const Input = ({ inputRef, isSearchable, isDisabled, getInputProps, value, ...pr
   const inputProps = getInputProps({ disabled: isDisabled });
   const initialInputValue = getInputString(inputProps.value, value);
   return (
-    <div className="ddorg__pf4-component-mapper__select-input-wrapper pf-v5-c-text-input-group pf-m-typeahead">
-      <input
-        value=""
-        {...props}
-        className="pf-v5-c-text-input-group__text-input"
-        ref={inputRef}
-        {...{
-          ...inputProps,
-          value: initialInputValue,
-          onKeyDown: (event, ...args) => {
-            event.stopPropagation();
-            inputProps.onKeyDown(event, ...args);
-          },
-          onChange: inputProps.onChange || Function,
-        }}
-      />
+    <div className="ddorg__pf4-component-mapper__select-input-wrapper pf-v6-c-text-input-group pf-m-typeahead pf-m-plain">
+      <div className="pf-v6-c-text-input-group__main">
+        <span className="pf-v6-c-text-input-group__text">
+          <input
+            value=""
+            {...props}
+            className="pf-v6-c-text-input-group__text-input"
+            ref={inputRef}
+            {...{
+              ...inputProps,
+              value: initialInputValue,
+              onKeyDown: (event, ...args) => {
+                event.stopPropagation();
+                inputProps.onKeyDown(event, ...args);
+              },
+              onChange: inputProps.onChange || Function,
+            }}
+          />
+        </span>
+      </div>
     </div>
   );
 };
diff --git a/packages/pf4-component-mapper/src/select/select/menu.css b/packages/pf4-component-mapper/src/select/select/menu.css
index 745df6311..5e04aae5b 100644
--- a/packages/pf4-component-mapper/src/select/select/menu.css
+++ b/packages/pf4-component-mapper/src/select/select/menu.css
@@ -1,4 +1,4 @@
-.pf-v5-c-select__menu.ddorg__pf4-component-mapper__select-menu-portal {
+.pf-v6-c-menu.ddorg__pf4-component-mapper__menu-portal {
   margin-top: 2px;
   position: relative;
   width: calc(100% - 2px);
diff --git a/packages/pf4-component-mapper/src/select/select/menu.js b/packages/pf4-component-mapper/src/select/select/menu.js
index 7e8f2fea0..4b532a5d7 100644
--- a/packages/pf4-component-mapper/src/select/select/menu.js
+++ b/packages/pf4-component-mapper/src/select/select/menu.js
@@ -84,7 +84,7 @@ const MenuPortal = ({ selectToggleRef, menuPortalTarget, children }) => {
   const portalDiv = (
     <div
       ref={menuRef}
-      className="pf-v5-c-select ddorg_pf4-component-mapper__select-portal-menu"
+      className="pf-v6-c-menu ddorg_pf4-component-mapper__select-portal-menu"
       style={{
         zIndex: 401,
         position: 'absolute',
@@ -147,7 +147,7 @@ const Menu = ({
   };
 
   const menuItems = (
-    <ul className={`pf-v5-c-select__menu${menuIsPortal ? ' ddorg__pf4-component-mapper__select-menu-portal' : ''}`}>
+    <ul className={`pf-v6-c-menu__list${menuIsPortal ? ' ddorg__pf4-component-mapper__menu-portal' : ''}`}>
       {filteredOptions.length === 0 && (
         <EmptyOption
           isSearchable={isSearchable}
@@ -160,15 +160,15 @@ const Menu = ({
       {filteredOptions.map((item, arrayIndex) => {
         if (item.options) {
           return (
-            <div className="pf-v5-c-select__menu-group" key={`group-${arrayIndex}`}>
-              <div className="pf-v5-c-select__menu-group-title">{item.label}</div>
+            <div className="pf-v6-c-menu__group" key={`group-${arrayIndex}`}>
+              <div className="pf-v6-c-menu__group-title">{item.label}</div>
               {item.options.map((nestedItem) => createOption(nestedItem))}
             </div>
           );
         }
 
         if (item.divider) {
-          return <hr className="pf-v5-c-divider" key={`divider-${index}`} />;
+          return <hr className="pf-v6-c-divider" key={`divider-${index}`} />;
         }
 
         return createOption(item);
diff --git a/packages/pf4-component-mapper/src/select/select/option.js b/packages/pf4-component-mapper/src/select/select/option.js
index 8a8129240..467fffb5b 100644
--- a/packages/pf4-component-mapper/src/select/select/option.js
+++ b/packages/pf4-component-mapper/src/select/select/option.js
@@ -4,22 +4,22 @@ import PropTypes from 'prop-types';
 import { CheckIcon } from '@patternfly/react-icons';
 
 const Option = ({ item, isActive, isSelected, ...props }) => (
-  <li>
+  <li className={`pf-v6-c-menu__list-item${item.isDisabled || item.disabled ? ' pf-m-disabled' : ''}`}>
     <button
       {...props}
       disabled={item.isDisabled || item.disabled}
       type="button"
-      className={`pf-v5-c-select__menu-item${isSelected ? ' pf-m-selected' : ''}${isActive ? ' pf-m-focus' : ''}${
-        item.isDisabled || item.disabled ? ' pf-m-disabled' : ''
-      }`}
+      className={`pf-v6-c-menu__item${isSelected ? ' pf-m-selected' : ''}${isActive ? ' pf-m-focus' : ''}`}
     >
-      {item.label}
-      {isSelected && (
-        <span className="pf-v5-c-select__menu-item-icon">
-          <CheckIcon />
-        </span>
-      )}
-      {item.description && <div className="pf-v5-c-select__menu-item-description">{item.description}</div>}
+      <span className="pf-v6-c-menu__item-main">
+        {item.label}
+        {isSelected && (
+          <span className="pf-v6-c-menu__item-icon">
+            <CheckIcon />
+          </span>
+        )}
+        {item.description && <div className="pf-v6-c-menu__item-text">{item.description}</div>}
+      </span>
     </button>
   </li>
 );
diff --git a/packages/pf4-component-mapper/src/select/select/select-styles.css b/packages/pf4-component-mapper/src/select/select/select-styles.css
index 7d3f116cd..5c7d0cb6a 100644
--- a/packages/pf4-component-mapper/src/select/select/select-styles.css
+++ b/packages/pf4-component-mapper/src/select/select/select-styles.css
@@ -7,11 +7,6 @@
   animation: spin 2s linear infinite;
 }
 
-.pf-v5-c-select_toggle-wrapper.ddorg__pf4-component-mapper__select-toggle-wrapper {
-  flex: 1;
-  display: flex;
-}
-
 .ddorg__pf4-component-mapper__select-toggle.pf-m-typeahead {
   padding-left: 0;
 }
diff --git a/packages/pf4-component-mapper/src/select/select/select.js b/packages/pf4-component-mapper/src/select/select/select.js
index e56b38389..95dd1580b 100644
--- a/packages/pf4-component-mapper/src/select/select/select.js
+++ b/packages/pf4-component-mapper/src/select/select/select.js
@@ -7,9 +7,9 @@ import Downshift from 'downshift';
 import { CaretDownIcon, CloseIcon, CircleNotchIcon } from '@patternfly/react-icons';
 
 import './select-styles.css';
-import '@patternfly/react-styles/css/components/Select/select.css';
-import '@patternfly/react-styles/css/components/Chip/chip.css';
-import '@patternfly/react-styles/css/components/Chip/chip-group.css';
+import '@patternfly/react-styles/css/components/Menu/menu.css';
+import '@patternfly/react-styles/css/components/Label/label.css';
+import '@patternfly/react-styles/css/components/Label/label-group.css';
 import '@patternfly/react-styles/css/components/Divider/divider.css';
 
 import Menu from './menu';
@@ -30,19 +30,19 @@ const itemToString = (value, isMulti, showMore, handleShowMore, handleChange) =>
     if (isMulti) {
       const visibleOptions = showMore ? value : value.slice(0, 3);
       return (
-        <div className="pf-v5-c-chip-group pf-v5-u-ml-sm" onClick={(event) => event.stopPropagation()}>
-          <ul className="pf-v5-c-chip-group__list" aria-label="Chip group category">
+        <div className="pf-v6-c-label-group pf-v6-u-ml-sm" onClick={(event) => event.stopPropagation()}>
+          <ul className="pf-v6-c-label-group__list" aria-label="Chip group category">
             {visibleOptions.map((item, index) => {
               const label = typeof item === 'object' ? item.label : item;
               return (
-                <li className="pf-v5-c-chip-group__list-item" onClick={(event) => event.stopPropagation()} key={item.key || item.value || item}>
-                  <div className="pf-v5-c-chip">
-                    <span className="pf-v5-c-chip__text" id={`pf-random-id-${index}-${label}`}>
+                <li className="pf-v6-c-label-group__list-item" onClick={(event) => event.stopPropagation()} key={item.key || item.value || item}>
+                  <div className="pf-v6-c-label">
+                    <span className="pf-v6-c-label__text" id={`pf-random-id-${index}-${label}`}>
                       {label}
                     </span>
                     <button
                       onClick={() => handleChange(item)}
-                      className="pf-v5-c-button pf-u-plain pf-v5-u-pt-0 pf-v5-u-pb-0"
+                      className="pf-v6-c-button pf-u-plain pf-v6-u-pt-0 pf-v6-u-pb-0"
                       type="button"
                       aria-label="remove option"
                     >
@@ -53,9 +53,9 @@ const itemToString = (value, isMulti, showMore, handleShowMore, handleChange) =>
               );
             })}
             {value.length > 3 && (
-              <li className="pf-v5-c-chip-group__list-item">
-                <button type="button" onClick={handleShowMore} className="pf-v5-c-chip pf-m-overflow">
-                  <span className="pf-v5-c-chip__text">{showMore ? 'Show less' : `${value.length - 3} more`}</span>
+              <li className="pf-v6-c-label-group__list-item">
+                <button type="button" onClick={handleShowMore} className="pf-v6-c-label pf-m-overflow">
+                  <span className="pf-v6-c-label__text">{showMore ? 'Show less' : `${value.length - 3} more`}</span>
                 </button>
               </li>
             )}
@@ -213,30 +213,32 @@ const InternalSelect = ({
       {({ isOpen, inputValue, itemToString, selectedItem, clearSelection, getInputProps, getToggleButtonProps, getItemProps, highlightedIndex }) => {
         const toggleButtonProps = getToggleButtonProps();
         return (
-          <div className="pf-v5-c-select">
+          <div className="pf-v6-c-menu">
             <div
               ref={selectToggleRef}
               disabled={isDisabled}
-              className={`pf-v5-c-select__toggle${isDisabled ? ' pf-v5-m-disabled' : ''}${
-                isSearchable ? ' pf-v5-m-typeahead' : ''
+              className={`pf-v6-c-menu-toggle${isDisabled ? ' pf-m-disabled' : ''}${
+                isSearchable ? ' pf-m-typeahead' : ''
               } ddorg__pf4-component-mapper__select-toggle`}
               tabIndex={0}
               {...toggleButtonProps}
             >
-              <div className="pf-v5-c-select_toggle-wrapper ddorg__pf4-component-mapper__select-toggle-wrapper">
-                <ValueContainer
-                  isMulti={isMulti}
-                  isSearchable={isSearchable}
-                  placeholder={placeholder}
-                  inputRef={inputRef}
-                  getInputProps={getInputProps}
-                  value={itemToString(selectedItem, isMulti, showMore, handleShowMore, handleChange)}
-                />
-              </div>
+              <ValueContainer
+                isMulti={isMulti}
+                isSearchable={isSearchable}
+                placeholder={placeholder}
+                inputRef={inputRef}
+                getInputProps={getInputProps}
+                value={itemToString(selectedItem, isMulti, showMore, handleShowMore, handleChange)}
+              />
               {isClearable && parsedValue && <ClearIndicator clearSelection={clearSelection} />}
-              <span className="pf-v5-c-select__toggle-arrow">
-                <Icon>{isFetching ? <CircleNotchIcon className="ddorg__pf4-component-mapper__select-loading-icon" /> : <CaretDownIcon />}</Icon>
-              </span>
+              <button className="pf-v6-c-menu-toggle__button">
+                <span className="pf-v6-c-menu-toggle__controls">
+                  <span className="pf-v6-c-menu-toggle__toggle-icon">
+                    <Icon>{isFetching ? <CircleNotchIcon className="ddorg__pf4-component-mapper__select-loading-icon" /> : <CaretDownIcon />}</Icon>
+                  </span>
+                </span>
+              </button>
             </div>
             {isOpen && (
               <Menu
diff --git a/packages/pf4-component-mapper/src/select/select/value-container.js b/packages/pf4-component-mapper/src/select/select/value-container.js
index 3f54b1f79..885b6af6a 100644
--- a/packages/pf4-component-mapper/src/select/select/value-container.js
+++ b/packages/pf4-component-mapper/src/select/select/value-container.js
@@ -16,7 +16,7 @@ const ValueContainer = ({ value, isMulti, placeholder, getInputProps, isSearchab
     return <Input placeholder={placeholder} inputRef={inputRef} getInputProps={getInputProps} value={value} />;
   }
 
-  return <span className="pf-v5-c-select__toggle-text">{value || placeholder}</span>;
+  return <span className="pf-v6-c-menu-toggle-text">{value || placeholder}</span>;
 };
 
 ValueContainer.propTypes = {
diff --git a/packages/pf4-component-mapper/src/sub-form/sub-form.js b/packages/pf4-component-mapper/src/sub-form/sub-form.js
index 717ff2138..4745c40a3 100644
--- a/packages/pf4-component-mapper/src/sub-form/sub-form.js
+++ b/packages/pf4-component-mapper/src/sub-form/sub-form.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
-import { Title, Grid, GridItem, TextContent, Text, TextVariants } from '@patternfly/react-core';
+import { Title, Grid, GridItem, Content, ContentVariants } from '@patternfly/react-core';
 
 const SubForm = ({ fields, title, description, validate: _validate, component, ...rest }) => {
   const formOptions = useFormApi();
@@ -18,11 +18,11 @@ const SubForm = ({ fields, title, description, validate: _validate, component, .
       )}
       {description && (
         <GridItem sm={12}>
-          <TextContent>
-            <Text component={TextVariants.small} style={{ marginBottom: 0 }}>
+          <Content>
+            <Content component={ContentVariants.small} style={{ marginBottom: 0 }}>
               {description}
-            </Text>
-          </TextContent>
+            </Content>
+          </Content>
         </GridItem>
       )}
       {formOptions.renderForm(fields, formOptions)}
diff --git a/packages/pf4-component-mapper/src/switch/switch.js b/packages/pf4-component-mapper/src/switch/switch.js
index 6d0a6ffe0..bd76aace6 100644
--- a/packages/pf4-component-mapper/src/switch/switch.js
+++ b/packages/pf4-component-mapper/src/switch/switch.js
@@ -6,25 +6,11 @@ import FormGroup from '../form-group/form-group';
 import IsRequired from '../is-required/is-required';
 
 const Switch = (props) => {
-  const {
-    label,
-    offText,
-    onText,
-    isRequired,
-    helperText,
-    meta,
-    validateOnMount,
-    description,
-    input,
-    isReadOnly,
-    isDisabled,
-    id,
-    FormGroupProps,
-    ...rest
-  } = useFieldApi({
-    ...props,
-    type: 'checkbox',
-  });
+  const { label, onText, isRequired, helperText, meta, validateOnMount, description, input, isReadOnly, isDisabled, id, FormGroupProps, ...rest } =
+    useFieldApi({
+      ...props,
+      type: 'checkbox',
+    });
   return (
     <FormGroup
       isRequired={isRequired}
@@ -42,7 +28,6 @@ const Switch = (props) => {
         id={id || input.name}
         isDisabled={isDisabled || isReadOnly}
         label={isRequired ? <IsRequired>{onText || label}</IsRequired> : onText || label}
-        labelOff={isRequired ? <IsRequired>{offText || label}</IsRequired> : offText || label}
       />
     </FormGroup>
   );
@@ -58,7 +43,6 @@ Switch.propTypes = {
   isDisabled: PropTypes.bool,
   id: PropTypes.string,
   onText: PropTypes.node,
-  offText: PropTypes.node,
   FormGroupProps: PropTypes.object,
 };
 
diff --git a/packages/pf4-component-mapper/src/tests/dual-list-select.test.js b/packages/pf4-component-mapper/src/tests/dual-list-select.test.js
index e293942d5..8f766430e 100644
--- a/packages/pf4-component-mapper/src/tests/dual-list-select.test.js
+++ b/packages/pf4-component-mapper/src/tests/dual-list-select.test.js
@@ -257,7 +257,7 @@ describe('DualListSelect', () => {
         };
 
         const { container } = render(<FormRenderer {...initialProps} schema={schema} />);
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'cats',
           'cats_1',
           'cats_2',
@@ -267,7 +267,7 @@ describe('DualListSelect', () => {
 
         await userEvent.click(screen.getByLabelText('sort-options'));
 
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'zebras',
           'pigeons',
           'cats_2',
@@ -277,7 +277,7 @@ describe('DualListSelect', () => {
 
         await userEvent.click(screen.getByLabelText('sort-options'));
 
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'cats',
           'cats_1',
           'cats_2',
@@ -310,7 +310,7 @@ describe('DualListSelect', () => {
           />
         );
 
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'cats',
           'cats_1',
           'cats_2',
@@ -320,7 +320,7 @@ describe('DualListSelect', () => {
 
         await userEvent.click(screen.getByLabelText('sort-values'));
 
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'zebras',
           'pigeons',
           'cats_2',
@@ -330,7 +330,7 @@ describe('DualListSelect', () => {
 
         await userEvent.click(screen.getByLabelText('sort-values'));
 
-        expect([...container.getElementsByClassName('pf-v5-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
+        expect([...container.getElementsByClassName('pf-v6-c-dual-list-selector__item-text')].map((e) => e.textContent)).toEqual([
           'cats',
           'cats_1',
           'cats_2',
diff --git a/packages/pf4-component-mapper/src/tests/form-fields.test.js b/packages/pf4-component-mapper/src/tests/form-fields.test.js
index a8414b348..605cf5ab0 100644
--- a/packages/pf4-component-mapper/src/tests/form-fields.test.js
+++ b/packages/pf4-component-mapper/src/tests/form-fields.test.js
@@ -18,15 +18,14 @@ describe('FormFields', () => {
     id: 'someIdKey',
   };
 
-  it('should render with onText/OffText Switch correctly', () => {
+  it('should render with onText Switch correctly', () => {
     render(
       <RenderWithProvider>
-        <Switch {...props} onText="I am on" offText="Turned off" />
+        <Switch {...props} onText="I am on" />
       </RenderWithProvider>
     );
 
-    expect(screen.getByText('I am on')).toHaveClass('pf-m-on');
-    expect(screen.getByText('Turned off')).not.toHaveClass('pf-m-on');
+    expect(screen.getByRole('switch')).toHaveAccessibleName('I am on');
   });
 
   describe('formFields generated tests', () => {
diff --git a/packages/pf4-component-mapper/src/tests/form-template.test.js b/packages/pf4-component-mapper/src/tests/form-template.test.js
index 45e519b25..98bd97818 100644
--- a/packages/pf4-component-mapper/src/tests/form-template.test.js
+++ b/packages/pf4-component-mapper/src/tests/form-template.test.js
@@ -7,7 +7,7 @@ describe('Layout mapper', () => {
   it('should return PF4 Button', () => {
     render(<Button label="some label" />);
 
-    expect(screen.getByText('some label', { selector: 'button' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'some label' })).toBeInTheDocument();
   });
 
   it('should return PF4 ButtonGroup', () => {
@@ -17,13 +17,13 @@ describe('Layout mapper', () => {
       </ButtonGroup>
     );
 
-    expect(screen.getByText('some label', { selector: 'button' }).closest('.pf-v5-c-form__actions')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'some label' }).closest('.pf-v6-c-form__actions')).toBeInTheDocument();
   });
 
   it('should return PF4 Title', () => {
     render(<Title>Title</Title>);
 
-    expect(screen.getByText('Title', { selector: 'h1' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'Title', level: 1 })).toBeInTheDocument();
   });
 
   it('should return PF4 Description', () => {
@@ -35,6 +35,6 @@ describe('Layout mapper', () => {
   it('should return PF4 Button disabled', () => {
     render(<Button disabled={true} label="some label" />);
 
-    expect(screen.getByText('some label', { selector: 'button' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'some label' })).toBeDisabled();
   });
 });
diff --git a/packages/pf4-component-mapper/src/tests/select/select.test.js b/packages/pf4-component-mapper/src/tests/select/select.test.js
index bfb67a349..fcaa9f731 100644
--- a/packages/pf4-component-mapper/src/tests/select/select.test.js
+++ b/packages/pf4-component-mapper/src/tests/select/select.test.js
@@ -57,7 +57,7 @@ describe('<Select />', () => {
     await userEvent.click(screen.getByLabelText('open menu'));
     await userEvent.click(screen.getByText('Translated'));
 
-    expect(screen.getByText('Translated', { selector: 'h1' }).closest('.pf-v5-c-select__toggle-text')).toBeInTheDocument();
+    expect(screen.getByText('Translated', { selector: 'h1' }).closest('.pf-v6-c-menu-toggle-text')).toBeInTheDocument();
   });
 
   it('should render description', async () => {
@@ -134,10 +134,10 @@ describe('<Select />', () => {
 
     await userEvent.click(screen.getByLabelText('open menu'));
 
-    expect(screen.getByText('Category 1')).toHaveClass('pf-v5-c-select__menu-group-title');
-    expect(screen.getByText('Category 2')).toHaveClass('pf-v5-c-select__menu-group-title');
-    expect(container.getElementsByClassName('pf-v5-c-divider')).toHaveLength(3);
-    expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual([
+    expect(screen.getByText('Category 1')).toHaveClass('pf-v6-c-menu__group-title');
+    expect(screen.getByText('Category 2')).toHaveClass('pf-v6-c-menu__group-title');
+    expect(container.getElementsByClassName('pf-v6-c-divider')).toHaveLength(3);
+    expect([...container.getElementsByClassName('pf-v6-c-menu__item-main')].map((opt) => opt.textContent)).toEqual([
       'value 1',
       'value 2',
       'independent 1',
@@ -150,7 +150,7 @@ describe('<Select />', () => {
 
     await userEvent.click(screen.getByLabelText('open menu'));
 
-    expect(screen.getByText('value 1', { selector: 'button.pf-v5-c-select__menu-item' })).toHaveClass('pf-m-selected');
+    expect(screen.getByRole('option', { name: 'value 1' })).toHaveClass('pf-m-selected');
 
     await userEvent.click(screen.getByText('Submit'));
 
@@ -200,11 +200,11 @@ describe('<Select />', () => {
     await userEvent.click(screen.getByLabelText('open menu'));
 
     await userEvent.type(screen.getByPlaceholderText('Choose...'), 'value');
-    expect(screen.getByText('Category 1')).toHaveClass('pf-v5-c-select__menu-group-title');
-    expect(screen.getByText('Category 2')).toHaveClass('pf-v5-c-select__menu-group-title');
-    expect(container.getElementsByClassName('pf-v5-c-divider')).toHaveLength(0);
+    expect(screen.getByText('Category 1')).toHaveClass('pf-v6-c-menu__group-title');
+    expect(screen.getByText('Category 2')).toHaveClass('pf-v6-c-menu__group-title');
+    expect(container.getElementsByClassName('pf-v6-c-divider')).toHaveLength(0);
 
-    expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual([
+    expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual([
       'value 1',
       'value 2',
       'value 3',
@@ -213,13 +213,10 @@ describe('<Select />', () => {
 
     await userEvent.clear(screen.getByPlaceholderText('Choose...'));
     await userEvent.type(screen.getByPlaceholderText('Choose...'), 'independent');
-    expect(container.getElementsByClassName('pf-v5-c-divider')).toHaveLength(0);
-    expect(container.getElementsByClassName('pf-v5-c-select__menu-group-title')).toHaveLength(0);
+    expect(container.getElementsByClassName('pf-v6-c-divider')).toHaveLength(0);
+    expect(container.getElementsByClassName('pf-v6-c-menu__group-title')).toHaveLength(0);
 
-    expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual([
-      'independent 1',
-      'independent 2',
-    ]);
+    expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual(['independent 1', 'independent 2']);
   });
 
   it('should return single simple value', async () => {
@@ -247,7 +244,7 @@ describe('<Select />', () => {
     render(<Select {...initialProps} value={value} isMulti onChange={onChange} closeMenuOnSelect={false} />);
 
     await userEvent.click(screen.getByLabelText('open menu'));
-    await userEvent.click(screen.getByText('First option', { selector: '.pf-v5-c-select__menu-item' }));
+    await userEvent.click(screen.getByText('First option', { selector: '.pf-v6-c-menu__item-main' }));
     await userEvent.click(screen.getByText('Second option'));
 
     expect(onChange).toHaveBeenCalledTimes(2);
@@ -261,7 +258,7 @@ describe('<Select />', () => {
     render(<Select {...initialProps} value={value} simpleValue={false} isMulti onChange={onChange} closeMenuOnSelect={false} />);
 
     await userEvent.click(screen.getByLabelText('open menu'));
-    await userEvent.click(screen.getByText('First option', { selector: '.pf-v5-c-select__menu-item' }));
+    await userEvent.click(screen.getByText('First option', { selector: '.pf-v6-c-menu__item-main' }));
     await userEvent.click(screen.getByText('Second option'));
 
     expect(onChange).toHaveBeenCalledTimes(2);
@@ -283,12 +280,12 @@ describe('<Select />', () => {
     ];
     const { container } = render(<Select {...initialProps} options={options} value={value} isMulti closeMenuOnSelect={false} />);
 
-    expect(container.querySelectorAll('.pf-v5-c-chip-group')).toHaveLength(1);
-    expect(container.querySelectorAll('div.pf-v5-c-chip')).toHaveLength(3);
+    expect(container.querySelectorAll('.pf-v6-c-label-group')).toHaveLength(1);
+    expect(container.querySelectorAll('div.pf-v6-c-label')).toHaveLength(3);
 
     await userEvent.click(screen.getByText('1 more'));
 
-    expect(container.querySelectorAll('div.pf-v5-c-chip')).toHaveLength(4);
+    expect(container.querySelectorAll('div.pf-v6-c-label')).toHaveLength(4);
   });
 
   it('should call on change when removing chip', async () => {
@@ -348,7 +345,7 @@ describe('<Select />', () => {
     );
 
     await userEvent.click(screen.getByLabelText('open menu'));
-    await waitFor(() => expect(screen.getByText('label', { selector: '.pf-v5-c-select__menu-item' })).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('label', { selector: '.pf-v6-c-menu__item-main' })).toBeInTheDocument());
 
     expect(onChange).toHaveBeenCalledWith(['123']);
   });
@@ -370,7 +367,7 @@ describe('<Select />', () => {
     );
 
     await userEvent.click(screen.getByLabelText('open menu'));
-    await waitFor(() => expect(screen.getByText('label', { selector: '.pf-v5-c-select__menu-item' })).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText('label', { selector: '.pf-v6-c-menu__item-main' })).toBeInTheDocument());
 
     expect(onChange).toHaveBeenCalledWith([{ label: 'label', value: '123' }]);
   });
@@ -410,15 +407,13 @@ describe('<Select />', () => {
 
       await userEvent.click(screen.getByLabelText('open menu'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual(
+      expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual(
         initialProps.options.map((opt) => opt.label)
       );
 
       rerender(<Select {...initialProps} options={NEW_OPTIONS} />);
 
-      expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual(
-        NEW_OPTIONS.map((opt) => opt.label)
-      );
+      expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual(NEW_OPTIONS.map((opt) => opt.label));
     });
 
     it('should change the options when loadOptions prop is changed', async () => {
@@ -426,7 +421,7 @@ describe('<Select />', () => {
 
       await userEvent.click(screen.getByLabelText('open menu'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual(
+      expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual(
         initialProps.options.map((opt) => opt.label)
       );
 
@@ -434,9 +429,7 @@ describe('<Select />', () => {
         rerender(<Select {...initialProps} loadOptions={asyncLoadingNew} />);
       });
 
-      expect([...container.getElementsByClassName('pf-v5-c-select__menu-item')].map((opt) => opt.textContent)).toEqual(
-        NEW_OPTIONS.map((opt) => opt.label)
-      );
+      expect([...container.getElementsByClassName('pf-v6-c-menu__item')].map((opt) => opt.textContent)).toEqual(NEW_OPTIONS.map((opt) => opt.label));
     });
 
     it('should change the value when new options do not include it', async () => {
diff --git a/packages/pf4-component-mapper/src/tests/tabs.test.js b/packages/pf4-component-mapper/src/tests/tabs.test.js
index 969b6a9c3..06f224da5 100644
--- a/packages/pf4-component-mapper/src/tests/tabs.test.js
+++ b/packages/pf4-component-mapper/src/tests/tabs.test.js
@@ -52,10 +52,10 @@ describe('Tabs component', () => {
       </RenderWithProvider>
     );
 
-    expect(screen.getByText('cosiTitle').closest('.pf-v5-c-tabs__item')).toHaveClass('pf-m-current');
+    expect(screen.getByText('cosiTitle').closest('.pf-v6-c-tabs__item')).toHaveClass('pf-m-current');
 
     await userEvent.click(screen.getByText('cosiTitle2'));
 
-    expect(screen.getByText('cosiTitle2').closest('.pf-v5-c-tabs__item')).toHaveClass('pf-m-current');
+    expect(screen.getByText('cosiTitle2').closest('.pf-v6-c-tabs__item')).toHaveClass('pf-m-current');
   });
 });
diff --git a/packages/pf4-component-mapper/src/tests/wizard/wizard.test.js b/packages/pf4-component-mapper/src/tests/wizard/wizard.test.js
index 9a0df7f7b..09dd33636 100644
--- a/packages/pf4-component-mapper/src/tests/wizard/wizard.test.js
+++ b/packages/pf4-component-mapper/src/tests/wizard/wizard.test.js
@@ -142,7 +142,7 @@ describe('<Wizard />', () => {
   it('should render correctly and unrender', () => {
     render(<FormRenderer {...initialProps} />);
 
-    expect(screen.getByText('foo-step', { selector: 'button' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'foo-step' })).toBeInTheDocument();
 
     cleanup();
   });
@@ -150,11 +150,11 @@ describe('<Wizard />', () => {
   it('should open nav', async () => {
     render(<FormRenderer {...initialProps} />);
 
-    expect(screen.getByText('foo-step', { selector: 'button.pf-m-current' }).closest('.pf-m-expanded')).toBeNull();
+    expect(screen.getByRole('button', { name: 'foo-step' }).closest('.pf-m-expanded')).toBeNull();
 
     await userEvent.click(screen.getByLabelText('Wizard Toggle'));
 
-    expect(screen.getByText('foo-step', { selector: 'button.pf-m-current' }).closest('.pf-m-expanded')).toBeDefined();
+    expect(screen.getByRole('button', { name: 'foo-step' }).closest('.pf-m-expanded')).toBeDefined();
   });
 
   it('should call enter handler when pressing enter', async () => {
@@ -364,7 +364,7 @@ describe('<Wizard />', () => {
 
     render(<FormRenderer {...initialProps} schema={schema} />);
 
-    expect(screen.getByText('foo-step', { selector: 'button' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'foo-step' })).toBeInTheDocument();
 
     cleanup();
   });
@@ -422,11 +422,13 @@ describe('<Wizard />', () => {
 
     render(<FormRenderer {...initialProps} onSubmit={onSubmit} initialValues={initialValues} />);
 
-    expect(screen.getByText('foo-step', { selector: '.pf-m-current' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'foo-step' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'foo-step' })).toHaveClass('pf-m-current');
 
     await userEvent.click(screen.getByText('Next'));
 
-    expect(screen.getByText('bar-step', { selector: '.pf-m-current' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'bar-step' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'bar-step' })).toHaveClass('pf-m-current');
 
     await userEvent.click(screen.getByText('Submit'));
     const formOptions = expect.any(Object);
@@ -524,8 +526,8 @@ describe('<Wizard />', () => {
   it('should build simple navigation', () => {
     render(<FormRenderer {...initialProps} />);
 
-    expect(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeInTheDocument();
-    expect(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeInTheDocument();
+    expect(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' })).toBeInTheDocument();
+    expect(screen.getByText('bar-step', { selector: '.pf-v6-c-wizard__nav-link-main' })).toBeInTheDocument();
   });
 
   it('should jump when click simple navigation', async () => {
@@ -537,11 +539,11 @@ describe('<Wizard />', () => {
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('bar-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
   });
@@ -551,7 +553,7 @@ describe('<Wizard />', () => {
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
   });
@@ -594,9 +596,9 @@ describe('<Wizard />', () => {
 
     render(<FormRenderer {...initialProps} schema={schema} />);
 
-    expect(screen.getAllByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeTruthy();
-    expect(screen.getAllByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeTruthy();
-    expect(screen.getAllByText('barbar', { selector: '.pf-v5-c-wizard__nav-link' })).toBeTruthy();
+    expect(screen.getAllByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' })).toBeTruthy();
+    expect(screen.getAllByText('bar-step', { selector: '.pf-v6-c-wizard__nav-link-main' })).toBeTruthy();
+    expect(screen.getAllByText('barbar', { selector: '.pf-v6-c-wizard__nav-link-main' })).toBeTruthy();
   });
 
   it('should jump with substeps', async () => {
@@ -643,11 +645,11 @@ describe('<Wizard />', () => {
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('barbar', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('barbar', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
 
@@ -655,7 +657,7 @@ describe('<Wizard />', () => {
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
 
-    await userEvent.click(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('bar-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
   });
@@ -700,23 +702,23 @@ describe('<Wizard />', () => {
     const { container } = render(<FormRenderer {...initialProps} schema={schema} />);
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
-    expect(container.querySelectorAll('.pf-v5-c-wizard__nav-item')).toHaveLength(3);
-    expect(container.querySelectorAll('.pf-v5-c-wizard__nav-link.pf-m-disabled')).toHaveLength(2); // steps + substep
+    expect(container.querySelectorAll('.pf-v6-c-wizard__nav-item')).toHaveLength(3);
+    expect(container.querySelectorAll('.pf-v6-c-wizard__nav-link.pf-m-disabled')).toHaveLength(2); // steps + substep
 
     await userEvent.click(screen.getByText('Next'));
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
-    expect(container.querySelectorAll('.pf-v5-c-wizard__nav-link.pf-m-disabled')).toHaveLength(0);
+    expect(container.querySelectorAll('.pf-v6-c-wizard__nav-link.pf-m-disabled')).toHaveLength(0);
 
-    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     expect(screen.getByLabelText('foo', { selector: 'input' })).toBeInTheDocument();
-    expect(container.querySelectorAll('.pf-v5-c-wizard__nav-item')).toHaveLength(3);
+    expect(container.querySelectorAll('.pf-v6-c-wizard__nav-item')).toHaveLength(3);
 
     await userEvent.click(screen.getByText('Next'));
 
     expect(screen.getByLabelText('bar', { selector: 'input' })).toBeInTheDocument();
-    expect(container.querySelectorAll('.pf-v5-c-wizard__nav-item')).toHaveLength(3);
+    expect(container.querySelectorAll('.pf-v6-c-wizard__nav-item')).toHaveLength(3);
   });
 
   it('should disabled button when validating', async () => {
@@ -757,9 +759,9 @@ describe('<Wizard />', () => {
 
     render(<FormRenderer {...initialProps} schema={schema} />);
 
-    expect(screen.getByText('Next')).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'Next' })).toBeDisabled();
 
-    await waitFor(() => expect(screen.getByText('Next')).not.toBeDisabled());
+    await waitFor(() => expect(screen.getByRole('button', { name: 'Next' })).not.toBeDisabled());
   });
 
   it('should disabled navigation when validating', async () => {
@@ -810,21 +812,21 @@ describe('<Wizard />', () => {
 
     resFn();
 
-    await waitFor(() => expect(screen.getByText('Next')).not.toBeDisabled());
+    await waitFor(() => expect(screen.getByRole('button', { name: 'Next' })).not.toBeDisabled());
 
     await userEvent.click(screen.getByText('Next'));
 
-    await waitFor(() => expect(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' })).not.toBeDisabled());
+    expect(screen.getByRole('button', { name: 'bar-step' })).not.toBeDisabled();
 
     await userEvent.click(screen.getByText('Back'));
 
     await userEvent.type(screen.getByLabelText('foo'), 'X');
 
-    expect(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'bar-step' })).toBeDisabled();
 
     resFn();
 
-    await waitFor(() => expect(screen.getByText('bar-step', { selector: '.pf-v5-c-wizard__nav-link' })).not.toBeDisabled());
+    await waitFor(() => expect(screen.getByRole('button', { name: 'bar-step' })).not.toBeDisabled());
   });
 
   it('should disable steps when invalid', async () => {
@@ -907,7 +909,7 @@ describe('<Wizard />', () => {
     await userEvent.click(screen.getByText('Next'));
     // voila
     expect(screen.getByLabelText('conan')).toBeInTheDocument();
-    expect(screen.getByText('conan-step', { selector: '.pf-v5-c-wizard__nav-link' })).not.toBeDisabled();
+    expect(screen.getByText('conan-step', { selector: '.pf-v6-c-wizard__nav-link-main' })).not.toBeDisabled();
 
     await userEvent.click(screen.getByText('Back'));
 
@@ -919,21 +921,21 @@ describe('<Wizard />', () => {
     expect(screen.getByLabelText('bar')).toBeInTheDocument();
 
     // let's look if last nav item is disabled (click event is working with 'disabled' <a> element)
-    expect(screen.getByText('conan-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'conan-step' })).toBeDisabled();
 
     // go to first step
-    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v5-c-wizard__nav-link' }));
+    await userEvent.click(screen.getByText('foo-step', { selector: '.pf-v6-c-wizard__nav-link-main' }));
 
     // still invalid :(
     expect(screen.getByLabelText('foo')).toBeInTheDocument();
-    expect(screen.getByText('conan-step', { selector: '.pf-v5-c-wizard__nav-link' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'conan-step' })).toBeDisabled();
 
     // make form valid again
     await userEvent.click(screen.getByText('Next'));
 
     await userEvent.type(screen.getByLabelText('bar'), 'hello');
     await userEvent.click(screen.getByText('Next'));
-    expect(screen.getByText('conan-step', { selector: '.pf-v5-c-wizard__nav-link' })).not.toBeDisabled();
+    expect(screen.getByRole('button', { name: 'conan-step' })).not.toBeDisabled();
   });
 
   describe('predicting steps', () => {
@@ -1014,12 +1016,12 @@ describe('<Wizard />', () => {
         />
       );
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([FIRST_TITLE]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([FIRST_TITLE]);
 
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
       await userEvent.click(screen.getByText('Next'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
         FIRST_TITLE,
         SECOND_TITLE_AWS,
         THIRD_TITLE,
@@ -1041,7 +1043,7 @@ describe('<Wizard />', () => {
       await userEvent.click(screen.getByText('Next'));
       await userEvent.click(screen.getByText('Back'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
     });
 
     it('disable nav when jumped into compileMapper step from invalid step', async () => {
@@ -1100,12 +1102,12 @@ describe('<Wizard />', () => {
 
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
       await userEvent.click(screen.getByText('Next'));
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
 
       await userEvent.type(screen.getByLabelText('aws'), '{backspace}');
       await userEvent.click(screen.getByText('Back'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
     });
 
     it('disable nav when jumped into step with function nextStep', async () => {
@@ -1166,11 +1168,11 @@ describe('<Wizard />', () => {
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
       await userEvent.click(screen.getByText('Next'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
 
       await userEvent.click(screen.getByText('Back'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
 
       const firstArgumentOfLastNextStepCall = NEXTSTEP_FUNCTION.mock.calls[NEXTSTEP_FUNCTION.mock.calls.length - 1][0];
       expect(firstArgumentOfLastNextStepCall).toEqual({ values: EXPECTED_VALUES });
@@ -1227,11 +1229,11 @@ describe('<Wizard />', () => {
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
       await userEvent.click(screen.getByText('Next'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
 
       await userEvent.click(screen.getByText('Back'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
     });
 
     it('crossroads variable predicts in realtime', async () => {
@@ -1279,13 +1281,13 @@ describe('<Wizard />', () => {
 
       const { container } = render(<FormRenderer {...initialProps} schema={wizardSchema} />);
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step']);
 
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
         'first-step',
         'second-step',
         'summary',
@@ -1295,25 +1297,25 @@ describe('<Wizard />', () => {
       await userEvent.type(screen.getByLabelText('source_type'), 'google');
 
       // predict steps for google
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
 
       await userEvent.click(screen.getByText('Next'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
 
       // click on first nav link
       await userEvent.click(screen.getByText('first-step'));
       // keep the second step enabled
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
 
       await userEvent.clear(screen.getByLabelText('source_type'));
       await userEvent.type(screen.getByLabelText('source_type'), 'aws');
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual([
         'first-step',
         'second-step',
         'summary',
@@ -1322,8 +1324,8 @@ describe('<Wizard />', () => {
       await userEvent.clear(screen.getByLabelText('source_type'));
       await userEvent.type(screen.getByLabelText('source_type'), 'google');
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
     });
 
     it('crossroads variable predicts in realtime - disableForwardJumping', async () => {
@@ -1372,24 +1374,24 @@ describe('<Wizard />', () => {
 
       const { container } = render(<FormRenderer {...initialProps} schema={wizardSchema} />);
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step']);
 
       await userEvent.clear(screen.getByLabelText('source_type'));
       await userEvent.type(screen.getByLabelText('source_type'), 'google');
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
 
       await userEvent.click(screen.getByText('Next'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, false]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
 
       await userEvent.click(screen.getByText('first-step'));
 
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
-      expect([...container.getElementsByClassName('pf-v5-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.disabled)).toEqual([false, true]);
+      expect([...container.getElementsByClassName('pf-v6-c-wizard__nav-link')].map((e) => e.textContent)).toEqual(['first-step', 'summary']);
     });
   });
 
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js b/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
index b5836c1ba..56e3028fe 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
@@ -41,7 +41,7 @@ const WizardStepButtons = ({
   formOptions,
   conditionalSubmitFlag,
 }) => (
-  <footer className={`pf-v5-c-wizard__footer ${buttonsClassName ? buttonsClassName : ''}`}>
+  <footer className={`pf-v6-c-wizard__footer ${buttonsClassName ? buttonsClassName : ''}`}>
     {Buttons ? (
       <Buttons
         disableBack={disableBack}
@@ -70,7 +70,7 @@ const WizardStepButtons = ({
             <Button type="button" variant="secondary" isDisabled={disableBack} onClick={handlePrev}>
               {back}
             </Button>
-            <div className="pf-v5-c-wizard__footer-cancel">
+            <div className="pf-v6-c-wizard__footer-cancel">
               <Button type="button" variant="link" onClick={formOptions.onCancel}>
                 {cancel}
               </Button>
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
index 9520e7121..38a04bb25 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
@@ -14,19 +14,19 @@ const WizardToggle = ({ activeStepIndex, currentStep, navSchema, isOpen, dispatc
   return (
     <button
       onClick={() => dispatch({ type: isOpen ? 'closeNav' : 'openNav' })}
-      className={`pf-v5-c-wizard__toggle ${isOpen ? 'pf-m-expanded' : ''}`}
+      className={`pf-v6-c-wizard__toggle ${isOpen ? 'pf-m-expanded' : ''}`}
       aria-label="Wizard Toggle"
       aria-expanded={isOpen}
       type="button"
     >
-      <ol className="pf-v5-c-wizard__toggle-list">
-        <li className="pf-v5-c-wizard__toggle-list-item">
-          <span className="pf-v5-c-wizard__toggle-num">{index + 1}</span> {activeStepName}
-          {activeStepSubName && <AngleRightIcon className="pf-v5-c-wizard__toggle-separator" aria-hidden="true" />}
+      <ol className="pf-v6-c-wizard__toggle-list">
+        <li className="pf-v6-c-wizard__toggle-list-item">
+          <span className="pf-v6-c-wizard__toggle-num">{index + 1}</span> {activeStepName}
+          {activeStepSubName && <AngleRightIcon className="pf-v6-c-wizard__toggle-separator" aria-hidden="true" />}
         </li>
-        {activeStepSubName && <li className="pf-v5-c-wizard__toggle-list-item">{activeStepSubName}</li>}
+        {activeStepSubName && <li className="pf-v6-c-wizard__toggle-list-item">{activeStepSubName}</li>}
       </ol>
-      <span className="pf-v5-c-wizard__toggle-icon">
+      <span className="pf-v6-c-wizard__toggle-icon">
         <CaretDownIcon aria-hidden="true" />
       </span>
     </button>
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.js b/packages/pf4-component-mapper/src/wizard/wizard.js
index ffd18b5a0..e7cfe1337 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard.js
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { FormSpy, WizardContext } from '@data-driven-forms/react-form-renderer';
 import Wizard from '@data-driven-forms/common/wizard/wizard';
 
-import { WizardNav, WizardHeader, Modal as PF4Modal } from '@patternfly/react-core';
+import { WizardNav, WizardHeader } from '@patternfly/react-core';
+import { Modal as PF4Modal } from '@patternfly/react-core/deprecated';
 
 import WizardStep from './wizard-components/wizard-step';
 import './wizard-components/wizard-styles.css';
@@ -97,11 +98,11 @@ const WizardInternal = ({
       container={state.container}
       aria-labelledby={rest.name}
       {...ModalProps}
-      className={inModal ? `pf-v5-c-form${ModalProps.className || ''}` : ModalProps.className}
+      className={inModal ? `pf-v6-c-form${ModalProps.className || ''}` : ModalProps.className}
     >
       <div
         tabIndex={inModal ? 0 : null}
-        className={`pf-v5-c-wizard ${inModal ? '' : 'no-shadow'} ddorg__pf4-component-mapper__wizard ${className ? className : ''}`}
+        className={`pf-v6-c-wizard ${inModal ? '' : 'no-shadow'} ddorg__pf4-component-mapper__wizard ${className ? className : ''}`}
         role="dialog"
         aria-modal={inModal ? 'true' : undefined}
         onKeyDown={(e) => {
@@ -124,8 +125,8 @@ const WizardInternal = ({
           />
         )}
         <WizardToggle activeStepIndex={activeStepIndex} currentStep={currentStep} navSchema={navSchema} isOpen={state.openNav} dispatch={dispatch} />
-        <div className="pf-v5-c-wizard__outer-wrap">
-          <div className="pf-v5-c-wizard__inner-wrap">
+        <div className="pf-v6-c-wizard__outer-wrap">
+          <div className="pf-v6-c-wizard__inner-wrap">
             <WizardNav aria-label={navAriaLabel} isExpanded={state.openNav}>
               <FormSpy subscription={{ values: true, valid: true, validating: true }}>
                 {({ values, valid, validating }) => (
diff --git a/yarn.lock b/yarn.lock
index 22dc83244..092d1468b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3539,32 +3539,32 @@
   dependencies:
     "@octokit/openapi-types" "^11.2.0"
 
-"@patternfly/react-core@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.0.0.tgz#96c9e2315047eec94d28f5621c02fa147182dd6f"
-  integrity sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==
+"@patternfly/react-core@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.0.0.tgz#9163c92493ee05c27a2208231e37049eb61231e3"
+  integrity sha512-UKFj9+YzBY+FfEDsLONgOM4N0e8SPV/27/UzNRiJ0gpgqbw2POuXwLpjGSRTTIUuCaLaGGM5PeTSj7mMB73ykw==
   dependencies:
-    "@patternfly/react-icons" "^5.0.0"
-    "@patternfly/react-styles" "^5.0.0"
-    "@patternfly/react-tokens" "^5.0.0"
-    focus-trap "7.4.3"
+    "@patternfly/react-icons" "^6.0.0"
+    "@patternfly/react-styles" "^6.0.0"
+    "@patternfly/react-tokens" "^6.0.0"
+    focus-trap "7.6.0"
     react-dropzone "^14.2.3"
-    tslib "^2.5.0"
+    tslib "^2.7.0"
 
-"@patternfly/react-icons@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-5.0.0.tgz#bb56ead97425f1b3ab886ee291ba6b6af4088e9d"
-  integrity sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==
+"@patternfly/react-icons@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.0.0.tgz#4dfd8d78cf04b860d5dd837caa022bf6f59326ec"
+  integrity sha512-ZFrsBVKrAp0DZrPOss98OA/EVUL4F0frXhR1uBId9+3ZrRArdKTgYgmQUCeSzMbxnSlxpmm3a2L05XQ36VUVbw==
 
-"@patternfly/react-styles@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.0.0.tgz#63705ad498ff271fd056e92bd07b2c720ef3491a"
-  integrity sha512-xbSCgjx+fPrXbIzUznwTFWtJEbzVS0Wn4zrejdKJYQTY+4YcuPlFkeq2tl3syzwGsaYMpHiFwQiTaKyTvlwtuw==
+"@patternfly/react-styles@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.0.0.tgz#e388af342ee51cc2977721e91a6b0191c334c163"
+  integrity sha512-fJFMB89sTRGlZTzTLmpRmthgOXqcN078scHMFJ3ttfi2D2btnem5oZrxmQ/gPZkZOxR+9MqwKDB6l3F5x1SqLQ==
 
-"@patternfly/react-tokens@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.0.0.tgz#8e2698d32d5353359e713312687a6b08ead0080b"
-  integrity sha512-to2CXIZ6WTuzBcjLZ+nXi5LhnYkSIDu3RBMRZwrplmECOoUWv87CC+2T0EVxtASRtpQfikjD2PDKMsif5i0BxQ==
+"@patternfly/react-tokens@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.0.0.tgz#403e73d1febe561abd50887abaf0a09643c3a18f"
+  integrity sha512-xd0ynDkiIW2rp8jz4TNvR4Dyaw9kSMkZdsuYcLlFXCVmvX//Mnl4rhBnid/2j2TaqK0NbkyTTPnPY/BU7SfLVQ==
 
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.21"
@@ -8761,12 +8761,12 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-focus-trap@7.4.3:
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.4.3.tgz#a3dae73d44df359eb92bbf37b18e173e813b16c5"
-  integrity sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==
+focus-trap@7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.6.0.tgz#7f3edab8135eaca92ab59b6e963eb5cc42ded715"
+  integrity sha512-1td0l3pMkWJLFipobUcGaf+5DTY4PLDDrcqoSaKP8ediO/CoWCCYk/fT/Y2A4e6TNB+Sh6clRJCjOPPnKoNHnQ==
   dependencies:
-    tabbable "^6.1.2"
+    tabbable "^6.2.0"
 
 follow-redirects@1.5.10:
   version "1.5.10"
@@ -18123,7 +18123,7 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tabbable@^6.1.2:
+tabbable@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
@@ -18586,10 +18586,10 @@ tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslib@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
-  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+tslib@^2.7.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
 tslint-config-prettier@^1.18.0:
   version "1.18.0"