diff --git a/sites/lab/components/dynamic-org-docs.mjs b/sites/lab/components/dynamic-org-docs.mjs
new file mode 100644
index 00000000000..87ef2547e9e
--- /dev/null
+++ b/sites/lab/components/dynamic-org-docs.mjs
@@ -0,0 +1,2 @@
+// This is how we skip the docs in the lab
+export const DynamicOrgDocs = false
diff --git a/sites/org/components/dynamic-org-docs.mjs b/sites/org/components/dynamic-org-docs.mjs
new file mode 100644
index 00000000000..84be714eeee
--- /dev/null
+++ b/sites/org/components/dynamic-org-docs.mjs
@@ -0,0 +1,3 @@
+import { DynamicOrgDocs as Component } from 'shared/components/dynamic-docs/org.mjs'
+
+export const DynamicOrgDocs = Component
diff --git a/sites/org/public/favicon.ico b/sites/org/public/favicon.ico
deleted file mode 100644
index 718d6fea483..00000000000
Binary files a/sites/org/public/favicon.ico and /dev/null differ
diff --git a/sites/shared/page-templates/new-pattern-from-cset.mjs.mustache b/sites/shared/page-templates/new-pattern-from-cset.mjs.mustache
index ea87bf69b7f..15000cca432 100644
--- a/sites/shared/page-templates/new-pattern-from-cset.mjs.mustache
+++ b/sites/shared/page-templates/new-pattern-from-cset.mjs.mustache
@@ -9,7 +9,7 @@ import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { Workbench, ns as wbNs } from 'shared/components/workbench/index.mjs'
 import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs'
 import { Null } from 'shared/components/null.mjs'
-{{{ docs }}}
+import { DynamicOrgDocs as DynamicDocs } from 'site/components/dynamic-org-docs.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set(['{{ design }}', ...wbNs, ...pageNs])]
diff --git a/sites/shared/page-templates/new-pattern-from-set.mjs.mustache b/sites/shared/page-templates/new-pattern-from-set.mjs.mustache
index c3923578b44..3862f65752f 100644
--- a/sites/shared/page-templates/new-pattern-from-set.mjs.mustache
+++ b/sites/shared/page-templates/new-pattern-from-set.mjs.mustache
@@ -10,7 +10,7 @@ import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { Workbench, ns as wbNs } from 'shared/components/workbench/index.mjs'
 import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs'
 import { Null } from 'shared/components/null.mjs'
-{{{ docs }}}
+import { DynamicOrgDocs as DynamicDocs } from 'site/components/dynamic-org-docs.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set(['{{ design }}', ...wbNs, ...pageNs])]
diff --git a/sites/shared/prebuild/org.mjs b/sites/shared/prebuild/org.mjs
index f45bd0bc82c..225bb04d15c 100644
--- a/sites/shared/prebuild/org.mjs
+++ b/sites/shared/prebuild/org.mjs
@@ -44,9 +44,6 @@ export const prebuildOrg = async (site = 'org') => {
     },
   }
 
-  // Only add docs to org pages
-  const docs = site === 'org' ? withDocs : withoutDocs
-
   for (const design in designs) {
     // Generate new/pattern/design pages
     for (const page in pages) {
@@ -54,7 +51,7 @@ export const prebuildOrg = async (site = 'org') => {
       promises.push(
         fs.writeFile(
           pages[page].file(design),
-          mustache.render(pages[page].page, { docs, design, Design: capitalize(design) })
+          mustache.render(pages[page].page, { design, Design: capitalize(design) })
         )
       )
     }