diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bed4092b..0cb8dfef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,14 @@
 image: docker:latest
 services:
-  - docker:dind
+  - name: docker:dind
+    entrypoint: ["env", "-u", "DOCKER_HOST"]
+    command: ["dockerd-entrypoint.sh"]
+
+variables:
+  DOCKER_HOST: tcp://docker:2375/
+  DOCKER_DRIVER: overlay2
+  # See https://github.com/docker-library/docker/pull/166
+  DOCKER_TLS_CERTDIR: ""
 
 stages:
   - linting
@@ -20,11 +28,6 @@ build_and_push_container:
     - apk add --no-cache python3    
     - pip3 install -r app/requirements.txt
   stage: deploy
-  variables:
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-    # See https://github.com/docker-library/docker/pull/166
-    DOCKER_TLS_CERTDIR: ""
   script:
     - docker login -u ldooks -p $DOCKER_PASSWORD
     - docker build -t ldooks/dragon-bot:latest .