diff --git a/roles/s3-mirror/tasks/main.yml b/roles/s3-mirror/tasks/main.yml
index e8f6967b80..9e4ed0aa4f 100644
--- a/roles/s3-mirror/tasks/main.yml
+++ b/roles/s3-mirror/tasks/main.yml
@@ -79,8 +79,8 @@
   cron: name="s3sync-updates-current" minute="0" hour="2,7,10" user="s3-mirror"
         job='/usr/local/bin/lock-wrapper s3sync-updates-dev-cur-plus-1-x86_64 "/usr/local/bin/s3-sync-path.sh /pub/fedora/linux/development/{{ FedoraCycleNumber|int + 1 }}/Everything/x86_64/os/" 2>&1 | /usr/local/bin/nag-once s3-updates-dev-cur-plus-1-x86_64.sh 1d 2>&1'
         cron_file=s3-updates-dev-cur-plus-1-x86_64.sh
+        disabled={{not FedoraBranched|bool}}
   when: env != 'staging' and inventory_hostname.startswith('mm-backend01.')
-  disabled: not FedoraBranched
   tags:
   - s3-mirror
 
@@ -88,8 +88,8 @@
   cron: name="s3sync-updates-current" minute="0" hour="4,11,18" user="s3-mirror"
         job='/usr/local/bin/lock-wrapper s3sync-updates-dev-cur-plus-1-aarch64 "/usr/local/bin/s3-sync-path.sh /pub/fedora/linux/development/{{ FedoraCycleNumber|int + 1 }}/Everything/aarch64/os/" 2>&1 | /usr/local/bin/nag-once s3-updates-dev-cur-plus-1-aarch64.sh 1d 2>&1'
         cron_file=s3-updates-dev-cur-plus-1-aarch64.sh
+        disabled={{not FedoraBranched|bool}}
   when: env != 'staging' and inventory_hostname.startswith('mm-backend01.')
-  disabled: not FedoraBranched
   tags:
   - s3-mirror