diff --git a/packages/react/src/components/AspectRatio/AspectRatio.stories.js b/packages/react/src/components/AspectRatio/AspectRatio.stories.js
index 05fec5396137..c69be9d1ea2f 100644
--- a/packages/react/src/components/AspectRatio/AspectRatio.stories.js
+++ b/packages/react/src/components/AspectRatio/AspectRatio.stories.js
@@ -29,25 +29,23 @@ export default {
   },
 };
 
-export const Default = {
-  render: ({ ratio, ...args }) => {
-    return (
-      <Grid {...args}>
-        <Column sm={1} md={2} lg={4}>
-          <AspectRatio ratio={ratio}>Content</AspectRatio>
-        </Column>
-        <Column sm={1} md={2} lg={4}>
-          <AspectRatio ratio={ratio}>Content</AspectRatio>
-        </Column>
-        <Column sm={1} md={2} lg={4}>
-          <AspectRatio ratio={ratio}>Content</AspectRatio>
-        </Column>
-        <Column sm={1} md={2} lg={4}>
-          <AspectRatio ratio={ratio}>Content</AspectRatio>
-        </Column>
-      </Grid>
-    );
-  },
+export const Default = (args) => {
+  return (
+    <Grid {...args}>
+      <Column sm={1} md={2} lg={4}>
+        <AspectRatio {...args}>Content</AspectRatio>
+      </Column>
+      <Column sm={1} md={2} lg={4}>
+        <AspectRatio {...args}>Content</AspectRatio>
+      </Column>
+      <Column sm={1} md={2} lg={4}>
+        <AspectRatio {...args}>Content</AspectRatio>
+      </Column>
+      <Column sm={1} md={2} lg={4}>
+        <AspectRatio {...args}>Content</AspectRatio>
+      </Column>
+    </Grid>
+  );
 };
 
 Default.argTypes = {
@@ -65,5 +63,8 @@ Default.argTypes = {
       type: 'select',
     },
     options: ['16x9', '9x16', '2x1', '1x2', '4x3', '3x4', '1x1'],
+    table: {
+      category: 'AspectRatio',
+    },
   },
 };
diff --git a/packages/react/src/components/DataTable/DataTable.mdx b/packages/react/src/components/DataTable/DataTable.mdx
index e4f2af5fed99..0fe291de1722 100644
--- a/packages/react/src/components/DataTable/DataTable.mdx
+++ b/packages/react/src/components/DataTable/DataTable.mdx
@@ -8,9 +8,6 @@ import {
   TableBody,
 } from '../DataTable';
 
-import * as DataTableBasicStories from './stories/DataTable-basic.stories';
-import { stackblitzPrefillConfig } from '../../../previewer/codePreviewer';
-
 <Meta isTemplate />
 
 # DataTable
@@ -21,15 +18,7 @@ import { stackblitzPrefillConfig } from '../../../previewer/codePreviewer';
 &nbsp;|&nbsp;
 [Accessibility](https://www.carbondesignsystem.com/components/data-table/accessibility)
 
-<Canvas
-  of={DataTableBasicStories.Default}
-  additionalActions={[
-    {
-      title: 'Open in Stackblitz',
-      onClick: () => stackblitzPrefillConfig(DataTableBasicStories.Default),
-    },
-  ]}
-/>
+<Canvas id="components-datatable-basic--default" />
 
 {/* <!-- START doctoc generated TOC please keep comment here to allow auto update --> <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> */}