diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5be0e1b..49e4de6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,13 +15,18 @@ build:
     BASE_TAG: latest
     FLAVOR: stable
   script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_MERGE_REQUEST_IID:+mr${CI_MERGE_REQUEST_IID}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}"
-    - >-
-        /kaniko/executor
-            --context $CI_PROJECT_DIR
-            --dockerfile $CI_PROJECT_DIR/Containerfile
-            --destination "$CI_REGISTRY_IMAGE:${IAMGE_TAG}"
-            --build-arg "BASE_TAG=$BASE_TAG"
+    - 'mkdir -p /kaniko/.docker'
+    - 'echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json'
+    - |
+        IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}";
+        if [[ -n "$CI_OPEN_MERGE_REQUESTS" ]]; then
+            IMAGE_TAG="mr${CI_MERGE_REQUEST_ID}";
+        fi
+        echo "Building/Pushing to: ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}";
+    - |
+        /kaniko/executor \
+            --context $CI_PROJECT_DIR \
+            --dockerfile $CI_PROJECT_DIR/Containerfile \
+            --destination "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" \
+            --build-arg "BASE_TAG=$BASE_TAG" \
             --build-arg "FLAVOR=$FLAVOR"