diff --git a/templates/gitlab-ci-openshift.yml b/templates/gitlab-ci-openshift.yml
index 86aaaed34e0971555ff3f94efbd4026367e6f7b1..0bb5eed631c89aa1643081d945c2699c6f3e0040 100644
--- a/templates/gitlab-ci-openshift.yml
+++ b/templates/gitlab-ci-openshift.yml
@@ -777,9 +777,9 @@ os-production:
     - if: '$OS_PROD_PROJECT == null || $OS_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: $OS_PROD_PROJECT # useless test, just to prevent GitLab warning
       when: manual