diff --git a/templates/gitlab-ci-gcloud.yml b/templates/gitlab-ci-gcloud.yml
index b95e48b4fb4e34905e9c4a4e4379fcab5e93d82c..674aecf5bd2437b9597da0d563bdcec538319de7 100644
--- a/templates/gitlab-ci-gcloud.yml
+++ b/templates/gitlab-ci-gcloud.yml
@@ -500,9 +500,9 @@ gcp-production:
     - if: '$GCP_PROD_PROJECT == null || $GCP_PROD_PROJECT == ""'
       when: never
     # if $AUTODEPLOY_TO_PROD: auto
-    - if: $AUTODEPLOY_TO_PROD
+    - if: '$AUTODEPLOY_TO_PROD == "true"'
     # else if PUBLISH_ON_PROD enabled: auto (because the publish job was blocking)
-    - if: '$PUBLISH_ON_PROD == "true" || $PUBLISH_ON_PROD == "yes"'
+    - if: '$PUBLISH_ON_PROD == "true"'
     # else: manual, blocking
     - if: $GCP_PROD_PROJECT # useless test, just to prevent GitLab warning
       when: manual