diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d70fde3a83bd58395e3555d0633a7bc9da9c0b75..8375d9d8f82aefad45efaf9ca8398e501407ea9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build:
     - apk add git
     - yarn
   script:
-    - export DOCUSAURUS_BASE_URL="/fit-connect/" && [[ "$CI_COMMIT_REF_NAME" != "main" ]] && export DOCUSAURUS_BASE_URL="/preview/fit-connect/$CI_COMMIT_REF_SLUG/"
+    - export DOCUSAURUS_BASE_URL="/fit-connect/" && [[ "$CI_COMMIT_REF_NAME" != "main" ]] && export DOCUSAURUS_BASE_URL="/fit-connect/$CI_COMMIT_REF_SLUG/"
     - yarn build
   artifacts:
     expose_as: 'Built Documentation'
@@ -35,14 +35,14 @@ build:
   rules:
     - when: always
 
-upload:review:
+upload:preview:
   stage: upload
   image: alpine:latest
   environment:
-    name: review/$CI_COMMIT_REF_NAME
-    on_stop: stop:review
+    name: preview/$CI_COMMIT_REF_NAME
+    on_stop: stop:preview
     auto_stop_in: 2 week
-    url: https://docs.fitko.de/preview/fit-connect/$CI_COMMIT_REF_SLUG/
+    url: https://preview.docs.fitko.dev/fit-connect/$CI_COMMIT_REF_SLUG/
   needs:
     - build
   rules:
@@ -50,7 +50,8 @@ upload:review:
   before_script:
     - *pre-deploy-uber-space-setup
   script:
-    - rsync -rLvz --delete --checksum -e "ssh -o CheckHostIP=no" --ipv4 --progress ./build/. fitko@dorado.uberspace.de:html/preview/fit-connect/$CI_COMMIT_REF_SLUG
+    - ssh -o CheckHostIP=no fitko@dorado.uberspace.de mkdir -p preview.docs.fitko.dev/fit-connect
+    - rsync -rLvz --delete --checksum -e "ssh -o CheckHostIP=no" --ipv4 --progress ./build/. fitko@dorado.uberspace.de:preview.docs.fitko.dev/fit-connect/$CI_COMMIT_REF_SLUG
 
 upload:production:
   stage: upload
@@ -65,20 +66,21 @@ upload:production:
   before_script:
     - *pre-deploy-uber-space-setup
   script:
-    - rsync -rLvz --delete --checksum -e "ssh -o CheckHostIP=no" --ipv4 --progress ./build/. fitko@dorado.uberspace.de:html/fit-connect
+    - ssh -o CheckHostIP=no fitko@dorado.uberspace.de mkdir -p projects/fit-connect
+    - rsync -rLvz --delete --checksum -e "ssh -o CheckHostIP=no" --ipv4 --progress ./build/. fitko@dorado.uberspace.de:projects/fit-connect
 
-stop:review:
+stop:preview:
   stage: .post
   image: alpine:latest
   environment:
-    name: review/$CI_COMMIT_REF_NAME
+    name: preview/$CI_COMMIT_REF_NAME
     action: stop
   needs:
-    - upload:review
+    - upload:preview
   rules:
     - if: $CI_MERGE_REQUEST_ID
       when: manual
   before_script:
     - *pre-deploy-uber-space-setup
   script:
-    - ssh fitko@dorado.uberspace.de "rm -rf html/preview/fit-connect/$CI_COMMIT_REF_SLUG"
+    - ssh fitko@dorado.uberspace.de "rm -rf preview.docs.fitko.dev/fit-connect/$CI_COMMIT_REF_SLUG"