diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7f241b33..d0088b29 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,6 +35,7 @@ jobs:
       run: npm run build:website
       env:
         SEARCH_URL: ${{ secrets.SEARCH_URL }}
+        BASE_HREF: /moaw/
     - name: Setup GitHub Pages
       uses: actions/configure-pages@v4
     - name: Upload artifact
diff --git a/packages/website/scripts/update-env.sh b/packages/website/scripts/update-env.sh
index 42c861ed..37c2ace2 100755
--- a/packages/website/scripts/update-env.sh
+++ b/packages/website/scripts/update-env.sh
@@ -16,8 +16,11 @@ fi
 dist_folder="dist/website"
 version="sha.$(git rev-parse --short HEAD)"
 ai_search_url="${AI_SEARCH_URL:-}"
+base_href="${BASE_HREF:-/moaw/}"
 
 perl -i -pe "s/__VERSION__/$version/g" $dist_folder/main.*.js
 perl -i -pe "s/__AI_SEARCH_URL__/$ai_search_url/g" $dist_folder/main.*.js
+perl -i -pe "s|__BASE_HREF__|$base_href|g" $dist_folder/index.html $dist_folder/404.html
 
 echo Version: $version
+echo Base href: $base_href
diff --git a/packages/website/src/public/404.html b/packages/website/src/public/404.html
index 9bcb9dcd..723bd86f 100644
--- a/packages/website/src/public/404.html
+++ b/packages/website/src/public/404.html
@@ -4,7 +4,9 @@
   <!-- Workaround for GitHub Pages not supporting SPA routing -->
   <script>
     sessionStorage.redirect = location.href;
-    const url = window.location.hostname.includes('.github.io') ? '/moaw/' : '/';
+    const hostname = window.location.hostname;
+    const isGitHubPagesHost = hostname === 'github.io' || hostname.endsWith('.github.io');
+    const url = isGitHubPagesHost ? '__BASE_HREF__' : '/';
     window.location.replace(url);
   </script>
 </head>
diff --git a/packages/website/src/public/index.html b/packages/website/src/public/index.html
index 28da1960..572bfc07 100644
--- a/packages/website/src/public/index.html
+++ b/packages/website/src/public/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <script>
     if (window.location.hostname.includes('.github.io')) {
-      window.document.head.getElementsByTagName('base')[0].href = '/moaw/';
+      window.document.head.getElementsByTagName('base')[0].href = '__BASE_HREF__';
     }
   </script>
   <link rel="icon" type="image/png" href="favicon.png">