diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 6966811e045..16f4f4559d4 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -161,13 +161,13 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
     <Component
       {...props}
       {...(isAriaDisabled ? preventedEvents : null)}
-      aria-disabled={isDisabled || isAriaDisabled}
+      aria-disabled={isAriaDisabled || (!isButtonElement && isDisabled)}
       aria-label={ariaLabel}
       className={css(
         styles.button,
         styles.modifiers[variant],
         isBlock && styles.modifiers.block,
-        isDisabled && styles.modifiers.disabled,
+        isDisabled && !isButtonElement && styles.modifiers.disabled,
         isAriaDisabled && styles.modifiers.ariaDisabled,
         isClicked && styles.modifiers.clicked,
         isInline && variant === ButtonVariant.link && styles.modifiers.inline,
diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
index 913ab2bf921..203c83f72e3 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -60,9 +60,23 @@ test('Renders with class pf-m-clicked when isClicked = true', () => {
   expect(screen.getByRole('button')).toHaveClass('pf-m-clicked');
 });
 
-test('Renders with class pf-m-disabled when isDisabled = true', () => {
+test('Does not render with class pf-m-disabled by default when isDisabled = true', () => {
   render(<Button isDisabled>Disabled Button</Button>);
-  expect(screen.getByRole('button')).toHaveClass('pf-m-disabled');
+  expect(screen.getByRole('button')).not.toHaveClass('pf-m-disabled');
+});
+
+test('aria-disabled is set to false when isDisabled = true', () => {
+  render(<Button isDisabled>Disabled Button</Button>);
+  expect(screen.getByRole('button')).toHaveAttribute('aria-disabled', 'false');
+});
+
+test('Renders with class pf-m-disabled when isDisabled = true and component is not a button', () => {
+  render(
+    <Button isDisabled component="a">
+      Disabled Anchor Button
+    </Button>
+  );
+  expect(screen.getByText('Disabled Anchor Button')).toHaveClass('pf-m-disabled');
 });
 
 test('Renders with class pf-m-aria-disabled when isAriaDisabled = true', () => {
@@ -208,7 +222,9 @@ test('aria-disabled is set to true and tabIndex to -1 if component is not a butt
       Disabled Anchor Button
     </Button>
   );
-  expect(screen.getByText('Disabled Anchor Button')).toHaveAttribute('tabindex', '-1');
+  const anchor = screen.getByText('Disabled Anchor Button');
+  expect(anchor).toHaveAttribute('tabindex', '-1');
+  expect(anchor).toHaveAttribute('aria-disabled', 'true');
 });
 
 test('setting tab index through props', () => {
diff --git a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
index 0818c970d3f..c17d7386cc1 100644
--- a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
+++ b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Renders basic button 1`] = `
     aria-disabled="false"
     aria-label="basic button"
     class="pf-v6-c-button pf-m-primary"
-    data-ouia-component-id="OUIA-Generated-Button-primary-28"
+    data-ouia-component-id="OUIA-Generated-Button-primary-30"
     data-ouia-component-type="PF6/Button"
     data-ouia-safe="true"
     type="button"
diff --git a/packages/react-core/src/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap b/packages/react-core/src/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap
index 2f713966de5..7c28575d55c 100644
--- a/packages/react-core/src/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap
+++ b/packages/react-core/src/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap
@@ -106,9 +106,9 @@ exports[`DualListSelector basic 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-1"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -163,9 +163,9 @@ exports[`DualListSelector basic 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-3"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -192,9 +192,9 @@ exports[`DualListSelector basic 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-4"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -364,9 +364,9 @@ exports[`DualListSelector basic with disabled controls 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-13"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -393,9 +393,9 @@ exports[`DualListSelector basic with disabled controls 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-14"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -422,9 +422,9 @@ exports[`DualListSelector basic with disabled controls 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-15"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -451,9 +451,9 @@ exports[`DualListSelector basic with disabled controls 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-16"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -634,9 +634,9 @@ exports[`DualListSelector with actions 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-21"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -719,9 +719,9 @@ exports[`DualListSelector with actions 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-24"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -956,9 +956,9 @@ exports[`DualListSelector with custom status 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-9"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1013,9 +1013,9 @@ exports[`DualListSelector with custom status 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-11"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1042,9 +1042,9 @@ exports[`DualListSelector with custom status 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-12"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1256,9 +1256,9 @@ exports[`DualListSelector with search inputs 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-5"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1313,9 +1313,9 @@ exports[`DualListSelector with search inputs 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-7"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1342,9 +1342,9 @@ exports[`DualListSelector with search inputs 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-8"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1633,9 +1633,9 @@ exports[`DualListSelector with tree 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Add selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-17"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1690,9 +1690,9 @@ exports[`DualListSelector with tree 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove all"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-19"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -1719,9 +1719,9 @@ exports[`DualListSelector with tree 1`] = `
         class="pf-v6-c-dual-list-selector__controls-item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Remove selected"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-20"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
diff --git a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
index 2c6c6662ca7..939dab9556f 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
+++ b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
@@ -51,8 +51,8 @@ exports[`simple fileupload 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
-            aria-disabled="true"
-            class="pf-v6-c-button pf-m-control pf-m-disabled"
+            aria-disabled="false"
+            class="pf-v6-c-button pf-m-control"
             data-ouia-component-id="OUIA-Generated-Button-control-2"
             data-ouia-component-type="PF6/Button"
             data-ouia-safe="true"
diff --git a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
index 615a1180c6b..70ddaeca87e 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
+++ b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
@@ -12,9 +12,9 @@ exports[`numberInput disables lower threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Minus"
-          class="pf-v6-c-button pf-m-control pf-m-disabled"
+          class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-13"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -155,9 +155,9 @@ exports[`numberInput disables upper threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Plus"
-          class="pf-v6-c-button pf-m-control pf-m-disabled"
+          class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-16"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -576,9 +576,9 @@ exports[`numberInput renders disabled 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Minus"
-          class="pf-v6-c-button pf-m-control pf-m-disabled"
+          class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-11"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -627,9 +627,9 @@ exports[`numberInput renders disabled 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Plus"
-          class="pf-v6-c-button pf-m-control pf-m-disabled"
+          class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-12"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
index cbcac6c7d8a..1cd5e00f396 100644
--- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
@@ -75,9 +75,9 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-177"
           data-ouia-component-type="PF6/Button"
@@ -104,9 +104,9 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-178"
           data-ouia-component-type="PF6/Button"
@@ -285,9 +285,9 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-169"
           data-ouia-component-type="PF6/Button"
@@ -314,9 +314,9 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-170"
           data-ouia-component-type="PF6/Button"
@@ -495,9 +495,9 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-165"
           data-ouia-component-type="PF6/Button"
@@ -524,9 +524,9 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-166"
           data-ouia-component-type="PF6/Button"
@@ -705,9 +705,9 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-157"
           data-ouia-component-type="PF6/Button"
@@ -734,9 +734,9 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-158"
           data-ouia-component-type="PF6/Button"
@@ -915,9 +915,9 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-161"
           data-ouia-component-type="PF6/Button"
@@ -944,9 +944,9 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-162"
           data-ouia-component-type="PF6/Button"
@@ -1125,9 +1125,9 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-173"
           data-ouia-component-type="PF6/Button"
@@ -1154,9 +1154,9 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-174"
           data-ouia-component-type="PF6/Button"
@@ -1321,9 +1321,9 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-53"
           data-ouia-component-type="PF6/Button"
@@ -1350,9 +1350,9 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-54"
           data-ouia-component-type="PF6/Button"
@@ -1535,9 +1535,9 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-37"
           data-ouia-component-type="PF6/Button"
@@ -1564,9 +1564,9 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-38"
           data-ouia-component-type="PF6/Button"
@@ -1916,9 +1916,9 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-41"
           data-ouia-component-type="PF6/Button"
@@ -1945,9 +1945,9 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-42"
           data-ouia-component-type="PF6/Button"
@@ -2210,9 +2210,9 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to next page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="next"
           data-ouia-component-id="OUIA-Generated-Button-plain-35"
           data-ouia-component-type="PF6/Button"
@@ -2239,9 +2239,9 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to last page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="last"
           data-ouia-component-id="OUIA-Generated-Button-plain-36"
           data-ouia-component-type="PF6/Button"
@@ -2344,9 +2344,9 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-25"
           data-ouia-component-type="PF6/Button"
@@ -2373,9 +2373,9 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-26"
           data-ouia-component-type="PF6/Button"
@@ -2427,9 +2427,9 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to next page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="next"
           data-ouia-component-id="OUIA-Generated-Button-plain-27"
           data-ouia-component-type="PF6/Button"
@@ -2456,9 +2456,9 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to last page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="last"
           data-ouia-component-id="OUIA-Generated-Button-plain-28"
           data-ouia-component-type="PF6/Button"
@@ -2549,9 +2549,9 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-5"
           data-ouia-component-type="PF6/Button"
@@ -2578,9 +2578,9 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-6"
           data-ouia-component-type="PF6/Button"
@@ -2751,9 +2751,9 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-17"
           data-ouia-component-type="PF6/Button"
@@ -2780,9 +2780,9 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-18"
           data-ouia-component-type="PF6/Button"
@@ -2965,9 +2965,9 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-9"
           data-ouia-component-type="PF6/Button"
@@ -2994,9 +2994,9 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-10"
           data-ouia-component-type="PF6/Button"
@@ -3180,9 +3180,9 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-21"
           data-ouia-component-type="PF6/Button"
@@ -3209,9 +3209,9 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-22"
           data-ouia-component-type="PF6/Button"
@@ -3263,9 +3263,9 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to next page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="next"
           data-ouia-component-id="OUIA-Generated-Button-plain-23"
           data-ouia-component-type="PF6/Button"
@@ -3292,9 +3292,9 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to last page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="last"
           data-ouia-component-id="OUIA-Generated-Button-plain-24"
           data-ouia-component-type="PF6/Button"
@@ -3397,9 +3397,9 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-13"
           data-ouia-component-type="PF6/Button"
@@ -3426,9 +3426,9 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-14"
           data-ouia-component-type="PF6/Button"
@@ -3611,9 +3611,9 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-1"
           data-ouia-component-type="PF6/Button"
@@ -3640,9 +3640,9 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-2"
           data-ouia-component-type="PF6/Button"
@@ -3825,9 +3825,9 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-49"
           data-ouia-component-type="PF6/Button"
@@ -3854,9 +3854,9 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-50"
           data-ouia-component-type="PF6/Button"
@@ -4039,9 +4039,9 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-57"
           data-ouia-component-type="PF6/Button"
@@ -4068,9 +4068,9 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-58"
           data-ouia-component-type="PF6/Button"
@@ -4253,9 +4253,9 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to first page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="first"
           data-ouia-component-id="OUIA-Generated-Button-plain-29"
           data-ouia-component-type="PF6/Button"
@@ -4282,9 +4282,9 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to previous page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="previous"
           data-ouia-component-id="OUIA-Generated-Button-plain-30"
           data-ouia-component-type="PF6/Button"
@@ -4336,9 +4336,9 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to next page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="next"
           data-ouia-component-id="OUIA-Generated-Button-plain-31"
           data-ouia-component-type="PF6/Button"
@@ -4365,9 +4365,9 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
-          aria-disabled="true"
+          aria-disabled="false"
           aria-label="Go to last page"
-          class="pf-v6-c-button pf-m-plain pf-m-disabled"
+          class="pf-v6-c-button pf-m-plain"
           data-action="last"
           data-ouia-component-id="OUIA-Generated-Button-plain-32"
           data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardFooterInternal.test.tsx.snap b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardFooterInternal.test.tsx.snap
index d4e761c43f7..30435860a91 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardFooterInternal.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardFooterInternal.test.tsx.snap
@@ -6,8 +6,8 @@ exports[`WizardFooterInternal should match snapshot (auto-generated) 1`] = `
     class="pf-v6-c-wizard__footer"
   >
     <button
-      aria-disabled="true"
-      class="pf-v6-c-button pf-m-secondary pf-m-disabled"
+      aria-disabled="false"
+      class="pf-v6-c-button pf-m-secondary"
       data-ouia-component-id="OUIA-Generated-Button-secondary-1"
       data-ouia-component-type="PF6/Button"
       data-ouia-safe="true"
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap b/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
index 4be8e065aff..951ccf1a7d2 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
@@ -239,8 +239,8 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = `
         class="pf-v6-c-wizard__footer"
       >
         <button
-          aria-disabled="true"
-          class="pf-v6-c-button pf-m-secondary pf-m-disabled"
+          aria-disabled="false"
+          class="pf-v6-c-button pf-m-secondary"
           data-ouia-component-id="OUIA-Generated-Button-secondary-2"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -498,8 +498,8 @@ exports[`Wizard Wizard should match snapshot 1`] = `
         class="pf-v6-c-wizard__footer"
       >
         <button
-          aria-disabled="true"
-          class="pf-v6-c-button pf-m-secondary pf-m-disabled"
+          aria-disabled="false"
+          class="pf-v6-c-button pf-m-secondary"
           data-ouia-component-id="OUIA-Generated-Button-secondary-1"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"
@@ -629,8 +629,8 @@ exports[`Wizard bare wiz 1`] = `
         class="pf-v6-c-wizard__footer"
       >
         <button
-          aria-disabled="true"
-          class="pf-v6-c-button pf-m-secondary pf-m-disabled"
+          aria-disabled="false"
+          class="pf-v6-c-button pf-m-secondary"
           data-ouia-component-id="OUIA-Generated-Button-secondary-3"
           data-ouia-component-type="PF6/Button"
           data-ouia-safe="true"