diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46de7aa23cdd5a5fce9a6f072e06bbffc0a8be0f..a2bcb6d8e1a655fe08d7b34c8390f8651105ec32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,15 @@
+variables:
+  ECR_IMAGE_TAG: "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/enterprise-integrations/iics_secure_agent:${CI_COMMIT_SHORT_SHA}"
+  DOIT_REGISTRY_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
 stages:
   - build
 
 before_script:
-  - IMAGE_TAG=git-${CI_COMMIT_SHA:0:8}
-  - IMAGE_NAME="enterprise-integrations/iics_secure_agent:${IMAGE_TAG}"
-  - ECR_IMAGE_NAME="${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/enterprise-integrations/iics_secure_agent:${IMAGE_TAG}"
   - apk update && apk add groff less && apk add py-pip
   - pip3 install awscli
   - $(aws ecr get-login --no-include-email --region us-east-1)
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 after_script:
   - docker logout "$AWS_ACCOUNT_ID".dkr.ecr.us-east-1.amazonaws.com
@@ -19,9 +21,10 @@ build-master:
   tags:
     - docker
   script:
-    - docker build --pull --rm -t ${IMAGE_NAME} .
-    - docker tag ${IMAGE_NAME} ${ECR_IMAGE_NAME}
-    - docker push ${ECR_IMAGE_NAME}
+    - docker build --pull --rm -t ${DOIT_REGISTRY_IMAGE_TAG} .
+    - docker tag ${DOIT_REGISTRY_IMAGE_TAG} ${ECR_IMAGE_TAG}
+    - docker push ${DOIT_REGISTRY_IMAGE_TAG}
+    - docker push ${ECR_IMAGE_TAG}
   only:
     refs:
       - master