diff --git a/gitlab/ContainerBuildKaniko.yml b/gitlab/ContainerBuildKaniko.yml
index ed2678c..576416a 100644
--- a/gitlab/ContainerBuildKaniko.yml
+++ b/gitlab/ContainerBuildKaniko.yml
@@ -6,29 +6,34 @@
     entrypoint: [ "" ]
   
   variables:
-    TAG_COMMIT_ENABLE: true
+    TAG_COMMIT_ENABLE: "true"
     TAG_COMMIT_PREFIX: "commit-"
-    TAG_REF_SLUG_ENABLE: true
+    TAG_REF_SLUG_ENABLE: "true"
     DOCKERFILE: "$CI_PROJECT_DIR/Dockerfile"
     CONTEXT_DIR: "$CI_PROJECT_DIR"
     ADDITIONAL_REGISTRY_DESTINATIONS: ""
+    ADD_GITLAB_REGISTRY_AUTH: "true"
 
   before_script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json
+    # add gitlab registry auth
+    - |
+      if [[ "$ADD_GITLAB_REGISTRY_AUTH" == "true" ]]; then
+        mkdir -p /kaniko/.docker
+        echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json
+      fi
 
   script:
     - IMAGE_DESTS=""
 
     # default tag based on commit
     - |
-      if [[ $IMAGE_COMMIT_ENABLE ]]; then
+      if [[ "$IMAGE_COMMIT_ENABLE" == "true" ]]; then
         IMAGE_DESTS="--destination $CI_REGISTRY_IMAGE:$IMAGE_COMMIT_PREFIX-$CI_COMMIT_SHA"
       fi
 
     # add tag for reference if available
     - |
-      if [[ $IMAGE_REF_SLUG_ENABLE ]] && [[ ! -z $CI_COMMIT_REF_NAME ]]; then
+      if [[ "$IMAGE_REF_SLUG_ENABLE" == "true" ]] && [[ ! -z $CI_COMMIT_REF_NAME ]]; then
         IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
       fi