diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52c05917a7b2e4c8e6b451e04d9066eb3360cf0f..5ab74776a605295350c02febb92b8d87eadde5ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,11 +15,11 @@ docker-build:
   image: docker:cli
   stage: build
   services:
-    - docker:dind
+    - name: docker:dind
+      alias: docker
   variables:
     DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   before_script:
-    - unset DOCKER_HOST
     - 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)
   # Default branch is also tagged with `latest`