diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d0088b29..7f241b33 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,7 +35,6 @@ 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 38e7cbfc..42c861ed 100755
--- a/packages/website/scripts/update-env.sh
+++ b/packages/website/scripts/update-env.sh
@@ -16,12 +16,8 @@ fi
 dist_folder="dist/website"
 version="sha.$(git rev-parse --short HEAD)"
 ai_search_url="${AI_SEARCH_URL:-}"
-base_href="${BASE_HREF:-/}"
 
 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/404.html
-perl -i -pe "s|<base href=\"/\">|<base href=\"$base_href\">|g" $dist_folder/index.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 e996a930..9bcb9dcd 100644
--- a/packages/website/src/public/404.html
+++ b/packages/website/src/public/404.html
@@ -4,7 +4,7 @@
   <!-- Workaround for GitHub Pages not supporting SPA routing -->
   <script>
     sessionStorage.redirect = location.href;
-    const url = window.location.hostname.includes('.github.io') ? '__BASE_HREF__' : '/';
+    const url = window.location.hostname.includes('.github.io') ? '/moaw/' : '/';
     window.location.replace(url);
   </script>
 </head>
diff --git a/packages/website/src/public/index.html b/packages/website/src/public/index.html
index 537c4978..28da1960 100644
--- a/packages/website/src/public/index.html
+++ b/packages/website/src/public/index.html
@@ -5,6 +5,11 @@
   <title>MOAW</title>
   <base href="/">
   <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/';
+    }
+  </script>
   <link rel="icon" type="image/png" href="favicon.png">
   <script type="text/javascript">
     (function(c,l,a,r,i,t,y){