diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 4f60f4f33a..a9181d68ff 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -523,8 +523,8 @@ rules:
 --- !Policy
 id: "bodhiupdate_bodhipush_coreos"
 product_versions:
-  - fedora-40
-  - fedora-41
+  - fedora-{{FedoraCycleNumber}}
+  - fedora-{{FedoraCycleNumber+1}}
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critical-path-coreos_critpath