diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 40f9e11..967a379 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -31,21 +31,19 @@ build:
         script: 
                 - docker build 
                          --tag $IMAGE_NAME:latest 
-                         --tag $IMAGE_NAME:${VERSION} 
-                         --tag $IMAGE_NAME:${VERSION}-${CI_COMMIT_TAG} 
-                         --tag $HUB_IMAGE_NAME:latest 
-                         --tag $HUB_IMAGE_NAME:${VERSION} 
-                         --tag $HUB_IMAGE_NAME:${VERSION}-${CI_COMMIT_TAG} 
                          .
                 - if [ "$CI_COMMIT_TAG" != "" ]; then
+                    docker tag 
+                           $IMAGE_NAME:latest 
+                           $IMAGE_NAME:${CI_COMMIT_TAG} 
+                           $HUB_IMAGE_NAME:latest 
+                           $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:${VERSION}
-                    docker push $IMAGE_NAME:${VERSION}-${CI_COMMIT_TAG}
+                    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:$VERSION
-                    docker push $HUB_IMAGE_NAME:${VERSION}-${CI_COMMIT_TAG}
+                    docker push $HUB_IMAGE_NAME:${CI_COMMIT_TAG}
                   fi