diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1b1597b..3c6094f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -582,9 +582,11 @@ docker:
     - docker tag $TEST_IMAGE ${RELEASE_IMAGE}-stretch
     - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
     # This avoids filling up gitlab.com free tier accounts with unused docker images.
-    - echo "Skipping docker push to save quota on your gitlab namespace."
-    - echo "If you want to enable the push, set FDROID_PUSH_DOCKER_IMAGE in"
-    - echo "https://gitlab.com/$CI_PROJECT_NAMESPACE/fdroidserver/-/settings/ci_cd#js-cicd-variables-settings"
-    - test -n "$FDROID_PUSH_DOCKER_IMAGE" || exit 0
+    - if test -n "$FDROID_PUSH_DOCKER_IMAGE"; then
+          echo "Skipping docker push to save quota on your gitlab namespace.";
+          echo "If you want to enable the push, set FDROID_PUSH_DOCKER_IMAGE in";
+          echo "https://gitlab.com/$CI_PROJECT_NAMESPACE/fdroidserver/-/settings/ci_cd#js-cicd-variables-settings";
+          exit 0;
+      fi
     - docker push $RELEASE_IMAGE
     - docker push $RELEASE_IMAGE-stretch