diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 76dfd2e..a89b314 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,8 +30,6 @@ jobs:
         run: pnpm install
 
       - name: Build Vue.js app
-        env:
-          PUBLIC_URL: /DatZ1000/ # This should match the `base` property in vite.config.mjs
         run: pnpm build
 
       - name: Upload artifact
diff --git a/vite.config.mjs b/vite.config.mjs
index 5fa6b3f..7e395b1 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -103,7 +103,7 @@ const getEnvVariables = (mode, serving) => {
     envVariables.VUE_APP_SERVICE_URL = envVariables.VUE_APP_SERVICE_URL || '{{SERVICE_URL}}';
     envVariables.VUE_APP_AUTH_URL = envVariables.VUE_APP_AUTH_URL || '{{AUTH_URL}}';
     envVariables.BASE_PATH = envVariables.BASE_PATH || './';
-    envVariables.BASE_URL = envVariables.BASE_URL || './';
+    envVariables.BASE_URL = envVariables.BASE_URL || '{{PUBLIC_URL}}';
     envVariables.VUE_APP_CLIENT_ID = envVariables.VUE_APP_CLIENT_ID || CONFIG.defaultClient;
   }
   return envVariables;