diff --git a/packages/documentation-framework/components/autoLinkHeader/autoLinkHeader.js b/packages/documentation-framework/components/autoLinkHeader/autoLinkHeader.js
index 0af656a4b7..b5a9948d39 100644
--- a/packages/documentation-framework/components/autoLinkHeader/autoLinkHeader.js
+++ b/packages/documentation-framework/components/autoLinkHeader/autoLinkHeader.js
@@ -25,7 +25,7 @@ export const AutoLinkHeader = ({
   const slug = id || slugger(children);
 
   return (
-    <Flex alignItems={{ default: 'alignItemsCenter'}} spaceItems={{ default: 'spaceItemsNone' }}>
+    <Flex alignItems={{ default: 'alignItemsCenter'}} spaceItems={{ default: "spaceItemsSm" }}>
       <FlexItem>
         <Title
           id={slug}
@@ -40,7 +40,7 @@ export const AutoLinkHeader = ({
           {children}
         </Title>
       </FlexItem>
-      <FlexItem>  {metaText}</FlexItem>
+      <FlexItem>{metaText}</FlexItem>
     </Flex>
   )
 };
diff --git a/packages/documentation-framework/components/example/example.js b/packages/documentation-framework/components/example/example.js
index 85278392bb..34c3d887e4 100644
--- a/packages/documentation-framework/components/example/example.js
+++ b/packages/documentation-framework/components/example/example.js
@@ -203,21 +203,21 @@ export const Example = ({
             <React.Fragment>
               {isBeta && (
                 <Tooltip content="This beta component is currently under review and is still open for further evolution.">
-                  <Button variant="plain">
+                  <Button variant="plain" hasNoPadding>
                     <Label isCompact color="blue">Beta</Label>
                   </Button>
                 </Tooltip>
               )}
               {isDemo && (
                 <Tooltip content="Demos show how multiple components can be used in a single design.">
-                  <Button variant="plain">
+                  <Button variant="plain" hasNoPadding>
                     <Label isCompact color="purple">Demo</Label>
                   </Button>
                 </Tooltip>
               )}
               {isDeprecated && (
                 <Tooltip content="Deprecated components are available for use but are no longer being maintained or enhanced.">
-                  <Button variant="plain">
+                  <Button variant="plain" hasNoPadding>
                     <Label isCompact color="grey">Deprecated</Label>
                   </Button>
                 </Tooltip>
diff --git a/packages/documentation-framework/templates/mdx.js b/packages/documentation-framework/templates/mdx.js
index 681e810076..a411723eed 100644
--- a/packages/documentation-framework/templates/mdx.js
+++ b/packages/documentation-framework/templates/mdx.js
@@ -270,7 +270,7 @@ export const MDXTemplate = ({
                   {isDeprecated && (
                     <FlexItem spacer={{ default: 'spacerSm' }}>
                       <Tooltip content="Deprecated components are available for use but are no longer being maintained or enhanced.">
-                        <Button isInline component="span" variant="link">
+                        <Button variant="plain" hasNoPadding>
                           <Label color="grey">Deprecated</Label>
                         </Button>
                       </Tooltip>
@@ -279,7 +279,7 @@ export const MDXTemplate = ({
                   {isDemo && (
                     <FlexItem spacer={{ default: 'spacerSm' }}>
                       <Tooltip content="Demos show how multiple components can be used in a single design.">
-                        <Button isInline component="span" variant="link">
+                        <Button variant="plain" hasNoPadding>
                           <Label color="purple">Demo</Label>
                         </Button>
                       </Tooltip>
@@ -288,7 +288,7 @@ export const MDXTemplate = ({
                   {isBeta && (
                     <FlexItem spacer={{ default: 'spacerSm' }}>
                       <Tooltip content="This beta component is currently under review and is still open for further evolution.">
-                        <Button isInline component="span" variant="link">
+                        <Button variant="plain" hasNoPadding>
                           <Label color="blue">Beta</Label>
                         </Button>
                       </Tooltip>
diff --git a/packages/documentation-site/package.json b/packages/documentation-site/package.json
index 65264526ea..f0ef223446 100644
--- a/packages/documentation-site/package.json
+++ b/packages/documentation-site/package.json
@@ -17,7 +17,7 @@
     "screenshots": "pf-docs-framework screenshots"
   },
   "dependencies": {
-    "@patternfly/documentation-framework": "6.0.0-alpha.20",
+    "@patternfly/documentation-framework": "6.0.0-alpha.22",
     "@patternfly/quickstarts": "^5.1.0",
     "@patternfly/react-catalog-view-extension": "5.0.0",
     "@patternfly/react-console": "5.0.0",
@@ -27,7 +27,7 @@
     "@patternfly/react-user-feedback": "5.0.0",
     "@patternfly/react-component-groups": "5.1.0",
     "@patternfly/react-virtualized-extension": "5.0.0",
-    "@patternfly/design-tokens": "1.0.4",
+    "@patternfly/design-tokens": "1.0.5",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
     "showdown": "^2.1.0"
diff --git a/yarn.lock b/yarn.lock
index 01c56c1fd2..6272bbad07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2472,10 +2472,10 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@patternfly/design-tokens@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@patternfly/design-tokens/-/design-tokens-1.0.4.tgz#51142a5488bff61eecd044f7f0ca4157ef16b2c8"
-  integrity sha512-z6ikVWSkWGxOqdE5yTKVi4wOxdduy9wQoJU0Eri7psV532HKxd/XocURalqKgfhv55ReDHHG11+5z0ORUuLB0w==
+"@patternfly/design-tokens@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@patternfly/design-tokens/-/design-tokens-1.0.5.tgz#d944c50c30006efdc9f277707021a32665fb79d7"
+  integrity sha512-HifDWvUTrGBC0ngPGXqkdoCBA4JsPXlrGb78a0wL+nwEypAoLAulCCoBpnUeYESlI1CmVjlWUxwRpnVFICZc+Q==
   dependencies:
     "@patternfly/react-core" "^6.0.0-alpha.36"