diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c828522304656fd23e05d59e546ae7c74b642b7c..bfc88460629d3ddb1796ece28537af5dbe34c598 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,15 +101,20 @@ spotbugs:
     - changes:
       - ./$JAVA_PROJECT_NAME/**/*
       - ./application-kafkastreams-commons/**/*
+      if:
+      - $DOCKERHUB_ORG
+      - $DOCKERHUB_ID
+      - $DOCKERHUB_PW
+      - $IMAGE_NAME
+      - $JAVA_PROJECT_NAME
       when: always
-    - when: manual
-  only:
-    variables:
+    - if:
       - $DOCKERHUB_ORG
       - $DOCKERHUB_ID
       - $DOCKERHUB_PW
       - $IMAGE_NAME
       - $JAVA_PROJECT_NAME
+      when: manual
 
 deploy-uc1-kstreams-app:
   extends: .deploy