diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7562da24ed0ecd2cdaa44bc530795c73c36f04fe..c437fadde6eabbded4393aa270e11f10b652e833 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,14 +9,18 @@ docker:
     name: gcr.io/kaniko-project/executor:v1.7.0-debug
     entrypoint: [""]
   script:
+    - |
+        CONTAINER_TAG="${CI_COMMIT_REF_SLUG}"
+        if [ "${CONTAINER_TAG}" = "${CI_DEFAULT_BRANCH}" ]; then
+          CONTAINER_TAG="latest"
+        fi
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - |
         /kaniko/executor \
-          --context ${CI_PROJECT_DIR} \
-          --dockerfile ${CI_PROJECT_DIR}/Dockerfile \
-          --destination ${CI_REGISTRY_IMAGE}:latest
+          --context "${CI_PROJECT_DIR}" \
+          --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
+          --destination "${CI_REGISTRY_IMAGE}:${CONTAINER_TAG}"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-  interruptible: true
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_PIPELINE_SOURCE == "web"'