diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35c804c..95bae2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,10 +32,16 @@ stages:
 
 
 build:
-  image: docker:20.10.16
+  image: docker:20.10.16-dind
   stage: build
   services:
-    - docker:20.10.16-dind
+    -  name: docker:20.10.16-dind
+       command: ["--tls=false"]
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker build -t $CI_REGISTRY_IMAGE:latest --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA ./Docker/