diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 8377478..ca0c805 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -29,17 +29,12 @@ build:
                 - linux
                 - docker
         script: 
-                - if [ "$CI_COMMIT_TAG" = "" ]; then
-                    docker build .;
-                  else
-                    docker build
-                           --tag $IMAGE_NAME:latest 
-                           --tag $IMAGE_NAME:${CI_COMMIT_TAG} 
-                           --tag $HUB_IMAGE_NAME:latest 
-                           --tag $HUB_IMAGE_NAME:${CI_COMMIT_TAG}
-                           .;
-                    docker login -u gitlab-ci-token -p $CI_JOB_TOKEN 
-                           $CI_REGISTRY;
+                - docker build --tag $IMAGE_NAME:latest .
+                - 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 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;