diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
index bdef38498f6..9caca156ec3 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
@@ -23,6 +23,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
               style="display: contents;"
             >
               <button
+                aria-disabled="false"
                 aria-label="Copy code to clipboard"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -53,6 +54,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
               style="display: contents;"
             >
               <button
+                aria-disabled="false"
                 aria-label="Upload code"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -83,6 +85,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
               style="display: contents;"
             >
               <button
+                aria-disabled="false"
                 aria-label="Download code"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-3"
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
index 28e66b77a6d..d8133ca9353 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`Matches snapshot 1`] = `
     style="display: contents;"
   >
     <button
+      aria-disabled="false"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-1"
       data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
index 2d721cf9cf6..0d9f3217fe1 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
+++ b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`AboutModalBoxCloseButton Test 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Close Dialog"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -41,6 +42,7 @@ exports[`AboutModalBoxCloseButton Test close button aria label 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Klose Daylok"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -76,6 +78,7 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Close Dialog"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-2"
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap
index 9ebc77452b1..81be505f300 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`AlertActionCloseButton should match snapshot 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-label="Close some label alert: test title"
     class="pf-v6-c-button pf-m-plain"
     data-ouia-component-id="OUIA-Generated-Button-plain-1"
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
index 6e48facbb86..aa22f8a41e8 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`AlertActionLink should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     class="pf-v6-c-button pf-m-link pf-m-inline ''"
     data-ouia-component-id="OUIA-Generated-Button-link-1"
     data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index c15aef446c9..3948d6256b1 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -164,14 +164,12 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
     </span>
   );
   const _children = children && <span className={css('pf-v6-c-button__text')}>{children}</span>;
-  // We only want to render the aria-disabled attribute when true, similar to the disabled attribute natively.
-  const shouldRenderAriaDisabled = isAriaDisabled || (!isButtonElement && isDisabled);
 
   return (
     <Component
       {...props}
       {...(isAriaDisabled ? preventedEvents : null)}
-      {...(shouldRenderAriaDisabled && { 'aria-disabled': true })}
+      aria-disabled={isAriaDisabled || isDisabled}
       aria-label={ariaLabel}
       className={css(
         styles.button,
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 894ceee4bfb..e70ce13ee5e 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -73,7 +73,8 @@ test('Renders with class pf-m-disabled when isDisabled = true and component is n
   expect(screen.getByText('Disabled Anchor Button').parentElement).toHaveClass('pf-m-disabled');
 });
 
-test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isAriaDisabled is not passed by default`, () => {
+// Re-enable as part of https://github.com/patternfly/patternfly-react/issues/11618
+test.skip(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isAriaDisabled is not passed by default`, () => {
   render(<Button>Button</Button>);
 
   const button = screen.getByRole('button');
@@ -81,7 +82,8 @@ test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered
   expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
 });
 
-test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isDisabled is true, but isAriaDisabled is not passed`, () => {
+// Re-enable as part of https://github.com/patternfly/patternfly-react/issues/11618
+test.skip(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isDisabled is true, but isAriaDisabled is not passed`, () => {
   render(<Button isDisabled>Disabled Button</Button>);
 
   const button = screen.getByRole('button');
@@ -89,6 +91,15 @@ test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered
   expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
 });
 
+// Remove as part of https://github.com/patternfly/patternfly-react/issues/11618
+test(`Renders with aria-disabled of true and without class ${styles.modifiers.ariaDisabled} when isDisabled is true`, () => {
+  render(<Button isDisabled>Disabled Button</Button>);
+
+  const button = screen.getByRole('button');
+  expect(button).toHaveAttribute('aria-disabled', 'true');
+  expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
+});
+
 test(`Renders with class ${styles.modifiers.ariaDisabled} and aria-disabled attribute when isAriaDisabled = true`, () => {
   render(<Button isAriaDisabled>Disabled yet focusable button</Button>);
   const button = screen.getByRole('button');
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 43774b7acca..1bf9bbee899 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
@@ -3,9 +3,10 @@
 exports[`Renders basic button 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-label="basic button"
     class="pf-v6-c-button pf-m-primary"
-    data-ouia-component-id="OUIA-Generated-Button-primary-31"
+    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/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap b/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap
index 240eb8c1ed9..c40a6c69ca4 100644
--- a/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap
+++ b/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`CardHeader onExpand adds the toggle button 1`] = `
       class="pf-v6-c-card__header-toggle"
     >
       <button
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
         data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
index 4b6caa7f47f..1cc84917921 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`Matches snapshot 1`] = `
       onTooltipHidden clicker
     </a>
     <button
+      aria-disabled="false"
       aria-label="Copyable input"
       aria-labelledby="button-id text-id"
       class="pf-v6-c-button pf-m-control"
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap
index 1793f847791..d86abe867da 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`Matches snapshot 1`] = `
 <DocumentFragment>
   <button
     aria-controls="content-id"
+    aria-disabled="false"
     aria-expanded="false"
     aria-labelledby="main-id text-id"
     class="pf-v6-c-button pf-m-control"
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
index c7edd36fb32..641bc0433de 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`DataListToggle should match snapshot (auto-generated) 1`] = `
     >
       <button
         aria-controls="''"
+        aria-disabled="false"
         aria-expanded="false"
         aria-label="'Details'"
         class="pf-v6-c-button pf-m-plain"
diff --git a/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap b/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap
index d876e47445c..053d0d56f17 100644
--- a/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap
+++ b/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`Renders to match snapshot 1`] = `
     >
       <button
         aria-controls="false"
+        aria-disabled="false"
         aria-expanded="false"
         aria-label="Details"
         aria-labelledby=" ex-toggle2"
diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
index 1040a50cf6d..2daae1ad54a 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
+++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`With popover opened 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="false"
             aria-haspopup="dialog"
             aria-label="Toggle date picker"
             class="pf-v6-c-button pf-m-control"
@@ -94,6 +95,7 @@ exports[`With popover opened 1`] = `
                 class="pf-v6-c-calendar-month__header-nav-control pf-m-prev-month"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Previous month"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -199,6 +201,7 @@ exports[`With popover opened 1`] = `
                 class="pf-v6-c-calendar-month__header-nav-control pf-m-next-month"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Next month"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -826,6 +829,7 @@ exports[`disabled date picker 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="true"
             aria-haspopup="dialog"
             aria-label="Toggle date picker"
             class="pf-v6-c-button pf-m-control"
diff --git a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
index 11b5da260a4..44f9cffb064 100644
--- a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
+++ b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`Drawer expands from bottom 1`] = `
               class="pf-v6-c-drawer__close"
             >
               <button
+                aria-disabled="false"
                 aria-label="Close drawer panel"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-4"
@@ -126,6 +127,7 @@ exports[`Drawer has resizable callback and id 1`] = `
                 class="pf-v6-c-drawer__close"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Close drawer panel"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-6"
@@ -220,6 +222,7 @@ exports[`Drawer has resizable css and color variants 1`] = `
                 class="pf-v6-c-drawer__close"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Close drawer panel"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-5"
@@ -348,6 +351,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = false 1`]
               class="pf-v6-c-drawer__close"
             >
               <button
+                aria-disabled="false"
                 aria-label="Close drawer panel"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -421,6 +425,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = true 1`] =
               class="pf-v6-c-drawer__close"
             >
               <button
+                aria-disabled="false"
                 aria-label="Close drawer panel"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -494,6 +499,7 @@ exports[`Drawer isExpanded = true and isInline = true and isStatic = false 1`] =
               class="pf-v6-c-drawer__close"
             >
               <button
+                aria-disabled="false"
                 aria-label="Close drawer panel"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-2"
diff --git a/packages/react-core/src/components/EmptyState/__tests__/__snapshots__/EmptyState.test.tsx.snap b/packages/react-core/src/components/EmptyState/__tests__/__snapshots__/EmptyState.test.tsx.snap
index eb1667fe048..9523427e3e7 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/__snapshots__/EmptyState.test.tsx.snap
+++ b/packages/react-core/src/components/EmptyState/__tests__/__snapshots__/EmptyState.test.tsx.snap
@@ -94,6 +94,7 @@ exports[`EmptyState Main 1`] = `
           class="pf-v6-c-empty-state__actions"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-primary"
             data-ouia-component-id="OUIA-Generated-Button-primary-1"
             data-ouia-component-type="PF6/Button"
@@ -111,6 +112,7 @@ exports[`EmptyState Main 1`] = `
           class="pf-v6-c-empty-state__actions"
         >
           <button
+            aria-disabled="false"
             aria-label="learn more action"
             class="pf-v6-c-button pf-m-link"
             data-ouia-component-id="OUIA-Generated-Button-link-1"
diff --git a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
index 4dd34a77783..cdd66fa178c 100644
--- a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
+++ b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`Detached ExpandableSection renders successfully 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         aria-expanded="true"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-5"
@@ -72,6 +73,7 @@ exports[`Disclosure ExpandableSection 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-6"
         data-ouia-component-type="PF6/Button"
@@ -125,6 +127,7 @@ exports[`ExpandableSection 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-1"
         data-ouia-component-type="PF6/Button"
@@ -178,6 +181,7 @@ exports[`Renders ExpandableSection expanded 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         aria-expanded="true"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-2"
@@ -231,6 +235,7 @@ exports[`Renders ExpandableSection indented 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         aria-expanded="true"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-7"
@@ -284,6 +289,7 @@ exports[`Renders Uncontrolled ExpandableSection 1`] = `
     >
       <button
         aria-controls="content-id"
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-link"
         data-ouia-component-id="OUIA-Generated-Button-link-4"
         data-ouia-component-type="PF6/Button"
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 4f9509c89b0..9d51e71943f 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
@@ -37,6 +37,7 @@ exports[`simple fileupload 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-control"
             data-ouia-component-id="OUIA-Generated-Button-control-1"
             data-ouia-component-type="PF6/Button"
@@ -54,6 +55,7 @@ exports[`simple fileupload 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="true"
             class="pf-v6-c-button pf-m-control"
             data-ouia-component-id="OUIA-Generated-Button-control-2"
             data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
index 4b7559e4827..94e4c122426 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
+++ b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
@@ -36,6 +36,7 @@ exports[`simple fileuploadfield 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-control"
             data-ouia-component-id="OUIA-Generated-Button-control-1"
             data-ouia-component-type="PF6/Button"
@@ -53,6 +54,7 @@ exports[`simple fileuploadfield 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            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"
diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap
index de4e3c784d3..e69abd4678e 100644
--- a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap
+++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap
@@ -14,6 +14,7 @@ exports[`Check expandable form field group example against snapshot 1`] = `
         class="pf-v6-c-form__field-group-toggle-button"
       >
         <button
+          aria-disabled="false"
           aria-expanded="true"
           aria-label="toggle"
           aria-labelledby="title-text-id2 generated-id"
@@ -74,6 +75,7 @@ exports[`Check expandable form field group example against snapshot 1`] = `
         class="pf-v6-c-form__field-group-header-actions"
       >
         <button
+          aria-disabled="false"
           class="pf-v6-c-button pf-m-primary"
           data-ouia-component-id="OUIA-Generated-Button-primary-2"
           data-ouia-component-type="PF6/Button"
@@ -122,6 +124,7 @@ exports[`Check form field group example against snapshot 1`] = `
         class="pf-v6-c-form__field-group-header-actions"
       >
         <button
+          aria-disabled="false"
           class="pf-v6-c-button pf-m-primary"
           data-ouia-component-id="OUIA-Generated-Button-primary-1"
           data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap b/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap
index 716a8998f7c..bcb75df6e8e 100644
--- a/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap
+++ b/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`expandable vertical with subsection 1`] = `
           class="pf-v6-c-jump-links__toggle"
         >
           <button
+            aria-disabled="false"
             aria-expanded="false"
             aria-label="Toggle jump links"
             class="pf-v6-c-button pf-m-plain"
@@ -69,6 +70,7 @@ exports[`expandable vertical with subsection 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-13"
               data-ouia-component-type="PF6/Button"
@@ -94,6 +96,7 @@ exports[`expandable vertical with subsection 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-14"
               data-ouia-component-type="PF6/Button"
@@ -123,6 +126,7 @@ exports[`expandable vertical with subsection 1`] = `
                 class="pf-v6-c-jump-links__link"
               >
                 <a
+                  aria-disabled="false"
                   class="pf-v6-c-button pf-m-link"
                   data-ouia-component-id="OUIA-Generated-Button-link-15"
                   data-ouia-component-type="PF6/Button"
@@ -148,6 +152,7 @@ exports[`expandable vertical with subsection 1`] = `
                 class="pf-v6-c-jump-links__link"
               >
                 <a
+                  aria-disabled="false"
                   class="pf-v6-c-button pf-m-link"
                   data-ouia-component-id="OUIA-Generated-Button-link-16"
                   data-ouia-component-type="PF6/Button"
@@ -173,6 +178,7 @@ exports[`expandable vertical with subsection 1`] = `
                 class="pf-v6-c-jump-links__link"
               >
                 <a
+                  aria-disabled="false"
                   class="pf-v6-c-button pf-m-link"
                   data-ouia-component-id="OUIA-Generated-Button-link-17"
                   data-ouia-component-type="PF6/Button"
@@ -200,6 +206,7 @@ exports[`expandable vertical with subsection 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-18"
               data-ouia-component-type="PF6/Button"
@@ -225,6 +232,7 @@ exports[`expandable vertical with subsection 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-19"
               data-ouia-component-type="PF6/Button"
@@ -271,6 +279,7 @@ exports[`jumplinks centered 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-4"
               data-ouia-component-type="PF6/Button"
@@ -297,6 +306,7 @@ exports[`jumplinks centered 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-5"
               data-ouia-component-type="PF6/Button"
@@ -322,6 +332,7 @@ exports[`jumplinks centered 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-6"
               data-ouia-component-type="PF6/Button"
@@ -375,6 +386,7 @@ exports[`jumplinks with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-7"
               data-ouia-component-type="PF6/Button"
@@ -401,6 +413,7 @@ exports[`jumplinks with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-8"
               data-ouia-component-type="PF6/Button"
@@ -426,6 +439,7 @@ exports[`jumplinks with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-9"
               data-ouia-component-type="PF6/Button"
@@ -472,6 +486,7 @@ exports[`simple jumplinks 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-1"
               data-ouia-component-type="PF6/Button"
@@ -498,6 +513,7 @@ exports[`simple jumplinks 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-2"
               data-ouia-component-type="PF6/Button"
@@ -523,6 +539,7 @@ exports[`simple jumplinks 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-3"
               data-ouia-component-type="PF6/Button"
@@ -576,6 +593,7 @@ exports[`vertical with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-10"
               data-ouia-component-type="PF6/Button"
@@ -602,6 +620,7 @@ exports[`vertical with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-11"
               data-ouia-component-type="PF6/Button"
@@ -627,6 +646,7 @@ exports[`vertical with label 1`] = `
             class="pf-v6-c-jump-links__link"
           >
             <a
+              aria-disabled="false"
               class="pf-v6-c-button pf-m-link"
               data-ouia-component-id="OUIA-Generated-Button-link-12"
               data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap b/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap
index 4aa4d10050e..351c407ea06 100644
--- a/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap
+++ b/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap
@@ -19,6 +19,7 @@ exports[`Label editable label 1`] = `
       class="pf-v6-c-label__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Close Something"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
         data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -156,6 +157,7 @@ exports[`Label label with close button 1`] = `
       class="pf-v6-c-label__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Close Something"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -204,6 +206,7 @@ exports[`Label label with close button and outline variant 1`] = `
       class="pf-v6-c-label__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Close Something"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
         data-ouia-component-id="OUIA-Generated-Button-plain-2"
diff --git a/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap b/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap
index fcff3b01d53..ea2f23959f7 100644
--- a/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap
+++ b/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap
@@ -253,6 +253,7 @@ exports[`LabelGroup label group with closable category 1`] = `
       class="pf-v6-c-label-group__close"
     >
       <button
+        aria-disabled="false"
         aria-label="Close label group"
         aria-labelledby="remove_group_generated-id generated-id"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
index ead512ffb3a..51e59aa4fec 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
+++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
@@ -131,6 +131,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           class="pf-v6-c-form__actions"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-primary pf-m-block"
             data-ouia-component-id="OUIA-Generated-Button-primary-5"
             data-ouia-component-type="PF6/Button"
@@ -253,6 +254,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             class="pf-v6-c-input-group__item"
           >
             <button
+              aria-disabled="false"
               aria-label="Show password"
               class="pf-v6-c-button pf-m-control"
               data-ouia-component-id="OUIA-Generated-Button-control-1"
@@ -292,6 +294,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
           class="pf-v6-c-form__actions"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-primary pf-m-block"
             data-ouia-component-id="OUIA-Generated-Button-primary-6"
             data-ouia-component-type="PF6/Button"
@@ -415,6 +418,7 @@ exports[`LoginForm should render Login form 1`] = `
           class="pf-v6-c-form__actions"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-primary pf-m-block"
             data-ouia-component-id="OUIA-Generated-Button-primary-1"
             data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
index ba54453da58..38372d8fb9e 100644
--- a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
+++ b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
@@ -101,6 +101,7 @@ exports[`Modal Content Test with onclose 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-1"
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadButton.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadButton.test.tsx.snap
index 37f5b7fa274..4939700813d 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadButton.test.tsx.snap
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadButton.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`MultipleFileUploadButton renders custom class names 1`] = `
     class="pf-v6-c-multiple-file-upload__upload test"
   >
     <button
+      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"
@@ -28,6 +29,7 @@ exports[`MultipleFileUploadButton renders with aria-label applied to the button
     class="pf-v6-c-multiple-file-upload__upload"
   >
     <button
+      aria-disabled="false"
       aria-label="test"
       class="pf-v6-c-button pf-m-secondary"
       data-ouia-component-id="OUIA-Generated-Button-secondary-3"
@@ -51,6 +53,7 @@ exports[`MultipleFileUploadButton renders with expected class names 1`] = `
     class="pf-v6-c-multiple-file-upload__upload"
   >
     <button
+      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"
@@ -73,6 +76,7 @@ exports[`MultipleFileUploadButton renders with label applied to the button 1`] =
     class="pf-v6-c-multiple-file-upload__upload"
   >
     <button
+      aria-disabled="false"
       class="pf-v6-c-button pf-m-secondary"
       data-ouia-component-id="OUIA-Generated-Button-secondary-4"
       data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadMain.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadMain.test.tsx.snap
index 4e9f76de26e..c6aad8cd020 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadMain.test.tsx.snap
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadMain.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`MultipleFileUploadMain passes props to the info component as expected 1
       class="pf-v6-c-multiple-file-upload__upload"
     >
       <button
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-secondary"
         data-ouia-component-id="OUIA-Generated-Button-secondary-4"
         data-ouia-component-type="PF6/Button"
@@ -59,6 +60,7 @@ exports[`MultipleFileUploadMain passes props to the title as expected 1`] = `
       class="pf-v6-c-multiple-file-upload__upload"
     >
       <button
+        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"
@@ -85,6 +87,7 @@ exports[`MultipleFileUploadMain renders custom class names 1`] = `
       class="pf-v6-c-multiple-file-upload__upload"
     >
       <button
+        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"
@@ -111,6 +114,7 @@ exports[`MultipleFileUploadMain renders with expected class names 1`] = `
       class="pf-v6-c-multiple-file-upload__upload"
     >
       <button
+        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"
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap
index 821f03b2066..c7e39f24510 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap
@@ -13,6 +13,7 @@ exports[`MultipleFileUploadStatus renders custom class names 1`] = `
       >
         <button
           aria-controls="generated-id-content"
+          aria-disabled="false"
           aria-expanded="true"
           class="pf-v6-c-button pf-m-link"
           data-ouia-component-id="OUIA-Generated-Button-link-2"
@@ -89,6 +90,7 @@ exports[`MultipleFileUploadStatus renders status toggle icon 1`] = `
       >
         <button
           aria-controls="generated-id-content"
+          aria-disabled="false"
           aria-expanded="true"
           class="pf-v6-c-button pf-m-link"
           data-ouia-component-id="OUIA-Generated-Button-link-4"
@@ -179,6 +181,7 @@ exports[`MultipleFileUploadStatus renders status toggle text 1`] = `
       >
         <button
           aria-controls="generated-id-content"
+          aria-disabled="false"
           aria-expanded="true"
           class="pf-v6-c-button pf-m-link"
           data-ouia-component-id="OUIA-Generated-Button-link-3"
@@ -257,6 +260,7 @@ exports[`MultipleFileUploadStatus renders with expected class names 1`] = `
       >
         <button
           aria-controls="generated-id-content"
+          aria-disabled="false"
           aria-expanded="true"
           class="pf-v6-c-button pf-m-link"
           data-ouia-component-id="OUIA-Generated-Button-link-1"
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap
index fb8d7b33976..dbd77f9d7e9 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap
@@ -89,6 +89,7 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = `
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="buttonAriaLabel"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-8"
@@ -205,6 +206,7 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = `
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -323,6 +325,7 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-4"
@@ -441,6 +444,7 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-5"
@@ -576,6 +580,7 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-7"
@@ -694,6 +699,7 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -810,6 +816,7 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = `
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -928,6 +935,7 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe
       class="pf-v6-c-multiple-file-upload__status-item-close"
     >
       <button
+        aria-disabled="false"
         aria-label="Remove from list"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-6"
diff --git a/packages/react-core/src/components/NotificationBadge/__tests__/__snapshots__/NotificationBadge.test.tsx.snap b/packages/react-core/src/components/NotificationBadge/__tests__/__snapshots__/NotificationBadge.test.tsx.snap
index f4e0dabe556..93aee03785a 100644
--- a/packages/react-core/src/components/NotificationBadge/__tests__/__snapshots__/NotificationBadge.test.tsx.snap
+++ b/packages/react-core/src/components/NotificationBadge/__tests__/__snapshots__/NotificationBadge.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`NotificationBadge count 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-expanded="false"
     class="pf-v6-c-button pf-m-stateful pf-m-read"
     data-ouia-component-id="OUIA-Generated-Button-stateful-3"
@@ -39,6 +40,7 @@ exports[`NotificationBadge count 1`] = `
 exports[`false NotificationBadge needs attention 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-expanded="false"
     class="pf-v6-c-button pf-m-stateful pf-m-attention"
     data-ouia-component-id="OUIA-Generated-Button-stateful-2"
@@ -58,6 +60,7 @@ exports[`false NotificationBadge needs attention 1`] = `
 exports[`true NotificationBadge needs attention 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-expanded="false"
     class="pf-v6-c-button pf-m-stateful pf-m-attention"
     data-ouia-component-id="OUIA-Generated-Button-stateful-1"
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 8b32e4c66d8..6b4633c5050 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,6 +12,7 @@ exports[`numberInput disables lower threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="true"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-13"
@@ -65,6 +66,7 @@ exports[`numberInput disables lower threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-14"
@@ -112,6 +114,7 @@ exports[`numberInput disables upper threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-15"
@@ -164,6 +167,7 @@ exports[`numberInput disables upper threshold 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="true"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-16"
@@ -212,6 +216,7 @@ exports[`numberInput passes button props successfully 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-25"
@@ -265,6 +270,7 @@ exports[`numberInput passes button props successfully 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-26"
@@ -313,6 +319,7 @@ exports[`numberInput passes input props successfully 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-23"
@@ -365,6 +372,7 @@ exports[`numberInput passes input props successfully 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-24"
@@ -413,6 +421,7 @@ exports[`numberInput renders custom width 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-21"
@@ -465,6 +474,7 @@ exports[`numberInput renders custom width 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-22"
@@ -513,6 +523,7 @@ exports[`numberInput renders defaults & extra props 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-1"
@@ -565,6 +576,7 @@ exports[`numberInput renders defaults & extra props 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-2"
@@ -612,6 +624,7 @@ exports[`numberInput renders disabled 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="true"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-11"
@@ -666,6 +679,7 @@ exports[`numberInput renders disabled 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="true"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-12"
@@ -714,6 +728,7 @@ exports[`numberInput renders error validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-5"
@@ -787,6 +802,7 @@ exports[`numberInput renders error validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-6"
@@ -834,6 +850,7 @@ exports[`numberInput renders success validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-3"
@@ -907,6 +924,7 @@ exports[`numberInput renders success validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-4"
@@ -959,6 +977,7 @@ exports[`numberInput renders unit & position 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-19"
@@ -1011,6 +1030,7 @@ exports[`numberInput renders unit & position 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-20"
@@ -1058,6 +1078,7 @@ exports[`numberInput renders unit 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-17"
@@ -1110,6 +1131,7 @@ exports[`numberInput renders unit 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-18"
@@ -1162,6 +1184,7 @@ exports[`numberInput renders value 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-9"
@@ -1214,6 +1237,7 @@ exports[`numberInput renders value 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-10"
@@ -1261,6 +1285,7 @@ exports[`numberInput renders warning validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Minus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-7"
@@ -1334,6 +1359,7 @@ exports[`numberInput renders warning validated 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Plus"
           class="pf-v6-c-button pf-m-control"
           data-ouia-component-id="OUIA-Generated-Button-control-8"
diff --git a/packages/react-core/src/components/Page/__tests__/__snapshots__/Page.test.tsx.snap b/packages/react-core/src/components/Page/__tests__/__snapshots__/Page.test.tsx.snap
index 00b3624d974..1581ee45ee7 100644
--- a/packages/react-core/src/components/Page/__tests__/__snapshots__/Page.test.tsx.snap
+++ b/packages/react-core/src/components/Page/__tests__/__snapshots__/Page.test.tsx.snap
@@ -895,6 +895,7 @@ exports[`Page Check page to verify skip to content points to main content region
       class="pf-v6-c-skip-to-content"
     >
       <a
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-primary"
         data-ouia-component-id="OUIA-Generated-Button-primary-1"
         data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
index 707bfe71726..a92d5cd98dd 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`Navigation should match snapshot (auto-generated) 1`] = `
       class="pf-v6-c-pagination__nav-control pf-m-first"
     >
       <button
+        aria-disabled="false"
         aria-label="Go to first page"
         class="pf-v6-c-button pf-m-plain"
         data-action="first"
@@ -47,6 +48,7 @@ exports[`Navigation should match snapshot (auto-generated) 1`] = `
       class="pf-v6-c-pagination__nav-control"
     >
       <button
+        aria-disabled="false"
         aria-label="Go to previous page"
         class="pf-v6-c-button pf-m-plain"
         data-action="previous"
@@ -97,6 +99,7 @@ exports[`Navigation should match snapshot (auto-generated) 1`] = `
       class="pf-v6-c-pagination__nav-control"
     >
       <button
+        aria-disabled="false"
         aria-label="Go to next page"
         class="pf-v6-c-button pf-m-plain"
         data-action="next"
@@ -128,6 +131,7 @@ exports[`Navigation should match snapshot (auto-generated) 1`] = `
       class="pf-v6-c-pagination__nav-control pf-m-last"
     >
       <button
+        aria-disabled="false"
         aria-label="Go to last page"
         class="pf-v6-c-button pf-m-plain"
         data-action="last"
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 49a54958dfd..96f1bf87449 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
@@ -78,6 +78,7 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -110,6 +111,7 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -161,6 +163,7 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -192,6 +195,7 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -303,6 +307,7 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -335,6 +340,7 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -386,6 +392,7 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -417,6 +424,7 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -528,6 +536,7 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -560,6 +569,7 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -611,6 +621,7 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -642,6 +653,7 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -753,6 +765,7 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -785,6 +798,7 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -836,6 +850,7 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -867,6 +882,7 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -978,6 +994,7 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -1010,6 +1027,7 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -1061,6 +1079,7 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -1092,6 +1111,7 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -1203,6 +1223,7 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -1235,6 +1256,7 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -1286,6 +1308,7 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -1317,6 +1340,7 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -1414,6 +1438,7 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -1446,6 +1471,7 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -1502,6 +1528,7 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -1533,6 +1560,7 @@ exports[`Pagination component render custom pagination toggle 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -1643,6 +1671,7 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -1675,6 +1704,7 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -1731,6 +1761,7 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -1762,6 +1793,7 @@ exports[`Pagination component render custom perPageOptions 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -1872,6 +1904,7 @@ exports[`Pagination component render custom start end 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -1903,6 +1936,7 @@ exports[`Pagination component render custom start end 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -1958,6 +1992,7 @@ exports[`Pagination component render custom start end 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -1989,6 +2024,7 @@ exports[`Pagination component render custom start end 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -2051,6 +2087,7 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -2083,6 +2120,7 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -2139,6 +2177,7 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -2170,6 +2209,7 @@ exports[`Pagination component render empty per page options 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -2280,6 +2320,7 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -2311,6 +2352,7 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -2366,6 +2408,7 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -2398,6 +2441,7 @@ exports[`Pagination component render last page 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -2509,6 +2553,7 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -2541,6 +2586,7 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -2598,6 +2644,7 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -2630,6 +2677,7 @@ exports[`Pagination component render limited number of pages 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -2729,6 +2777,7 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -2761,6 +2810,7 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -2817,6 +2867,7 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -2848,6 +2899,7 @@ exports[`Pagination component render should render correctly bottom 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -2946,6 +2998,7 @@ 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-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -2978,6 +3031,7 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -3034,6 +3088,7 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -3065,6 +3120,7 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -3175,6 +3231,7 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -3207,6 +3264,7 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -3263,6 +3321,7 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -3294,6 +3353,7 @@ exports[`Pagination component render should render correctly compact 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -3405,6 +3465,7 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -3437,6 +3498,7 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -3494,6 +3556,7 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -3526,6 +3589,7 @@ exports[`Pagination component render should render correctly disabled 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -3637,6 +3701,7 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -3669,6 +3734,7 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -3725,6 +3791,7 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -3756,6 +3823,7 @@ exports[`Pagination component render should render correctly sticky 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -3866,6 +3934,7 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -3898,6 +3967,7 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -3954,6 +4024,7 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -3985,6 +4056,7 @@ exports[`Pagination component render should render correctly top 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -4095,6 +4167,7 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -4127,6 +4200,7 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -4183,6 +4257,7 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -4214,6 +4289,7 @@ exports[`Pagination component render titles 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -4324,6 +4400,7 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -4356,6 +4433,7 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -4412,6 +4490,7 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -4443,6 +4522,7 @@ exports[`Pagination component render up drop direction 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="false"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
@@ -4553,6 +4633,7 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-first"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to first page"
           class="pf-v6-c-button pf-m-plain"
           data-action="first"
@@ -4585,6 +4666,7 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to previous page"
           class="pf-v6-c-button pf-m-plain"
           data-action="previous"
@@ -4642,6 +4724,7 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to next page"
           class="pf-v6-c-button pf-m-plain"
           data-action="next"
@@ -4674,6 +4757,7 @@ exports[`Pagination component render zero results 1`] = `
         class="pf-v6-c-pagination__nav-control pf-m-last"
       >
         <button
+          aria-disabled="true"
           aria-label="Go to last page"
           class="pf-v6-c-button pf-m-plain"
           data-action="last"
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap b/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap
index 498ef9f35e5..592049a175f 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`PopoverCloseButton should match snapshot (auto-generated) 1`] = `
     class="pf-v6-c-popover__close"
   >
     <button
+      aria-disabled="false"
       aria-label="string"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-1"
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index 142d15d97ee..f233c2ad547 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -49,6 +49,7 @@ exports[`SearchInput advanced search 1`] = `
             class="pf-v6-c-text-input-group__utilities"
           >
             <button
+              aria-disabled="false"
               aria-label="Reset"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -78,6 +79,7 @@ exports[`SearchInput advanced search 1`] = `
         class="pf-v6-c-input-group__item pf-m-plain"
       >
         <button
+          aria-disabled="false"
           aria-expanded="false"
           aria-label="Open advanced search"
           class="pf-v6-c-button pf-m-control"
@@ -106,6 +108,7 @@ exports[`SearchInput advanced search 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Search"
           class="pf-v6-c-button pf-m-control"
           type="submit"
@@ -192,6 +195,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
             class="pf-v6-c-text-input-group__utilities"
           >
             <button
+              aria-disabled="false"
               aria-label="Reset"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -221,6 +225,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
         class="pf-v6-c-input-group__item pf-m-plain"
       >
         <button
+          aria-disabled="false"
           aria-expanded="true"
           aria-label="Open advanced search"
           class="pf-v6-c-button pf-m-control pf-m-expanded"
@@ -249,6 +254,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Search"
           class="pf-v6-c-button pf-m-control"
           type="submit"
@@ -407,6 +413,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                   class="pf-v6-c-form__group-control"
                 >
                   <button
+                    aria-disabled="false"
                     class="pf-v6-c-button pf-m-link pf-m-inline"
                     type="button"
                   >
@@ -445,6 +452,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     class="pf-v6-c-form__actions"
                   >
                     <button
+                      aria-disabled="false"
                       class="pf-v6-c-button pf-m-primary"
                       type="submit"
                     >
@@ -455,6 +463,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                       </span>
                     </button>
                     <button
+                      aria-disabled="false"
                       class="pf-v6-c-button pf-m-link"
                       type="reset"
                     >
@@ -525,6 +534,7 @@ exports[`SearchInput renders search input in strict mode 1`] = `
             class="pf-v6-c-text-input-group__utilities"
           >
             <button
+              aria-disabled="false"
               aria-label="Reset"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -554,6 +564,7 @@ exports[`SearchInput renders search input in strict mode 1`] = `
         class="pf-v6-c-input-group__item pf-m-plain"
       >
         <button
+          aria-disabled="false"
           aria-expanded="false"
           aria-label="Open advanced search"
           class="pf-v6-c-button pf-m-control"
@@ -582,6 +593,7 @@ exports[`SearchInput renders search input in strict mode 1`] = `
         class="pf-v6-c-input-group__item"
       >
         <button
+          aria-disabled="false"
           aria-label="Search"
           class="pf-v6-c-button pf-m-control"
           type="submit"
@@ -674,6 +686,7 @@ exports[`SearchInput search input with hint 1`] = `
             class="pf-v6-c-text-input-group__group"
           >
             <button
+              aria-disabled="false"
               aria-label="Previous"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -697,6 +710,7 @@ exports[`SearchInput search input with hint 1`] = `
               </span>
             </button>
             <button
+              aria-disabled="false"
               aria-label="Next"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -721,6 +735,7 @@ exports[`SearchInput search input with hint 1`] = `
             </button>
           </div>
           <button
+            aria-disabled="false"
             aria-label="Reset"
             class="pf-v6-c-button pf-m-plain"
             type="button"
@@ -750,6 +765,7 @@ exports[`SearchInput search input with hint 1`] = `
       class="pf-v6-c-input-group__item"
     >
       <button
+        aria-disabled="false"
         aria-label="Search"
         class="pf-v6-c-button pf-m-control"
         type="submit"
@@ -834,6 +850,7 @@ exports[`SearchInput simple search input 1`] = `
             class="pf-v6-c-text-input-group__group"
           >
             <button
+              aria-disabled="false"
               aria-label="Previous"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -857,6 +874,7 @@ exports[`SearchInput simple search input 1`] = `
               </span>
             </button>
             <button
+              aria-disabled="false"
               aria-label="Next"
               class="pf-v6-c-button pf-m-plain"
               type="button"
@@ -881,6 +899,7 @@ exports[`SearchInput simple search input 1`] = `
             </button>
           </div>
           <button
+            aria-disabled="false"
             aria-label="Reset"
             class="pf-v6-c-button pf-m-plain"
             type="button"
@@ -910,6 +929,7 @@ exports[`SearchInput simple search input 1`] = `
       class="pf-v6-c-input-group__item"
     >
       <button
+        aria-disabled="false"
         aria-label="Search"
         class="pf-v6-c-button pf-m-control"
         type="submit"
diff --git a/packages/react-core/src/components/SkipToContent/__tests__/__snapshots__/SkipToContent.test.tsx.snap b/packages/react-core/src/components/SkipToContent/__tests__/__snapshots__/SkipToContent.test.tsx.snap
index 6d82ac6cf96..d9ff2e7b653 100644
--- a/packages/react-core/src/components/SkipToContent/__tests__/__snapshots__/SkipToContent.test.tsx.snap
+++ b/packages/react-core/src/components/SkipToContent/__tests__/__snapshots__/SkipToContent.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`Verify Skip To Content 1`] = `
     class="pf-v6-c-skip-to-content"
   >
     <a
+      aria-disabled="false"
       class="pf-v6-c-button pf-m-primary"
       data-ouia-component-id="OUIA-Generated-Button-primary-1"
       data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/components/Slider/__tests__/__snapshots__/Slider.test.tsx.snap b/packages/react-core/src/components/Slider/__tests__/__snapshots__/Slider.test.tsx.snap
index 230f8f66631..da0990ace08 100644
--- a/packages/react-core/src/components/Slider/__tests__/__snapshots__/Slider.test.tsx.snap
+++ b/packages/react-core/src/components/Slider/__tests__/__snapshots__/Slider.test.tsx.snap
@@ -552,6 +552,7 @@ exports[`slider renders slider with input actions 1`] = `
       class="pf-v6-c-slider__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Minus"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -611,6 +612,7 @@ exports[`slider renders slider with input actions 1`] = `
       class="pf-v6-c-slider__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Plus"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-2"
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
index 296e7eba53c..8d207bee8e6 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`renders tab action 1`] = `
       class="pf-v6-c-tabs__item-action"
     >
       <button
+        aria-disabled="false"
         aria-label="Tab action"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
index 626d8d47a65..0667e8c55e8 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
@@ -407,6 +407,7 @@ exports[`should render expandable vertical tabs 1`] = `
         class="pf-v6-c-tabs__toggle-button"
       >
         <button
+          aria-disabled="false"
           aria-labelledby="generated-id-text generated-id-button"
           class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-3"
diff --git a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
index 86faeed64c3..7830866a8f0 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
@@ -69,6 +69,7 @@ exports[`Toolbar should render with custom label content 1`] = `
             class="pf-v6-c-toolbar__toggle"
           >
             <button
+              aria-disabled="false"
               aria-haspopup="false"
               aria-label="Show Filters"
               class="pf-v6-c-button pf-m-plain"
@@ -142,6 +143,7 @@ exports[`Toolbar should render with custom label content 1`] = `
                       class="pf-v6-c-label__actions"
                     >
                       <button
+                        aria-disabled="false"
                         aria-label="Close New"
                         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
                         data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -189,6 +191,7 @@ exports[`Toolbar should render with custom label content 1`] = `
                       class="pf-v6-c-label__actions"
                     >
                       <button
+                        aria-disabled="false"
                         aria-label="Close Pending"
                         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
                         data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -223,6 +226,7 @@ exports[`Toolbar should render with custom label content 1`] = `
               class="pf-v6-c-label-group__close"
             >
               <button
+                aria-disabled="false"
                 aria-label="Close label group"
                 aria-labelledby="remove_group_generated-id generated-id"
                 class="pf-v6-c-button pf-m-plain pf-m-no-padding"
@@ -266,6 +270,7 @@ exports[`Toolbar should render with custom label content 1`] = `
           class="pf-v6-c-toolbar__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-link pf-m-inline"
             data-ouia-component-id="OUIA-Generated-Button-link-1"
             data-ouia-component-type="PF6/Button"
@@ -283,6 +288,7 @@ exports[`Toolbar should render with custom label content 1`] = `
           class="pf-v6-c-toolbar__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-link pf-m-inline"
             data-ouia-component-id="OUIA-Generated-Button-link-2"
             data-ouia-component-type="PF6/Button"
diff --git a/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap b/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
index 8fbc81fae5b..3ba6a2efe0c 100644
--- a/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
@@ -23,6 +23,7 @@ exports[`Matches snapshot 1`] = `
       class="pf-v6-c-label__actions"
     >
       <button
+        aria-disabled="false"
         aria-label="Close Chip text"
         class="pf-v6-c-button pf-m-plain pf-m-no-padding"
         data-ouia-component-id="OUIA-Generated-Button-plain-17"
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
index 10420d3952d..4f313195d8c 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`Modal Content Test description 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -101,6 +102,7 @@ exports[`Modal Content Test isOpen 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -175,6 +177,7 @@ exports[`Modal Content Test only body 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -249,6 +252,7 @@ exports[`Modal Content Test with footer 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-4"
@@ -328,6 +332,7 @@ exports[`Modal Content Test with onclose 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-6"
@@ -407,6 +412,7 @@ exports[`Modal Content test without footer 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-5"
@@ -481,6 +487,7 @@ exports[`Modal Test with custom footer 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-8"
@@ -564,6 +571,7 @@ exports[`Modal Test with custom header 1`] = `
           class="pf-v6-c-modal-box__close"
         >
           <button
+            aria-disabled="false"
             aria-label="Close"
             class="pf-v6-c-button pf-m-plain"
             data-ouia-component-id="OUIA-Generated-Button-plain-7"
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 0f81cd9d413..caf3404b335 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
@@ -15,6 +15,7 @@ exports[`WizardFooterInternal should match snapshot (auto-generated) 1`] = `
           class="pf-v6-c-action-list__item"
         >
           <button
+            aria-disabled="true"
             class="pf-v6-c-button pf-m-secondary"
             data-ouia-component-id="OUIA-Generated-Button-secondary-1"
             data-ouia-component-type="PF6/Button"
@@ -35,6 +36,7 @@ exports[`WizardFooterInternal should match snapshot (auto-generated) 1`] = `
           class="pf-v6-c-action-list__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-primary"
             data-ouia-component-id="OUIA-Generated-Button-primary-1"
             data-ouia-component-type="PF6/Button"
@@ -58,6 +60,7 @@ exports[`WizardFooterInternal should match snapshot (auto-generated) 1`] = `
           class="pf-v6-c-action-list__item"
         >
           <button
+            aria-disabled="false"
             class="pf-v6-c-button pf-m-link"
             data-ouia-component-id="OUIA-Generated-Button-link-1"
             data-ouia-component-type="PF6/Button"
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 306b6a50773..72b35fe4e76 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
@@ -12,6 +12,7 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = `
         class="pf-v6-c-wizard__close"
       >
         <button
+          aria-disabled="false"
           aria-label="Close"
           class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -251,6 +252,7 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="true"
                 class="pf-v6-c-button pf-m-secondary"
                 data-ouia-component-id="OUIA-Generated-Button-secondary-2"
                 data-ouia-component-type="PF6/Button"
@@ -269,6 +271,7 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-primary"
                 data-ouia-component-id="OUIA-Generated-Button-primary-2"
                 data-ouia-component-type="PF6/Button"
@@ -290,6 +293,7 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-link"
                 data-ouia-component-id="OUIA-Generated-Button-link-2"
                 data-ouia-component-type="PF6/Button"
@@ -323,6 +327,7 @@ exports[`Wizard Wizard should match snapshot 1`] = `
         class="pf-v6-c-wizard__close"
       >
         <button
+          aria-disabled="false"
           aria-label="Close"
           class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -542,6 +547,7 @@ exports[`Wizard Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="true"
                 class="pf-v6-c-button pf-m-secondary"
                 data-ouia-component-id="OUIA-Generated-Button-secondary-1"
                 data-ouia-component-type="PF6/Button"
@@ -560,6 +566,7 @@ exports[`Wizard Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-primary"
                 data-ouia-component-id="OUIA-Generated-Button-primary-1"
                 data-ouia-component-type="PF6/Button"
@@ -581,6 +588,7 @@ exports[`Wizard Wizard should match snapshot 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-link"
                 data-ouia-component-id="OUIA-Generated-Button-link-1"
                 data-ouia-component-type="PF6/Button"
@@ -702,6 +710,7 @@ exports[`Wizard bare wiz 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="true"
                 class="pf-v6-c-button pf-m-secondary"
                 data-ouia-component-id="OUIA-Generated-Button-secondary-3"
                 data-ouia-component-type="PF6/Button"
@@ -720,6 +729,7 @@ exports[`Wizard bare wiz 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-primary"
                 data-ouia-component-id="OUIA-Generated-Button-primary-3"
                 data-ouia-component-type="PF6/Button"
@@ -741,6 +751,7 @@ exports[`Wizard bare wiz 1`] = `
               class="pf-v6-c-action-list__item"
             >
               <button
+                aria-disabled="false"
                 class="pf-v6-c-button pf-m-link"
                 data-ouia-component-id="OUIA-Generated-Button-link-3"
                 data-ouia-component-type="PF6/Button"
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
index 96420adbaac..fab45375709 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
@@ -1523,6 +1523,7 @@ exports[`Table Collapsible nested table 1`] = `
           tabindex="-1"
         >
           <button
+            aria-disabled="false"
             aria-expanded="false"
             aria-label="Details"
             aria-labelledby="simple-node0 expandable-toggle0"
@@ -1614,6 +1615,7 @@ exports[`Table Collapsible nested table 1`] = `
           tabindex="-1"
         >
           <button
+            aria-disabled="false"
             aria-expanded="true"
             aria-label="Details"
             aria-labelledby="simple-node1 expandable-toggle1"
@@ -1776,6 +1778,7 @@ exports[`Table Collapsible nested table 1`] = `
           tabindex="-1"
         >
           <button
+            aria-disabled="false"
             aria-expanded="false"
             aria-label="Details"
             aria-labelledby="simple-node3 expandable-toggle3"
@@ -2284,6 +2287,7 @@ exports[`Table Collapsible table 1`] = `
           tabindex="-1"
         >
           <button
+            aria-disabled="false"
             aria-expanded="true"
             aria-label="Details"
             aria-labelledby="simple-node0 expandable-toggle0"
@@ -2501,6 +2505,7 @@ exports[`Table Collapsible table 1`] = `
           tabindex="-1"
         >
           <button
+            aria-disabled="false"
             aria-expanded="false"
             aria-label="Details"
             aria-labelledby="simple-node3 expandable-toggle3"
@@ -10528,6 +10533,7 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v6-c-inline-edit__action"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Save row edits for row 0"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -10558,6 +10564,7 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v6-c-inline-edit__action"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Cancel row edits for row 0"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-2"
@@ -10589,6 +10596,7 @@ exports[`Table simple Editable table 1`] = `
               class="pf-v6-c-inline-edit__action pf-m-enable-editable"
             >
               <button
+                aria-disabled="false"
                 aria-label="Place row 0 in edit mode"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -10768,6 +10776,7 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v6-c-inline-edit__action"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Save row edits for row 1"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-4"
@@ -10798,6 +10807,7 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v6-c-inline-edit__action"
               >
                 <button
+                  aria-disabled="false"
                   aria-label="Cancel row edits for row 1"
                   class="pf-v6-c-button pf-m-plain"
                   data-ouia-component-id="OUIA-Generated-Button-plain-5"
@@ -10829,6 +10839,7 @@ exports[`Table simple Editable table 1`] = `
               class="pf-v6-c-inline-edit__action pf-m-enable-editable"
             >
               <button
+                aria-disabled="false"
                 aria-label="Place row 1 in edit mode"
                 class="pf-v6-c-button pf-m-plain"
                 data-ouia-component-id="OUIA-Generated-Button-plain-6"
diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap
index 7ade6ce2a50..6a350dff551 100644
--- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap
+++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap
@@ -32,6 +32,7 @@ exports[`MultiTypeaheadSelect Matches snapshot 1`] = `
         style="display: none;"
       >
         <button
+          aria-disabled="false"
           aria-label="Clear input value"
           class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-17"
diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap
index 1f8e707431a..bd078ecc6ea 100644
--- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap
+++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap
@@ -32,6 +32,7 @@ exports[`Matches snapshot 1`] = `
         style="display: none;"
       >
         <button
+          aria-disabled="false"
           aria-label="Clear input value"
           class="pf-v6-c-button pf-m-plain"
           data-ouia-component-id="OUIA-Generated-Button-plain-17"