diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 963e632845..bd83ffd0bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,9 +88,9 @@ pages:
   stage: deploy
   script:
     - yarn build
-    - mv static public
   variables:
     NODE_ENV: production
+    FE_BUILD_DIR: public
   artifacts:
     paths:
     - public
diff --git a/app/soapbox/build_config.js b/app/soapbox/build_config.js
index 53d05170f3..5748bd371d 100644
Binary files a/app/soapbox/build_config.js and b/app/soapbox/build_config.js differ
diff --git a/webpack/configuration.js b/webpack/configuration.js
index eb0442989e..439a57ce1f 100644
Binary files a/webpack/configuration.js and b/webpack/configuration.js differ