diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dc8bbf24c4fc5af0fe6d31792d043139ec15aec..f887bd8f41c5db9928457325d9e1b048da5ce2d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,43 +3,42 @@ include:
 
 stages:
   - build
-  - build-test-images
+  # - build-test-images
   # TODO: Re-enable after fixing #82
   # - lint
-  - application-test
-  - integration-test
+  #- application-test
+  #- integration-test
 
-login_test:
-  image: python:3.9
-  stage: unittest
-  needs: []
-  variables:
-    HYDRA_ADMIN_URL: http://localhost/ignored
-    KRATOS_PUBLIC_URL: http://localhost/ignored
-    PUBLIC_URL: http://localhost/ignored
-  cache:
-    paths:
-      - "$CI_PROJECT_DIR/pip-cache"
-    key: "$CI_PROJECT_ID"
-    before_script:
-      - cd login
-      - python -V
-      - pip install -r requirements.txt
-    script:
-      - pytest -v --cov=login --cov-report=term --cov-report=xml tests
-    artifacts:
-      reports:
-        cobertura: login/coverage.xml
-    coverage: '/^TOTAL.+?(\d+\%)$/'
+#login_test:
+#  image: python:3.8
+#  stage: unittest
+#  needs: []
+#  variables:
+#    HYDRA_ADMIN_URL: http://localhost/ignored
+#    KRATOS_PUBLIC_URL: http://localhost/ignored
+#    PUBLIC_URL: http://localhost/ignored
+#  cache:
+#    paths:
+#      - "$CI_PROJECT_DIR/pip-cache"
+#    key: "$CI_PROJECT_ID"
+#    before_script:
+#      - cd login
+#      - python -V
+#      - pip install -r requirements.txt
+#    script:
+#      - pytest -v --cov=login --cov-report=term --cov-report=xml tests
+#    artifacts:
+#      reports:
+#        cobertura: login/coverage.xml
+#    coverage: '/^TOTAL.+?(\d+\%)$/'
 
 login:
   stage: build
-  needs:
-    - "login_test"
+  needs: []
+  extends: .kaniko_build
   variables:
-    KANIKO_CONTEXT: "login"
+    KANIKO_CONTEXT: login/$CI_JOB_NAME
     KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
-  extends: .kaniko_build
   only:
     changes:
       - login/**/*