diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fccefd2551dca726861cbadc35db66889fe1ded6..f559b0243a85e27052b0c1dadba9d1a5fbf033f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 #
-# ** header v3.0
 # This file is a part of the CaosDB Project.
 #
 # Copyright (C) 2018 Research Group Biomedical Physics,
@@ -18,20 +17,15 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# ** end header
-#
 
 variables:
    CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv
-  # 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
 
 stages: 
   - setup
@@ -60,7 +54,7 @@ test:
 
 build-testenv:
   tags: [docker]
-  image: docker:latest
+  image: docker:19.03
   stage: setup
   script: 
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY