diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 9486b6df62..f46b8b70a3 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -165,10 +165,10 @@ product_versions:
   # here, possibly. however, right after branching, tests for Rawhide
   # tend not to pass right away, so it may be good that we have to
   # manually enable branching for it...
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -190,10 +190,10 @@ id: "bodhiupdate_bodhipush_openqa_netinst"
 # the "build a netinst and test an install from it" tests are gating
 # for the core groups, plus the anaconda and compose groups
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -222,10 +222,10 @@ id: "bodhiupdate_bodhipush_openqa_apps"
 # thunderbird), and the tests listed here use firefox. We don't have
 # any update tests that cover evolution or thunderbird ATM
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
 # we don't list the 'generic' contexts here as all these tests are
@@ -248,10 +248,10 @@ id: "bodhiupdate_bodhipush_openqa_workstation"
 # groups. workstation does not include standard, so these aren't gating
 # for that group
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -282,9 +282,10 @@ id: "bodhiupdate_bodhipush_openqa_workstation_background"
 # often, at branch time, we don't yet have new backgrounds for the branched
 # release, so the test will always fail, so we cannot gate on it
 product_versions:
-  - fedora-37
   - fedora-38
+  - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -304,10 +305,10 @@ id: "bodhiupdate_bodhipush_openqa_workstation_live"
 # the workstation "build a live image and install from it" tests are
 # gating for the same groups, plus anaconda and compose
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -334,10 +335,10 @@ id: "bodhiupdate_bodhipush_openqa_kde"
 # these tests are gating for updates in core, base, standard and kde
 # critpath groups.
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -370,9 +371,10 @@ id: "bodhiupdate_bodhipush_openqa_kde_background"
 # often, at branch time, we don't yet have new backgrounds for the branched
 # release, so the test will always fail, so we cannot gate on it
 product_versions:
-  - fedora-37
   - fedora-38
+  - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -394,10 +396,10 @@ id: "bodhiupdate_bodhipush_openqa_kde"
 # the kde "build a live image and install from it" tests are
 # gating for the same groups, plus anaconda and compose
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -426,10 +428,10 @@ id: "bodhiupdate_bodhipush_openqa_server"
 # these tests are gating for updates in core, base, standard and server
 # critpath groups.
 product_versions:
-  - fedora-37
   - fedora-38
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -478,6 +480,7 @@ id: "bodhiupdate_bodhipush_openqa_upgrade_server"
 product_versions:
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -501,6 +504,7 @@ id: "bodhiupdate_bodhipush_openqa_upgrade_workstation"
 product_versions:
   - fedora-39
   - fedora-40
+  - fedora-41
   - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath