diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 491fdacef22c250940ac35cf6e9d69d53b96574a..f5412d0243cdcd2fe38920973fc8fb8075b8c3f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,10 +22,6 @@ variables:
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv
   # When using dind, it's wise to use the overlayfs driver for
   # improved performance.
-  DOCKER_DRIVER: overlay2
-
-services:
-  - docker:19.03.0-dind
 
 image: $CI_REGISTRY_IMAGE:latest
 
@@ -58,9 +54,8 @@ trigger_build:
   tags: [ docker ]
   stage: deploy
   script:
-    - echo $TOKEN     
     - /usr/bin/curl -X POST
-      -F token=$TOKEN
+      -F token=$DEPLOY_TRIGGER_TOKEN
       -F "variables[PYLIB]=$CI_COMMIT_REF_NAME"
       -F "variables[TriggerdBy]=PYLIB"
       -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
@@ -68,14 +63,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 unittests/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:latest || true
     - docker build