diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eac1306f55463f940947608d7265920dc8c4fa28..131ea730cb30db2e2669d58e8c92f399ae07f671 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,10 @@ spotbugs:
     - changes:
       - ./$JAVA_PROJECT_NAME/**/*
       - ./application-kafkastreams-commons/**/*
+      if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
       when: always
+    - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: manual
 
 deploy-uc1-kstreams-app:
   extends: .deploy