diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0637a1a9d9cdb88501c25dc0636f623472cd968c..fd7fc93df75e2b86a2d1dc0a29065ffb8f48edc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,8 +31,8 @@ build-aws:
     - pip install awscli
   script:
     - $(aws ecr get-login --no-include-email --region us-east-1)
-    - docker build -t $REPOSITORY_URL .
-    - docker tag faraday-qa:latest $REPOSITORY_URL:latest
+    - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
+    - docker tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA $REPOSITORY_URL:latest
     - docker push $REPOSITORY_URL:latest
 
 lint: