diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 1b59fecf0d..8ae8163dd7 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -155,6 +155,8 @@ product_versions:
   # release is branched (or goes EOL).
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_testing_core_critpath
@@ -177,6 +179,8 @@ id: "bodhiupdate_bodhipush_openqa_netinst"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_testing_core_critpath
@@ -206,6 +210,8 @@ id: "bodhiupdate_bodhipush_openqa_apps"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
 # we don't list the 'generic' contexts here as all these tests are
 # pulled into those contexts via other policies
@@ -229,6 +235,8 @@ id: "bodhiupdate_bodhipush_openqa_workstation"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -260,6 +268,8 @@ id: "bodhiupdate_bodhipush_openqa_workstation_live"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -287,6 +297,8 @@ id: "bodhiupdate_bodhipush_openqa_kde"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -320,6 +332,8 @@ id: "bodhiupdate_bodhipush_openqa_kde"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -349,6 +363,8 @@ id: "bodhiupdate_bodhipush_openqa_server"
 product_versions:
   - fedora-37
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -392,6 +408,8 @@ rules:
 id: "bodhiupdate_bodhipush_openqa_upgrade_server"
 product_versions:
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
@@ -413,6 +431,8 @@ rules:
 id: "bodhiupdate_bodhipush_openqa_upgrade_workstation"
 product_versions:
   - fedora-38
+  - fedora-39
+  - fedora-rawhide
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath