diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 056d28d735c9ca3747d134873afb4b8335255bd5..5c6a88a51e5f7bd4b45535e1ac2df1b1ea17d47f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,10 @@ unit tests:
   extends: .unit tests
   timeout: 10 minutes
   tags:
-    - build-hetzner
+    - tiny-hetzner
 
 integration tests:
-  extends: .unit tests
+  extends: unit tests
   services:
     - redis:latest
   script:
@@ -57,6 +57,7 @@ ui smoketests:
   timeout: 15 minutes
   before_script:
     - !reference [.e2e-codeceptjs-preview, before_script]
+    - unset SUITE_SERVICE_URL
     - export E2E_ADMIN_PW=$ADMIN_PW
     - export LAUNCH_URL=https://$PREVIEW_APP_NAME.dev.oxui.de/
     - echo "LAUNCH_URL=$LAUNCH_URL"
@@ -75,6 +76,7 @@ ui smoketests with prefix:
   timeout: 15 minutes
   before_script:
     - !reference [.e2e-codeceptjs-preview, before_script]
+    - unset SUITE_SERVICE_URL
     - export E2E_ADMIN_PW=$ADMIN_PW
     - export LAUNCH_URL=https://$PREVIEW_APP_NAME-prefix.dev.oxui.de/appsuite/
     - echo "LAUNCH_URL=$LAUNCH_URL"