diff --git a/gatsby-node.js b/gatsby-node.js
index 3a0096f22..cfc589d5b 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -16,7 +16,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
   const { createPage, createRedirect } = actions;
 
   const result = await graphql(`
-    {
+    query {
       allMdx(
         limit: 1000
         filter: { fileAbsolutePath: { regex: "/src/markdown-pages/" } }
@@ -35,6 +35,16 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
           }
         }
       }
+
+      allNewRelicSdkComponent {
+        edges {
+          node {
+            fields {
+              slug
+            }
+          }
+        }
+      }
     }
   `);
 
@@ -44,7 +54,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
     return;
   }
 
-  const { allMdx } = result.data;
+  const { allMdx, allNewRelicSdkComponent } = result.data;
 
   allMdx.edges.forEach(({ node }) => {
     const { frontmatter } = node;
@@ -76,6 +86,20 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
       },
     });
   });
+
+  allNewRelicSdkComponent.edges.forEach(({ node }) => {
+    const {
+      fields: { slug },
+    } = node;
+
+    createPage({
+      path: slug,
+      component: path.resolve('./src/templates/ComponentReferenceTemplate.js'),
+      context: {
+        slug,
+      },
+    });
+  });
 };
 
 exports.onCreateNode = ({ node, actions }) => {
diff --git a/src/markdown-pages/components/account-picker.mdx b/src/markdown-pages/components/account-picker.mdx
deleted file mode 100644
index 41aa15489..000000000
--- a/src/markdown-pages/components/account-picker.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/account-picker'
-title: 'AccountPicker'
-description: 'An AccountPicker component!'
-component: 'AccountPicker'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/account-storage-mutation.mdx b/src/markdown-pages/components/account-storage-mutation.mdx
deleted file mode 100644
index 8c2d05603..000000000
--- a/src/markdown-pages/components/account-storage-mutation.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/account-storage-mutation'
-title: 'AccountStorageMutation'
-description: 'An AccountStorageMutation component!'
-component: 'AccountStorageMutation'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/account-storage-query.mdx b/src/markdown-pages/components/account-storage-query.mdx
deleted file mode 100644
index b930d12da..000000000
--- a/src/markdown-pages/components/account-storage-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/account-storage-query'
-title: 'AccountStorageQuery'
-description: 'An AccountStorageQuery component!'
-component: 'AccountStorageQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/accounts-query.mdx b/src/markdown-pages/components/accounts-query.mdx
deleted file mode 100644
index 0f47252da..000000000
--- a/src/markdown-pages/components/accounts-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/accounts-query'
-title: 'AccountsQuery'
-description: 'A AccountsQuery component!'
-component: 'AccountsQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/auto-sizer.mdx b/src/markdown-pages/components/auto-sizer.mdx
deleted file mode 100644
index 5083c4f58..000000000
--- a/src/markdown-pages/components/auto-sizer.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/auto-sizer'
-title: 'AutoSizer'
-description: 'An AutoSizer component!'
-component: 'AutoSizer'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/badge.mdx b/src/markdown-pages/components/badge.mdx
deleted file mode 100644
index b2b650d4e..000000000
--- a/src/markdown-pages/components/badge.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/badge'
-title: 'Badge'
-description: 'A Badge component!'
-component: 'Badge'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/block-text.mdx b/src/markdown-pages/components/block-text.mdx
deleted file mode 100644
index becf5517a..000000000
--- a/src/markdown-pages/components/block-text.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/block-text'
-title: 'BlockText'
-description: 'A BlockText component!'
-component: 'BlockText'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/button.mdx b/src/markdown-pages/components/button.mdx
deleted file mode 100644
index e9ac5dcc3..000000000
--- a/src/markdown-pages/components/button.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/button'
-title: 'Button'
-description: 'A button component!'
-component: 'Button'
-template: 'ComponentReferenceTemplate'
----
\ No newline at end of file
diff --git a/src/markdown-pages/components/card-body.mdx b/src/markdown-pages/components/card-body.mdx
deleted file mode 100644
index e503103c8..000000000
--- a/src/markdown-pages/components/card-body.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/card-body'
-title: 'CardBody'
-description: 'A CardBody component!'
-component: 'CardBody'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/card-header.mdx b/src/markdown-pages/components/card-header.mdx
deleted file mode 100644
index d4eaec951..000000000
--- a/src/markdown-pages/components/card-header.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/card-header'
-title: 'CardHeader'
-description: 'A CardHeader component!'
-component: 'CardHeader'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/card.mdx b/src/markdown-pages/components/card.mdx
deleted file mode 100644
index 86c568b15..000000000
--- a/src/markdown-pages/components/card.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/card'
-title: 'Card'
-description: 'A Card component!'
-component: 'Card'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/area-chart.mdx b/src/markdown-pages/components/charts/area-chart.mdx
deleted file mode 100644
index b24906bc4..000000000
--- a/src/markdown-pages/components/charts/area-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/area-chart'
-title: 'AreaChart'
-description: 'An AreaChart component!'
-component: 'AreaChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/bar-chart.mdx b/src/markdown-pages/components/charts/bar-chart.mdx
deleted file mode 100644
index 0617d999e..000000000
--- a/src/markdown-pages/components/charts/bar-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/bar-chart'
-title: 'BarChart'
-description: 'A BarChart component!'
-component: 'BarChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/billboard-chart.mdx b/src/markdown-pages/components/charts/billboard-chart.mdx
deleted file mode 100644
index 3ef7a3a96..000000000
--- a/src/markdown-pages/components/charts/billboard-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/billboard-chart'
-title: 'BillboardChart'
-description: 'A BillboardChart component!'
-component: 'BillboardChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/chart-group.mdx b/src/markdown-pages/components/charts/chart-group.mdx
deleted file mode 100644
index b5de47e35..000000000
--- a/src/markdown-pages/components/charts/chart-group.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/chart-group'
-title: 'ChartGroup'
-description: 'A ChartGroup component!'
-component: 'ChartGroup'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/funnel-chart.mdx b/src/markdown-pages/components/charts/funnel-chart.mdx
deleted file mode 100644
index 90b96c553..000000000
--- a/src/markdown-pages/components/charts/funnel-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/funnel-chart'
-title: 'FunnelChart'
-description: 'A FunnelChart component!'
-component: 'FunnelChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/histogram-chart.mdx b/src/markdown-pages/components/charts/histogram-chart.mdx
deleted file mode 100644
index fb4a37563..000000000
--- a/src/markdown-pages/components/charts/histogram-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/histogram-chart'
-title: 'HistogramChart'
-description: 'A HistogramChart component!'
-component: 'HistogramChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/json-chart.mdx b/src/markdown-pages/components/charts/json-chart.mdx
deleted file mode 100644
index ca6e1034d..000000000
--- a/src/markdown-pages/components/charts/json-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/json-chart'
-title: 'JsonChart'
-description: 'A JsonChart component!'
-component: 'JsonChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/line-chart.mdx b/src/markdown-pages/components/charts/line-chart.mdx
deleted file mode 100644
index d0bfe7a40..000000000
--- a/src/markdown-pages/components/charts/line-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/line-chart'
-title: 'LineChart'
-description: 'A LineChart component!'
-component: 'LineChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/pie-chart.mdx b/src/markdown-pages/components/charts/pie-chart.mdx
deleted file mode 100644
index a3883d545..000000000
--- a/src/markdown-pages/components/charts/pie-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/pie-chart'
-title: 'PieChart'
-description: 'A PieChart component!'
-component: 'PieChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/scatter-chart.mdx b/src/markdown-pages/components/charts/scatter-chart.mdx
deleted file mode 100644
index 6d89580f0..000000000
--- a/src/markdown-pages/components/charts/scatter-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/scatter-chart'
-title: 'ScatterChart'
-description: 'A ScatterChart component!'
-component: 'ScatterChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/sparkline-chart.mdx b/src/markdown-pages/components/charts/sparkline-chart.mdx
deleted file mode 100644
index 5f3666610..000000000
--- a/src/markdown-pages/components/charts/sparkline-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/sparkline-chart'
-title: 'SparklineChart'
-description: 'A SparklineChart component!'
-component: 'SparklineChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/stacked-bar-chart.mdx b/src/markdown-pages/components/charts/stacked-bar-chart.mdx
deleted file mode 100644
index 46699747f..000000000
--- a/src/markdown-pages/components/charts/stacked-bar-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/stacked-bar-chart'
-title: 'StackedBarChart'
-description: 'A StackedBarChart component!'
-component: 'StackedBarChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/charts/table-chart.mdx b/src/markdown-pages/components/charts/table-chart.mdx
deleted file mode 100644
index c969704e7..000000000
--- a/src/markdown-pages/components/charts/table-chart.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table-chart'
-title: 'TableChart'
-description: 'A TableChart component!'
-component: 'TableChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/checkbox.mdx b/src/markdown-pages/components/checkbox.mdx
deleted file mode 100644
index 449b62623..000000000
--- a/src/markdown-pages/components/checkbox.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/checkbox'
-title: 'Checkbox'
-description: 'A Checkbox component!'
-component: 'Checkbox'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/dropdown-item.mdx b/src/markdown-pages/components/dropdown-item.mdx
deleted file mode 100644
index e897b728b..000000000
--- a/src/markdown-pages/components/dropdown-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/dropdown-item'
-title: 'DropdownItem'
-description: 'A DropdownItem component!'
-component: 'DropdownItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/dropdown-section.mdx b/src/markdown-pages/components/dropdown-section.mdx
deleted file mode 100644
index 7bcc148b9..000000000
--- a/src/markdown-pages/components/dropdown-section.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/dropdown-section'
-title: 'DropdownSection'
-description: 'A DropdownSection component!'
-component: 'DropdownSection'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/dropdown.mdx b/src/markdown-pages/components/dropdown.mdx
deleted file mode 100644
index ee082de33..000000000
--- a/src/markdown-pages/components/dropdown.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/dropdown'
-title: 'Dropdown'
-description: 'A Dropdown component!'
-component: 'Dropdown'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entities-by-domain-type-query.mdx b/src/markdown-pages/components/entities-by-domain-type-query.mdx
deleted file mode 100644
index 1018ed1e0..000000000
--- a/src/markdown-pages/components/entities-by-domain-type-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entities-by-domain-type-query'
-title: 'EntitiesByDomainTypeQuery'
-description: 'An EntitiesByDomainTypeQuery component!'
-component: 'EntitiesByDomainTypeQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entities-by-guids-query.mdx b/src/markdown-pages/components/entities-by-guids-query.mdx
deleted file mode 100644
index 2a9dd9e79..000000000
--- a/src/markdown-pages/components/entities-by-guids-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entities-by-guids-query'
-title: 'EntitiesByGuidsQuery'
-description: 'An EntitiesByGuidsQuery component!'
-component: 'EntitiesByGuidsQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entities-by-name-query.mdx b/src/markdown-pages/components/entities-by-name-query.mdx
deleted file mode 100644
index aa6727645..000000000
--- a/src/markdown-pages/components/entities-by-name-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entities-by-name-query'
-title: 'EntitiesByNameQuery'
-description: 'An EntitiesByNameQuery component!'
-component: 'EntitiesByNameQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-by-guid-query.mdx b/src/markdown-pages/components/entity-by-guid-query.mdx
deleted file mode 100644
index 2bdad4668..000000000
--- a/src/markdown-pages/components/entity-by-guid-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-by-guid-query'
-title: 'EntityByGuidQuery'
-description: 'An EntityByGuidQuery component!'
-component: 'EntityByGuidQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-count-query.mdx b/src/markdown-pages/components/entity-count-query.mdx
deleted file mode 100644
index a454e4890..000000000
--- a/src/markdown-pages/components/entity-count-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-count-query'
-title: 'EntityCountQuery'
-description: 'An EntityCountQuery component!'
-component: 'EntityCountQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-search-query.mdx b/src/markdown-pages/components/entity-search-query.mdx
deleted file mode 100644
index a28ecb77c..000000000
--- a/src/markdown-pages/components/entity-search-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-search-query'
-title: 'EntitySearchQuery'
-description: 'An EntitySearchQuery component!'
-component: 'EntitySearchQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-storage-mutation.mdx b/src/markdown-pages/components/entity-storage-mutation.mdx
deleted file mode 100644
index 8fc18b01d..000000000
--- a/src/markdown-pages/components/entity-storage-mutation.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-storage-mutation'
-title: 'EntityStorageMutation'
-description: 'An EntityStorageMutation component!'
-component: 'EntityStorageMutation'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-storage-query.mdx b/src/markdown-pages/components/entity-storage-query.mdx
deleted file mode 100644
index b09ff61f2..000000000
--- a/src/markdown-pages/components/entity-storage-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-storage-query'
-title: 'EntityStorageQuery'
-description: 'An EntityStorageQuery component!'
-component: 'EntityStorageQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/entity-title-table-row-cell.mdx b/src/markdown-pages/components/entity-title-table-row-cell.mdx
deleted file mode 100644
index e33af2590..000000000
--- a/src/markdown-pages/components/entity-title-table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/entity-title-table-row-cell'
-title: 'EntityTitleTableRowCell'
-description: 'An EntityTitleTableRowCell component!'
-component: 'EntityTitleTableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/favorite-table-row-cell.mdx b/src/markdown-pages/components/favorite-table-row-cell.mdx
deleted file mode 100644
index 0c252af70..000000000
--- a/src/markdown-pages/components/favorite-table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/favorite-table-row-cell'
-title: 'FavoriteTableRowCell'
-description: 'An FavoriteTableRowCell component!'
-component: 'FavoriteTableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/grid-item.mdx b/src/markdown-pages/components/grid-item.mdx
deleted file mode 100644
index 5215355f1..000000000
--- a/src/markdown-pages/components/grid-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/grid-item'
-title: 'GridItem'
-description: 'A GridItem component!'
-component: 'GridItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/grid.mdx b/src/markdown-pages/components/grid.mdx
deleted file mode 100644
index 022f72d59..000000000
--- a/src/markdown-pages/components/grid.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/grid'
-title: 'Grid'
-description: 'A Grid component!'
-component: 'Grid'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/heading-text.mdx b/src/markdown-pages/components/heading-text.mdx
deleted file mode 100644
index 2f9679784..000000000
--- a/src/markdown-pages/components/heading-text.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
----
-path: '/components/heading-text'
-title: 'BlockText'
-description: 'A HeadingText component!'
-component: 'HeadingText'
-template: 'ComponentReferenceTemplate'
----
-
diff --git a/src/markdown-pages/components/heatmap-component.mdx b/src/markdown-pages/components/heatmap-component.mdx
deleted file mode 100644
index a06e16444..000000000
--- a/src/markdown-pages/components/heatmap-component.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/heatmap-chart'
-title: 'HeatmapChart'
-description: 'A HeatmapChart component!'
-component: 'HeatmapChart'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/icon.mdx b/src/markdown-pages/components/icon.mdx
deleted file mode 100644
index 7d9be685d..000000000
--- a/src/markdown-pages/components/icon.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/icon'
-title: 'Icon'
-description: 'An Icon component!'
-component: 'Icon'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/layout-item.mdx b/src/markdown-pages/components/layout-item.mdx
deleted file mode 100644
index fb9056025..000000000
--- a/src/markdown-pages/components/layout-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/layout-item'
-title: 'LayoutItem'
-description: 'A LayoutItem component!'
-component: 'LayoutItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/layout.mdx b/src/markdown-pages/components/layout.mdx
deleted file mode 100644
index 35cee4988..000000000
--- a/src/markdown-pages/components/layout.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/layout'
-title: 'Layout'
-description: 'A Layout component!'
-component: 'Layout'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/link.mdx b/src/markdown-pages/components/link.mdx
deleted file mode 100644
index e59f24826..000000000
--- a/src/markdown-pages/components/link.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/link'
-title: 'Link'
-description: 'A Link component!'
-component: 'Link'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/list-item.mdx b/src/markdown-pages/components/list-item.mdx
deleted file mode 100644
index d2562729d..000000000
--- a/src/markdown-pages/components/list-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/list-item'
-title: 'ListItem'
-description: 'A ListItem component!'
-component: 'ListItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/list.mdx b/src/markdown-pages/components/list.mdx
deleted file mode 100644
index 7d7013fa0..000000000
--- a/src/markdown-pages/components/list.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/list'
-title: 'List'
-description: 'A List component!'
-component: 'List'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/metric-table-row-cell.mdx b/src/markdown-pages/components/metric-table-row-cell.mdx
deleted file mode 100644
index 105dae644..000000000
--- a/src/markdown-pages/components/metric-table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/metric-table-row-cell'
-title: 'MetricTableRowCell'
-description: 'A MetricTableRowCell component!'
-component: 'MetricTableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/modal.mdx b/src/markdown-pages/components/modal.mdx
deleted file mode 100644
index 992bd4bab..000000000
--- a/src/markdown-pages/components/modal.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/modal'
-title: 'Modal'
-description: 'A Modal component!'
-component: 'Modal'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/multiline-text-field.mdx b/src/markdown-pages/components/multiline-text-field.mdx
deleted file mode 100644
index 9b13f0c8b..000000000
--- a/src/markdown-pages/components/multiline-text-field.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/multiline-text-field'
-title: 'MultilineTextField'
-description: 'A MultilineTextField component!'
-component: 'MultilineTextField'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/nerd-graph-mutation.mdx b/src/markdown-pages/components/nerd-graph-mutation.mdx
deleted file mode 100644
index 51324834e..000000000
--- a/src/markdown-pages/components/nerd-graph-mutation.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/nerd-graph-mutation'
-title: 'NerdGraphMutation'
-description: 'An NerdGraphMutation component!'
-component: 'NerdGraphMutation'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/nerd-graph-query.mdx b/src/markdown-pages/components/nerd-graph-query.mdx
deleted file mode 100644
index 06040741d..000000000
--- a/src/markdown-pages/components/nerd-graph-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/nerd-graph-query'
-title: 'NerdGraphQuery'
-description: 'A NerdGraphQuery component!'
-component: 'NerdGraphQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/nerdlet-state-context.mdx b/src/markdown-pages/components/nerdlet-state-context.mdx
deleted file mode 100644
index 20a842348..000000000
--- a/src/markdown-pages/components/nerdlet-state-context.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/nerdlet-state-context'
-title: 'NerdletStateContext'
-description: 'A NerdletStateContext component!'
-component: 'NerdletStateContext'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/nrql-query.mdx b/src/markdown-pages/components/nrql-query.mdx
deleted file mode 100644
index 2d90501e1..000000000
--- a/src/markdown-pages/components/nrql-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/nrql-query'
-title: 'NrqlQuery'
-description: 'A NrqlQuery component!'
-component: 'NrqlQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/platform-state-context.mdx b/src/markdown-pages/components/platform-state-context.mdx
deleted file mode 100644
index 6e0a48570..000000000
--- a/src/markdown-pages/components/platform-state-context.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/platform-state-context'
-title: 'PlatformStateContext'
-description: 'A PlatformStateContext component!'
-component: 'PlatformStateContext'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/popover-body.mdx b/src/markdown-pages/components/popover-body.mdx
deleted file mode 100644
index 28bb33628..000000000
--- a/src/markdown-pages/components/popover-body.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/popover-body'
-title: 'PopoverBody'
-description: 'A PopoverBody component!'
-component: 'PopoverBody'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/popover-trigger.mdx b/src/markdown-pages/components/popover-trigger.mdx
deleted file mode 100644
index 8e40daf35..000000000
--- a/src/markdown-pages/components/popover-trigger.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/popover-trigger'
-title: 'PopoverTrigger'
-description: 'A PopoverTrigger component!'
-component: 'PopoverTrigger'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/popover.mdx b/src/markdown-pages/components/popover.mdx
deleted file mode 100644
index 8642e2c0c..000000000
--- a/src/markdown-pages/components/popover.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/popover'
-title: 'Popover'
-description: 'A Popover component!'
-component: 'Popover'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/radio-group.mdx b/src/markdown-pages/components/radio-group.mdx
deleted file mode 100644
index 57ed827a1..000000000
--- a/src/markdown-pages/components/radio-group.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/radio-group'
-title: 'RadioGroup'
-description: 'A RadioGroup component!'
-component: 'RadioGroup'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/radio.mdx b/src/markdown-pages/components/radio.mdx
deleted file mode 100644
index fa5c46040..000000000
--- a/src/markdown-pages/components/radio.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/radio'
-title: 'Radio'
-description: 'A Radio component!'
-component: 'Radio'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/segmented-control-item.mdx b/src/markdown-pages/components/segmented-control-item.mdx
deleted file mode 100644
index f0b96befa..000000000
--- a/src/markdown-pages/components/segmented-control-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/segmented-control-item'
-title: 'SegmentedControlItem'
-description: 'A SegmentedControlItem component!'
-component: 'SegmentedControlItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/segmented-control.mdx b/src/markdown-pages/components/segmented-control.mdx
deleted file mode 100644
index 9e48c4043..000000000
--- a/src/markdown-pages/components/segmented-control.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/segmented-control'
-title: 'SegmentedControl'
-description: 'A SegmentedControl component!'
-component: 'SegmentedControl'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/select-item.mdx b/src/markdown-pages/components/select-item.mdx
deleted file mode 100644
index 39607c7b2..000000000
--- a/src/markdown-pages/components/select-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/select-item'
-title: 'SelectItem'
-description: 'A SelectItem component!'
-component: 'SelectItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/select.mdx b/src/markdown-pages/components/select.mdx
deleted file mode 100644
index 58b7b22eb..000000000
--- a/src/markdown-pages/components/select.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/select'
-title: 'Select'
-description: 'A Select component!'
-component: 'Select'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/spacing.mdx b/src/markdown-pages/components/spacing.mdx
deleted file mode 100644
index 1a8cd9f4e..000000000
--- a/src/markdown-pages/components/spacing.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/spacing'
-title: 'Spacing'
-description: 'A Spacing component!'
-component: 'Spacing'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/sparkline-table-row-cell.mdx b/src/markdown-pages/components/sparkline-table-row-cell.mdx
deleted file mode 100644
index 4083f564a..000000000
--- a/src/markdown-pages/components/sparkline-table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/sparkline-table-row-cell'
-title: 'SparklineTableRowCell'
-description: 'A SparklineTableRowCell component!'
-component: 'SparklineTableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/spinner.mdx b/src/markdown-pages/components/spinner.mdx
deleted file mode 100644
index 95119c473..000000000
--- a/src/markdown-pages/components/spinner.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/spinner'
-title: 'Spinner'
-description: 'A Spinner component!'
-component: 'Spinner'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/stack-item.mdx b/src/markdown-pages/components/stack-item.mdx
deleted file mode 100644
index febc160a4..000000000
--- a/src/markdown-pages/components/stack-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/stack-item'
-title: 'StackItem'
-description: 'A StackItem component!'
-component: 'StackItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/stack.mdx b/src/markdown-pages/components/stack.mdx
deleted file mode 100644
index 75dafeeb9..000000000
--- a/src/markdown-pages/components/stack.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/stack'
-title: 'Stack'
-description: 'A Stack component!'
-component: 'Stack'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/switch.mdx b/src/markdown-pages/components/switch.mdx
deleted file mode 100644
index 08b68eb27..000000000
--- a/src/markdown-pages/components/switch.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/switch'
-title: 'Switch'
-description: 'A Switch component!'
-component: 'Switch'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/table-header-cell.mdx b/src/markdown-pages/components/table-header-cell.mdx
deleted file mode 100644
index 10e1c37f9..000000000
--- a/src/markdown-pages/components/table-header-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table-header-cell'
-title: 'TableHeaderCell'
-description: 'A TableHeaderCell component!'
-component: 'TableHeaderCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/table-header.mdx b/src/markdown-pages/components/table-header.mdx
deleted file mode 100644
index c957ad91c..000000000
--- a/src/markdown-pages/components/table-header.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table-header'
-title: 'TableHeader'
-description: 'A TableHeader component!'
-component: 'TableHeader'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/table-row-cell.mdx b/src/markdown-pages/components/table-row-cell.mdx
deleted file mode 100644
index e03a0e85e..000000000
--- a/src/markdown-pages/components/table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table-row-cell'
-title: 'TableRowCell'
-description: 'A TableRowCell component!'
-component: 'TableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/table-row.mdx b/src/markdown-pages/components/table-row.mdx
deleted file mode 100644
index 65a59d016..000000000
--- a/src/markdown-pages/components/table-row.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table-row'
-title: 'TableRow'
-description: 'A TableRow component!'
-component: 'TableRow'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/table.mdx b/src/markdown-pages/components/table.mdx
deleted file mode 100644
index 5ea515e23..000000000
--- a/src/markdown-pages/components/table.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/table'
-title: 'Table'
-description: 'A Table component!'
-component: 'Table'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/tabs-item.mdx b/src/markdown-pages/components/tabs-item.mdx
deleted file mode 100644
index 64ecb489b..000000000
--- a/src/markdown-pages/components/tabs-item.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/tabs-item'
-title: 'TabsItem'
-description: 'A TabsItem component!'
-component: 'TabsItem'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/tabs.mdx b/src/markdown-pages/components/tabs.mdx
deleted file mode 100644
index 8901e0891..000000000
--- a/src/markdown-pages/components/tabs.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/tabs'
-title: 'Tabs'
-description: 'A Tabs component!'
-component: 'Tabs'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/text-field.mdx b/src/markdown-pages/components/text-field.mdx
deleted file mode 100644
index fd3731437..000000000
--- a/src/markdown-pages/components/text-field.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/text-field'
-title: 'TextField'
-description: 'A TextField component!'
-component: 'TextField'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/toast.mdx b/src/markdown-pages/components/toast.mdx
deleted file mode 100644
index fab4b9eee..000000000
--- a/src/markdown-pages/components/toast.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/toast'
-title: 'Toast'
-description: 'A Toast component!'
-component: 'Toast'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/tooltip.mdx b/src/markdown-pages/components/tooltip.mdx
deleted file mode 100644
index 7bea1e2d8..000000000
--- a/src/markdown-pages/components/tooltip.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/tooltip'
-title: 'Tooltip'
-description: 'A Tooltip component!'
-component: 'Tooltip'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/user-query.mdx b/src/markdown-pages/components/user-query.mdx
deleted file mode 100644
index a61162496..000000000
--- a/src/markdown-pages/components/user-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/user-query'
-title: 'UserQuery'
-description: 'An UserQuery component!'
-component: 'UserQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/user-storage-mutation.mdx b/src/markdown-pages/components/user-storage-mutation.mdx
deleted file mode 100644
index 5fa1c7fba..000000000
--- a/src/markdown-pages/components/user-storage-mutation.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/user-storage-mutation'
-title: 'UserStorageMutation'
-description: 'A UserStorageMutation component!'
-component: 'UserStorageMutation'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/user-storage-query.mdx b/src/markdown-pages/components/user-storage-query.mdx
deleted file mode 100644
index c77d7fbff..000000000
--- a/src/markdown-pages/components/user-storage-query.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/user-storage-query'
-title: 'UserStorageQuery'
-description: 'A UserStorageQuery component!'
-component: 'UserStorageQuery'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/markdown-pages/components/user-table-row-cell.mdx b/src/markdown-pages/components/user-table-row-cell.mdx
deleted file mode 100644
index ab6642f60..000000000
--- a/src/markdown-pages/components/user-table-row-cell.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-path: '/components/user-table-row-cell'
-title: 'UserTableRowCell'
-description: 'A UserTableRowCell component!'
-component: 'UserTableRowCell'
-template: 'ComponentReferenceTemplate'
----
diff --git a/src/templates/ComponentReferenceTemplate.js b/src/templates/ComponentReferenceTemplate.js
index 61a59fa77..f1c0257dc 100644
--- a/src/templates/ComponentReferenceTemplate.js
+++ b/src/templates/ComponentReferenceTemplate.js
@@ -40,7 +40,6 @@ const previewStyles = {
 
 const ComponentReferenceTemplate = ({ data }) => {
   const {
-    mdx,
     newRelicSdkComponent: {
       name,
       description: componentDescription,
@@ -52,12 +51,9 @@ const ComponentReferenceTemplate = ({ data }) => {
     },
   } = data;
 
-  const { frontmatter } = mdx;
-  const { description } = frontmatter;
-
   return (
     <>
-      <SEO title={name} description={description} />
+      <SEO title={name} />
       <PageLayout type={PageLayout.TYPE.SINGLE_COLUMN}>
         <PageLayout.Header title={name} />
         <PageLayout.Content>
@@ -130,14 +126,8 @@ ComponentReferenceTemplate.propTypes = {
 };
 
 export const pageQuery = graphql`
-  query($path: String!) {
-    mdx(frontmatter: { path: { eq: $path } }) {
-      body
-      frontmatter {
-        description
-      }
-    }
-    newRelicSdkComponent(fields: { slug: { eq: $path } }) {
+  query($slug: String!) {
+    newRelicSdkComponent(fields: { slug: { eq: $slug } }) {
       name
       description
       usage