diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1802b5bb9fe8cd2f2a21643ee44a380ed8621c37..bb05c265f11d0fcb3a72cee54af5314a5ca4c284 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,6 @@ variables:
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest
   # When using dind, it's wise to use the overlayfs driver for
   # improved performance.
-  DOCKER_DRIVER: overlay2
-
-services:
-  - docker:19.03-dind
 
 image: $CI_REGISTRY_IMAGE
 stages:
@@ -55,7 +51,7 @@ trigger_build:
   stage: deploy
   script:
     - /usr/bin/curl -X POST
-      -F token=8f29e5eeb7db2123d9c2bb84634da2
+      -F token=$DEPLOY_TRIGGER_TOKEN
       -F "variables[SERVER]=$CI_COMMIT_REF_NAME"
       -F "variables[TriggerdBy]=SERVER"
       -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
@@ -63,12 +59,14 @@ trigger_build:
 
 # Build a docker image in which tests for this repository can run
 build-testenv:
-  tags: [ docker ]
+  tags: [ cached-dind ]
   image: docker:19.03
   stage: setup
+  only:
+    - schedules
   script:
     - cd src/test/docker
-    - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       # use here general latest or specific branch latest...
     - docker pull $CI_REGISTRY_IMAGE || true
     - docker build