diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee98582a3bc5b2fc93629574c26df40f074560e9..d52086251411743774a98b7daeb5235bb770d7e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,6 +83,8 @@ default:
 # on default upstream and production upstream branches.
 ##
 .docker-build:
+  before_script:
+    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
   extends:
     - .dind
   needs: []
@@ -109,8 +111,6 @@ default:
     - docker tag "${env_image_name}" "${latest_image_name}"
     - docker push "${latest_image_name}"
   stage: build
-  tags:
-    - development
   variables:
     DOCKERFILE: Dockerfile
     DOCKER_BUILD_ARGS: |