diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index d0813f90..f40b94ba 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -23,6 +23,9 @@ jobs:
           chmod +x build_docs.sh
           ./build_docs.sh
 
+      - name: Copy CNAME to HTML Build Directory
+        run: cp docs/CNAME docs/build/html/CNAME
+
       # Deploy the docs to GitHub Pages
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
diff --git a/docs/CNAME b/docs/CNAME
index 3e749b60..5f3be0b8 100644
--- a/docs/CNAME
+++ b/docs/CNAME
@@ -1 +1 @@
-archgw.com
+docs.archgw.com
diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index 131343f2..7754ef0d 100644
--- a/docs/build_docs.sh
+++ b/docs/build_docs.sh
@@ -1,2 +1,4 @@
 docker build -f Dockerfile . -t sphinx
-docker run --rm -v $(pwd):/docs sphinx make html
+docker run --user $(id -u):$(id -g) --rm -v $(pwd):/docs sphinx make clean
+docker run --user $(id -u):$(id -g) --rm -v $(pwd):/docs sphinx make html
+chmod -R 777 build/html