diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6b434a6d4ec8783d81addfab6c4f16d536f80c7..7161569a7e43017869d9bb0025c35388db6c3623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,14 +24,12 @@
 
 variables:
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest
-  # With dind the docker deamon is available on the network
-  DOCKER_HOST: tcp://docker:2375/
   # When using dind, it's wise to use the overlayfs driver for
   # improved performance.
   DOCKER_DRIVER: overlay2
 
 services:
-  - docker:dind
+  - docker:19.03-dind
 
 image: $CI_REGISTRY_IMAGE
 stages:
@@ -66,7 +64,7 @@ trigger_build:
 # Build a docker image in which tests for this repository can run
 build-testenv:
   tags: [ docker ]
-  image: docker:latest
+  image: docker:19.03
   stage: setup
   script:
     - cd src/test/docker