diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f97f3e..50a16e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,7 +155,7 @@ Github (Push --mirror):
 
       echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
 
-      if [ "$CI_COMMIT_BRANCH" != "master" ]; then
+      if [ "$CI_COMMIT_BRANCH" == "master" ]; then
 
         DOCKER_HUB_TAG=latest
 
@@ -177,7 +177,11 @@ Github (Push --mirror):
       
       docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_TAG;
 
-      docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG;
+      if [ "${CI_COMMIT_TAG}" ]; then
+
+        docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG;
+
+      fi;
 
   after_script:
     - docker logout docker.io