diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92204200ce36f43d7b6a43c9b3070092d8a62934..22dbd94e3d8b3b69911fb8837fad262d7cdf5aff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,11 +102,7 @@ spotbugs:
       - ./$JAVA_PROJECT_NAME/**/*
       - ./application-kafkastreams-commons/**/*
       if:
-      - "$DOCKERHUB_ORG"
-      - "$DOCKERHUB_ID"
-      - "$DOCKERHUB_PW"
-      - "$IMAGE_NAME"
-      - "$JAVA_PROJECT_NAME"
+      - '$DOCKERHUB_ORG != ""'
       when: always
     - when: manual