diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4356ad8f31208a17d1a0994062f83b1e233b483..236903c7b681cf7855a4e972126dec8c75d76001 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,10 +49,8 @@ lint-helm:
     - cd theodolite-benchmarks
   rules:
     - if: $CI_COMMIT_TAG
-      when: on_success
     - changes:
       - theodolite-benchmarks/**/*
-      when: on_success
     - when: manual
       allow_failure: true
 
@@ -138,7 +136,6 @@ spotbugs-benchmarks:
     - docker logout
   rules:
     - if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME && $CI_COMMIT_TAG"
-      when: always
     - changes:
       - theodolite-benchmarks/*
       - theodolite-benchmarks/$JAVA_PROJECT_NAME/**/*
@@ -146,7 +143,6 @@ spotbugs-benchmarks:
       - theodolite-benchmarks/flink-commons/**/*
       - theodolite-benchmarks/load-generator-commons/**/*
       if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
-      when: always
     - if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
       when: manual
       allow_failure: true