diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8535fa4..d4c4036 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,19 @@
 image: docker:latest
 
 services:
-  - docker:dind
+  - name: docker:dind
+    entrypoint: ["env", "-u", "DOCKER_HOST"]
+    command: ["dockerd-entrypoint.sh"]
+
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
 
 stages:
   - Build Base
   - Build Variants
   - Push Images
 
-variables:
-  DOCKER_DRIVER: overlay2
-  DOCKER_TLS_CERTDIR: ""
-
 build-base:
   stage: Build Base
   artifacts: