diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b5fa417a94a21ea1c87d3e78a8f5ac53b47e8d2..8cf5d95ddbfeaba3034eb21e90a258d72d0a4b54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
 stages:
-  - get_chart
-  - deploy_rabbit
-  - deploy_grb
-  - deploy_g2g
-  - deploy_wms
-  - deploy_wmts
+  - get chart
+  - deploy rabbit
+  - deploy GRB
+  - deploy G2G
+  - deploy WMS
+  - deploy WMTS
 
 variables:
   DOCKER_TLS_CERTDIR: ""
@@ -39,7 +39,7 @@ build ci:
 
 
 .get_chart_tmpl:
-  stage: get_chart
+  stage: get chart
   image: $CICHART_IMAGE
   services:
     - docker:19.03.1-dind
@@ -92,7 +92,7 @@ get_chart_grb:
 # TODO: Use "environment: " to define a job for production and one for development
 #       https://docs.gitlab.com/ee/ci/yaml/#environment
 deploy_grb:
-  stage: deploy_grb
+  stage: deploy GRB
   image: $CICHART_IMAGE
   services:
     - docker:19.03.1-dind
diff --git a/helpers/build_image.yml b/helpers/build_image.yml
index 5bd92d2aab42730a9ee863b2dff7cce5a3f0f76e..3485f1e95b3bf62a88a99782a37489aabe5d4788 100644
--- a/helpers/build_image.yml
+++ b/helpers/build_image.yml
@@ -15,9 +15,11 @@
   variables:
     IMAGE_NAME: ""
     IMAGE_DIR: ""
-  stage: build_image
+  stage: build image
   tags:
     - docker
+  before_script:
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
     - image_url="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}"
     - if [ -z "$CI_COMMIT_TAG" ]; then