diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35df96e2d344c3d47e2f4deb44dfb810f0bb74c9..68ac4e27478b3c5a75861c68d69c89c99efa1910 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,15 @@
 docker-build:
   # Use the official docker image.
-  image: docker:cli
+  image: docker:stable
   stage: build
   services:
-    - docker:dind
+    - name: 'docker:dind'
+      alias: mydocker
+      command: ['--tls=false']
   variables:
     DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    DOCKER_HOST: tcp://mydocker:2375/
+    DOCKER_TLS_CERTDIR: ""
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   # All branches are tagged with $DOCKER_IMAGE_NAME (defaults to commit ref slug)