diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 388093b4341ecfc5cf09411bd62f31a9b80c7418..7c3af0df4d4bf4a97ac73372d3144505c170992e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,7 +116,7 @@ clair:
       - "pica-*/Dockerfile"
       - "pica-*/docker-compose.yml"
       - "pica-*/clair-whitelist.yml"
-      when: always
+      when: on_success
     - changes:
       - "pica-*/*"
       when: manual
@@ -149,7 +149,7 @@ docker-bench-security:
     - changes:
       - "pica-*/Dockerfile"
       - "pica-*/docker-compose.yml"
-      when: always
+      when: on_success
     - changes:
       - "pica-*/*"
       when: manual