diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4fecf981eb8a3fb299e91615d41ab72d85b6ab9..a6d105091d40a23c6741dd6c3e5b731e19690670 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,14 +52,12 @@ login_provider_test:
       - login_provider/**/*
       - .gitlab-ci.yml
 
-integration-oauth:
+login_logout:
   stage: build-test-images
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context ${CI_PROJECT_DIR}/test/login_logout --dockerfile ${CI_PROJECT_DIR}/test/login_logout/Dockerfile --destination $CI_REGISTRY_IMAGE/login_logout:${CI_COMMIT_REF_NAME}
+  variables:
+    KANIKO_CONTEXT: "test/login_logout"
+    KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+  extends: .kaniko_build
   only:
     changes:
       - ./test/login_logout/**/*