diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 1e473d5..32dfa48 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -34,10 +34,12 @@ build:
                 - docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
                 - if [ "$CI_COMMIT_TAG" != "" ]; then
                     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 push $IMAGE_NAME:${CI_COMMIT_TAG};
 
-                    docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD;
-                    docker push $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+                    if [ "$NO_HUB_PUSH" != "true" ]; then
+                      docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD;
+                      docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+                      docker push $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+                    fi;
                   fi