diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da92db2ce5d9b9a75e0c8bed77289cf767de3064..fe66ad30ead90cc1838533501bffdbed533e398a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
 ci_test_image:
   variables:
     KANIKO_CONTEXT: "test"
-    KANIKO_IMAGENAME: "openappstack-ci"
+    KANIKO_BUILD_IMAGENAME: "openappstack-ci"
   stage: build
   image:
     # We need a shell to provide the registry credentials, so we need to use the
diff --git a/.gitlab/ci_templates/kaniko.yml b/.gitlab/ci_templates/kaniko.yml
index 605697aa853604dd7bd2222608973f9f7b775433..967b8b3316f47da0832d7f06c6b4d0717cd891e9 100644
--- a/.gitlab/ci_templates/kaniko.yml
+++ b/.gitlab/ci_templates/kaniko.yml
@@ -1,5 +1,5 @@
 # Optional environment variables:
-# - KANIKO_IMAGENAME
+# - KANIKO_BUILD_IMAGENAME: Build/target image image
 # - KANIKO_CONTEXT: The subdir which holds the Dockerfile, leave unset if
 #                   the Dockerfile is located at root level of the project.
 .kaniko_build:
@@ -11,4 +11,4 @@
     entrypoint: [""]
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination $CI_REGISTRY_IMAGE/${KANIKO_IMAGENAME/#//}:${CI_COMMIT_REF_NAME}
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination $CI_REGISTRY_IMAGE/${KANIKO_BUILD_IMAGENAME/#//}:${CI_COMMIT_REF_NAME}