diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index ca0c805..4d520c4 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -29,16 +29,14 @@ build:
                 - linux
                 - docker
         script: 
-                - docker build --tag $IMAGE_NAME:latest .
+                - docker build --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} .
                 - if [ "$CI_COMMIT_TAG" != "" ]; then
-                    docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
-                    docker tag $IMAGE_NAME:latest $HUB_IMAGE_NAME:latest;
-                    docker tag $IMAGE_NAME:latest $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+                    docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG};
+                    docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
                     docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
-                    docker push $IMAGE_NAME:latest;
                     docker push $IMAGE_NAME:${CI_COMMIT_TAG};
+
                     docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD;
-                    docker push $HUB_IMAGE_NAME:latest;
                     docker push $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
                   fi