diff --git a/.github/workflows/cd-www-stage.yml b/.github/workflows/cd-www-stage.yml
index 948debc795e..2cfb25a968b 100644
--- a/.github/workflows/cd-www-stage.yml
+++ b/.github/workflows/cd-www-stage.yml
@@ -12,7 +12,7 @@ jobs:
       AZURE_WEBAPP_ACTIVE_STAGE_NAME: www-west-app
       AZURE_WEBAPP_PASSIVE_STAGE_NAME: www-east-app
       AZURE_WEBAPP_BUILD_PATH: sites/website
-      AZURE_WEBAPP_DIST_PATH: sites/website/static
+      AZURE_WEBAPP_DIST_PATH: sites/website/build
       AZURE_WEBAPP_SLOT_NAME: stage
 
     steps:
@@ -30,8 +30,8 @@ jobs:
         cd ${{ env.AZURE_WEBAPP_BUILD_PATH }}
         npm i
         yarn build
-        cp ../site-utilities/statics/server/package.json ../site-utilities/statics/server/server.js static 
-        cd static
+        cp ../site-utilities/statics/server/package.json ../site-utilities/statics/server/server.js build 
+        cd build
         npm i
         ls -lta
 
diff --git a/.gitignore b/.gitignore
index 07e84fff9e9..d664984b3a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,20 +47,10 @@ storybook-static
 # npm package-locks
 package-lock.json
 
-# Docusaurus dependencies
-lib/core/metadata.js
-lib/core/MetadataBlog.js
-
-# Docusaurus files to be ignored (legacy structure)
-website/translated_docs
-website/build/
-website/yarn.lock
-website/node_modules
-website/i18n/
-
 # Docusaurus files to ignore
-sites/website/translated_docs
 sites/website/build/
+sites/website/docs/
+sites/website/src/docs/api/
 sites/website/yarn.lock
 sites/website/node_modules
 sites/website/i18n/
diff --git a/sites/website/.gitignore b/sites/website/.gitignore
index dec8c187401..5aecc8d84d2 100644
--- a/sites/website/.gitignore
+++ b/sites/website/.gitignore
@@ -1,22 +1,11 @@
 # Dependencies
-/node_modules
-
-# Production
-/build
-/docs
-/src/docs/api
+node_modules
 
 # Generated files
 .docusaurus
 .cache-loader
 
-# Misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+# Log files
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/sites/website/docusaurus.config.js b/sites/website/docusaurus.config.js
index a6be7d54a1b..fccd061b111 100644
--- a/sites/website/docusaurus.config.js
+++ b/sites/website/docusaurus.config.js
@@ -1,6 +1,6 @@
 module.exports = {
-    title: "FAST-DNA",
-    tagline: "The tagline of my site",
+    title: "FAST",
+    tagline: "The adaptive interface system for modern web experiences",
     url: "https://www.fast.design",
     baseUrl: "/",
     favicon: "img/favicon/favicon.ico",
@@ -8,7 +8,7 @@ module.exports = {
     projectName: "fast-dna",
     scripts: [
         {
-            src: "https://static.fast.design/assets/scripts/packages/fast-components.js",
+            src: "https://unpkg.com/@microsoft/fast-components",
             type: "module",
             async: true,
         },
diff --git a/sites/website/package.json b/sites/website/package.json
index 04deb555320..0fa889d40d0 100644
--- a/sites/website/package.json
+++ b/sites/website/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "fast-dna-site",
-  "version": "0.0.0",
+  "name": "fast-site",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "clean": "node ../../build/clean.js docs",
diff --git a/sites/website/static/CNAME b/sites/website/static/CNAME
deleted file mode 100644
index aedaefeaeac..00000000000
--- a/sites/website/static/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-www.fast.design
\ No newline at end of file
diff --git a/sites/website/static/img/oss_logo.png b/sites/website/static/img/oss_logo.png
deleted file mode 100644
index 8183e289b13..00000000000
Binary files a/sites/website/static/img/oss_logo.png and /dev/null differ