diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index ac9700ecc0..53ae91d7f8 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -41,8 +41,11 @@ decision_contexts:
   - bodhi_update_push_testing
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_testing_core_critpath
+  - bodhi_update_push_testing_critical-path-anaconda_critpath
   - bodhi_update_push_testing_critical-path-apps_critpath
   - bodhi_update_push_testing_critical-path-base_critpath
+  - bodhi_update_push_testing_critical-path-build_critpath
+  - bodhi_update_push_testing_critical-path-compose_critpath
   - bodhi_update_push_testing_critical-path-deepin-desktop_critpath
   - bodhi_update_push_testing_critical-path-gnome_critpath
   - bodhi_update_push_testing_critical-path-kde_critpath
@@ -54,8 +57,11 @@ decision_contexts:
   - bodhi_update_push_stable
   - bodhi_update_push_stable_critpath
   - bodhi_update_push_stable_core_critpath
+  - bodhi_update_push_stable_critical-path-anaconda_critpath
   - bodhi_update_push_stable_critical-path-apps_critpath
   - bodhi_update_push_stable_critical-path-base_critpath
+  - bodhi_update_push_stable_critical-path-build_critpath
+  - bodhi_update_push_stable_critical-path-compose_critpath
   - bodhi_update_push_stable_critical-path-deepin-desktop_critpath
   - bodhi_update_push_stable_critical-path-gnome_critpath
   - bodhi_update_push_stable_critical-path-kde_critpath
@@ -162,6 +168,30 @@ rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
   - !PassingTestCaseRule {test_case_name: update.podman, scenario: "fedora.updates-container.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.podman_client, scenario: "fedora.updates-container.x86_64.64bit"}
+
+--- !Policy
+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
+decision_contexts:
+  - bodhi_update_push_testing_critpath
+  - bodhi_update_push_testing_core_critpath
+  - bodhi_update_push_testing_critical-path-anaconda_critpath
+  - bodhi_update_push_testing_critical-path-base_critpath
+  - bodhi_update_push_testing_critical-path-compose_critpath
+  - bodhi_update_push_testing_critical-path-standard_critpath
+  - bodhi_update_push_stable_critpath
+  - bodhi_update_push_stable_core_critpath
+  - bodhi_update_push_stable_critical-path-anaconda_critpath
+  - bodhi_update_push_stable_critical-path-base_critpath
+  - bodhi_update_push_stable_critical-path-compose_critpath
+  - bodhi_update_push_stable_critical-path-standard_critpath
+subject_type: bodhi_update
+rules:
+# This list needs to stay synced with openQA if tests are added or renamed.
   - !PassingTestCaseRule {test_case_name: update.install_default_update_netinst, scenario: "fedora.updates-everything-boot-iso.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.install_default_update_netinst, scenario: "fedora.updates-everything-boot-iso.x86_64.uefi"}
   - !PassingTestCaseRule {test_case_name: update.installer_build, scenario: "fedora.updates-everything-boot-iso.x86_64.64bit"}
@@ -180,7 +210,6 @@ decision_contexts:
 # pulled into those contexts via other policies
   - bodhi_update_push_testing_critical-path-apps_critpath
   - bodhi_update_push_stable_critical-path-apps_critpath
-
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
@@ -208,7 +237,6 @@ decision_contexts:
   - bodhi_update_push_stable_critical-path-base_critpath
   - bodhi_update_push_testing_critical-path-gnome_critpath
   - bodhi_update_push_stable_critical-path-gnome_critpath
-
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
@@ -223,6 +251,30 @@ rules:
   - !PassingTestCaseRule {test_case_name: update.desktop_printing, scenario: "fedora.updates-workstation.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_terminal, scenario: "fedora.updates-workstation.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_update_graphical, scenario: "fedora.updates-workstation.x86_64.64bit"}
+
+--- !Policy
+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
+decision_contexts:
+  - bodhi_update_push_testing_critpath
+  - bodhi_update_push_stable_critpath
+  - bodhi_update_push_testing_core_critpath
+  - bodhi_update_push_stable_core_critpath
+  - bodhi_update_push_testing_critical-path-anaconda_critpath
+  - bodhi_update_push_stable_critical-path-anaconda_critpath
+  - bodhi_update_push_testing_critical-path-base_critpath
+  - bodhi_update_push_stable_critical-path-base_critpath
+  - bodhi_update_push_testing_critical-path-compose_critpath
+  - bodhi_update_push_stable_critical-path-compose_critpath
+  - bodhi_update_push_testing_critical-path-gnome_critpath
+  - bodhi_update_push_stable_critical-path-gnome_critpath
+subject_type: bodhi_update
+rules:
+# This list needs to stay synced with openQA if tests are added or renamed.
   - !PassingTestCaseRule {test_case_name: update.install_default_update_live, scenario: "fedora.updates-workstation-live-iso.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.install_default_update_live, scenario: "fedora.updates-workstation-live-iso.x86_64.uefi"}
   - !PassingTestCaseRule {test_case_name: update.live_build, scenario: "fedora.updates-workstation-live-iso.x86_64.64bit"}
@@ -259,6 +311,32 @@ rules:
   - !PassingTestCaseRule {test_case_name: update.desktop_printing, scenario: "fedora.updates-kde.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_terminal, scenario: "fedora.updates-kde.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_update_graphical, scenario: "fedora.updates-kde.x86_64.64bit"}
+
+--- !Policy
+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
+decision_contexts:
+  - bodhi_update_push_testing_critpath
+  - bodhi_update_push_stable_critpath
+  - bodhi_update_push_testing_core_critpath
+  - bodhi_update_push_stable_core_critpath
+  - bodhi_update_push_testing_critical-path-anaconda_critpath
+  - bodhi_update_push_stable_critical-path-anaconda_critpath
+  - bodhi_update_push_testing_critical-path-base_critpath
+  - bodhi_update_push_stable_critical-path-base_critpath
+  - bodhi_update_push_testing_critical-path-compose_critpath
+  - bodhi_update_push_stable_critical-path-compose_critpath
+  - bodhi_update_push_testing_critical-path-kde_critpath
+  - bodhi_update_push_stable_critical-path-kde_critpath
+  - bodhi_update_push_testing_critical-path-standard_critpath
+  - bodhi_update_push_stable_critical-path-standard_critpath
+subject_type: bodhi_update
+rules:
+# This list needs to stay synced with openQA if tests are added or renamed.
   - !PassingTestCaseRule {test_case_name: update.install_default_update_live, scenario: "fedora.updates-kde-live-iso.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.install_default_update_live, scenario: "fedora.updates-kde-live-iso.x86_64.uefi"}
   - !PassingTestCaseRule {test_case_name: update.live_build, scenario: "fedora.updates-kde-live-iso.x86_64.64bit"}