diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index d01c1544cb..1b59fecf0d 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -153,7 +153,6 @@ product_versions:
   # to include whatever version Rawhide is, as openQA tests don't run
   # on Rawhide. So for now this list needs to be updated each time a
   # release is branched (or goes EOL).
-  - fedora-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -176,7 +175,6 @@ 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-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -206,7 +204,6 @@ 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-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -230,7 +227,6 @@ id: "bodhiupdate_bodhipush_openqa_workstation"
 # groups. workstation does not include standard, so these aren't gating
 # for that group
 product_versions:
-  - fedora-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -262,7 +258,6 @@ 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-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -290,7 +285,6 @@ id: "bodhiupdate_bodhipush_openqa_kde"
 # these tests are gating for updates in core, base, standard and kde
 # critpath groups.
 product_versions:
-  - fedora-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -324,7 +318,6 @@ 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-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -354,7 +347,6 @@ id: "bodhiupdate_bodhipush_openqa_server"
 # these tests are gating for updates in core, base, standard and server
 # critpath groups.
 product_versions:
-  - fedora-36
   - fedora-37
   - fedora-38
 decision_contexts:
@@ -399,7 +391,6 @@ rules:
 --- !Policy
 id: "bodhiupdate_bodhipush_openqa_upgrade_server"
 product_versions:
-  - fedora-37
   - fedora-38
 decision_contexts:
   - bodhi_update_push_testing_critpath
@@ -421,7 +412,6 @@ rules:
 --- !Policy
 id: "bodhiupdate_bodhipush_openqa_upgrade_workstation"
 product_versions:
-  - fedora-37
   - fedora-38
 decision_contexts:
   - bodhi_update_push_testing_critpath