diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7b0ad6ebf2b4be12b2c1a3c236d0d4e9297b573..7a8ab4276f5738e856a045acd476fd75ae4c18d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,13 @@ build:
   image: docker
   stage: build
   variables:
-    DOCKER_HOST: tcp://docker:2375
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
   services:
-    - docker:18.09.7-dind
+    - name: docker:dind
+      entrypoint: ["env", "-u", "DOCKER_HOST"]
+      command: ["dockerd-entrypoint.sh"]
   script:
     - docker build -t secfit-group15 .
     - docker run secfit-group15 /script/to/run/tests