diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe66ad30ead90cc1838533501bffdbed533e398a..0d870fb72bbcaf7e2a8fe170d81b89f1550aa5d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
   - health-test
   - integration-test
   - cleanup
-image: "${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME}"
 variables:
   SSH_KEY_ID: "411"
   HOSTNAME: "ci-${CI_PIPELINE_ID}"
@@ -16,11 +15,12 @@ variables:
   DOMAIN: "openappstack.net"
   ADDRESS: "ci-${CI_PIPELINE_ID}.ci.openappstack.net"
   ANSIBLE_HOST_KEY_CHECKING: "False"
+  KANIKO_BUILD_IMAGENAME: "openappstack-ci"
+
+default:
+  image: "${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_COMMIT_REF_NAME}"
 
 ci_test_image:
-  variables:
-    KANIKO_CONTEXT: "test"
-    KANIKO_BUILD_IMAGENAME: "openappstack-ci"
   stage: build
   image:
     # We need a shell to provide the registry credentials, so we need to use the