diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml.j2 b/roles/openshift-apps/greenwave/templates/fedora.yaml.j2
index 69b0ee7dd9..d21ffc9cfa 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml.j2
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml.j2
@@ -160,7 +160,7 @@ rules:
   - !RemoteRule {}
 
 # For critical path updates in stable and Branched, we require passes
-# for all openQA update tests. These policies contains the tests we run
+# for most openQA update tests. These policies contains the tests we run
 # on all releases; there are some additional policies which contain
 # tests not run on the oldest stable release (see below). Note the
 # non-grouped `bodhi_update_push_testing_critpath` and
@@ -188,6 +188,7 @@ subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
   - !PassingTestCaseRule {test_case_name: update.kiwi_build, scenario: "fedora.updates-container.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.kiwi_build, scenario: "fedora.updates-container.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.podman, scenario: "fedora.updates-container.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.podman, scenario: "fedora.updates-container.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.podman_client, scenario: "fedora.updates-container.x86_64.64bit"}
@@ -212,8 +213,10 @@ decision_contexts:
 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.aarch64.aarch64"}
   - !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.bios"}
+  - !PassingTestCaseRule {test_case_name: update.installer_build, scenario: "fedora.updates-everything-boot-iso.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.installer_build, scenario: "fedora.updates-everything-boot-iso.x86_64.64bit"}
 
 --- !Policy
@@ -231,11 +234,17 @@ decision_contexts:
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
+  - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-workstation.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-workstation.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_default, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_default, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_basic, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_basic, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_updates, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_updates, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit, scenario: "fedora.updates-server.x86_64.64bit"}
 
 --- !Policy
@@ -270,6 +279,8 @@ rules:
   - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-workstation.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-workstation.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-workstation.aarch64.aarch64"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_graphics_validation, scenario: "fedora.updates-workstation.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_graphics_validation, scenario: "fedora.updates-workstation.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_keyring, scenario: "fedora.updates-workstation.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.desktop_keyring, scenario: "fedora.updates-workstation.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_login, scenario: "fedora.updates-workstation.x86_64.64bit"}
@@ -326,6 +337,7 @@ decision_contexts:
 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.aarch64.aarch64"}
   - !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.bios"}
 
@@ -348,17 +360,33 @@ decision_contexts:
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
+  - !PassingTestCaseRule {test_case_name: update.base_reboot_unmount, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_reboot_unmount, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_selinux, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_selinux, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_service_manipulation, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_service_manipulation, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_services_start, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_services_start, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_system_logging, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_system_logging, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_browser, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_graphics_validation, scenario: "fedora.updates-kde.aarch64.aarch64"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_graphics_validation, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_keyring, scenario: "fedora.updates-kde.aarch64.aarch64"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_keyring, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_login, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_login, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_printing, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_printing, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_printing_builtin, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_printing_builtin, scenario: "fedora.updates-kde.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.desktop_terminal, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !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.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_update_graphical, scenario: "fedora.updates-kde.x86_64.64bit"}
 
 --- !Policy
@@ -380,6 +408,7 @@ decision_contexts:
   - bodhi_update_push_stable_critical-path-standard_critpath
 subject_type: bodhi_update
 rules:
+  - !PassingTestCaseRule {test_case_name: update.desktop_background, scenario: "fedora.updates-kde.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.desktop_background, scenario: "fedora.updates-kde.x86_64.64bit"}
 
 --- !Policy
@@ -405,6 +434,7 @@ decision_contexts:
 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.aarch64.aarch64"}
   - !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.bios"}
 
@@ -442,23 +472,39 @@ rules:
   - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-server.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit_ad, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.realmd_join_cockpit_ad, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.realmd_join_sssd, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.realmd_join_sssd, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.realmd_join_sssd_ad, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.realmd_join_sssd_ad, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_basic, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_basic, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_default, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_default, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_cockpit_updates, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_cockpit_updates, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_database_client, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_database_client, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_firewall_default, scenario: "fedora.updates-server.x86_64.64bit"}
   - !PassingTestCaseRule {test_case_name: update.server_firewall_default, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_client, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_client, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_master, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_master, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_replica, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_freeipa_replication_replica, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_remote_logging_client, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_remote_logging_client, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_remote_logging_server, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_remote_logging_server, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_role_deploy_database_server, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_role_deploy_database_server, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_role_deploy_domain_controller, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_role_deploy_domain_controller, scenario: "fedora.updates-server.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.server_samba_domain_controller, scenario: "fedora.updates-server.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.server_samba_domain_controller, scenario: "fedora.updates-server.aarch64.aarch64"}
 
 --- !Policy
 id: "bodhiupdate_bodhipush_openqa_cloud"
@@ -478,11 +524,17 @@ decision_contexts:
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
+  - !PassingTestCaseRule {test_case_name: update.base_reboot_unmount, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_reboot_unmount, scenario: "fedora.updates-cloud.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_selinux, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_selinux, scenario: "fedora.updates-cloud.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_service_manipulation, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_service_manipulation, scenario: "fedora.updates-cloud.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_services_start, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_services_start, scenario: "fedora.updates-cloud.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_system_logging, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_system_logging, scenario: "fedora.updates-cloud.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-cloud.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.base_update_cli, scenario: "fedora.updates-cloud.x86_64.64bit"}
 
 # These policies contains openQA upgrade tests that are not run on the
@@ -505,7 +557,9 @@ decision_contexts:
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
+  - !PassingTestCaseRule {test_case_name: update.upgrade_realmd_client, scenario: "fedora.updates-server-upgrade.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.upgrade_realmd_client, scenario: "fedora.updates-server-upgrade.x86_64.64bit"}
+  - !PassingTestCaseRule {test_case_name: update.upgrade_server_domain_controller, scenario: "fedora.updates-server-upgrade.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.upgrade_server_domain_controller, scenario: "fedora.updates-server-upgrade.x86_64.64bit"}
 
 --- !Policy
@@ -523,6 +577,7 @@ decision_contexts:
 subject_type: bodhi_update
 rules:
 # This list needs to stay synced with openQA if tests are added or renamed.
+  - !PassingTestCaseRule {test_case_name: update.upgrade_desktop, scenario: "fedora.updates-workstation-upgrade.aarch64.aarch64"}
   - !PassingTestCaseRule {test_case_name: update.upgrade_desktop_encrypted_64bit, scenario: "fedora.updates-workstation-upgrade.x86_64.64bit"}
 
 # This policy enforces gating for CoreOS-owned packages.