diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93a6a9432e652cd53d780e3930b22205dfb207ad..7bf945c24b2810da8795d439d75df05c678d4e3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,9 @@ build:
     - CERT=`aws ecr get-login --no-include-email --region ${AWS_REGION}`
     - ${CERT}
     # Build
-    - docker build -t ${CI_PROJECT_NAME} .
-    - docker tag $CI_PROJECT_NAME:latest $REPO/$IMAGE_TAG
-    - docker tag $CI_PROJECT_NAME:latest $REPO/${CI_PROJECT_NAME}:latest
-    - docker push $REPO/$IMAGE_TAG
-    - docker push $REPO/${CI_PROJECT_NAME}:latest
+    - docker build -t ${CI_PROJECT_NAME}:$CI_COMMIT_SHA .
+    - docker tag $CI_PROJECT_NAME:$CI_COMMIT_SHA $REPO:latest
+    - docker push $REPO:latest
   environment:
     name: staging