diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index d9af47b0a0..08907665ed 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -81,6 +81,9 @@ rules:
 --- !Policy
 id: "no_requirements_testing"
 product_versions:
+  - fedora-31-modular
+  - fedora-31-containers
+  - fedora-31-flatpaks
   - fedora-30-modular
   - fedora-30-containers
   - fedora-30-flatpaks
@@ -98,6 +101,9 @@ rules: []
 --- !Policy
 id: "no_requirements_for_stable"
 product_versions:
+  - fedora-31-modular
+  - fedora-31-containers
+  - fedora-31-flatpaks
   - fedora-30-modular
   - fedora-30-containers
   - fedora-30-flatpaks
@@ -116,6 +122,7 @@ rules: []
 # openQA policies
 id: "openqa_release_critical_tasks_for_testing"
 product_versions:
+  - fedora-31
   - fedora-30
   - fedora-29
 decision_context: bodhi_update_push_testing
@@ -127,6 +134,7 @@ rules:
 --- !Policy
 id: "openqa_release_critical_tasks_for_stable"
 product_versions:
+  - fedora-31
   - fedora-30
   - fedora-29
 decision_context: bodhi_update_push_stable
diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py
index 1c5778b60d..0e5a4ac489 100644
--- a/roles/robosignatory/files/robosignatory.production.py
+++ b/roles/robosignatory/files/robosignatory.production.py
@@ -166,21 +166,14 @@ config = {
                     "type": "modular"
                 },
                 {
-                    "from": "f31-pending",
-                    "to": "f31",
+                    "from": "f31-signing-pending",
+                    "to": "f31-updates-testing-pending",
                     "key": "fedora-31",
                     "keyid": "3c3359c4"
                 },
                 {
-                    "from": "f31-modular-pending",
-                    "to": "f31-modular",
-                    "key": "fedora-31",
-                    "keyid": "3c3359c4",
-                    "type": "modular"
-                },
-                {
-                    "from": "f31-modular-updates-candidate",
-                    "to": "f31-modular",
+                    "from": "f31-modular-signing-pending",
+                    "to": "f31-modular-updates-testing-pending",
                     "key": "fedora-31",
                     "keyid": "3c3359c4",
                     "type": "modular"
diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml
index 105863a918..91f82f2da9 100644
--- a/vars/all/FedoraBranchedBodhi.yaml
+++ b/vars/all/FedoraBranchedBodhi.yaml
@@ -1,2 +1,2 @@
 #options are: preBeta, postBeta, current
-FedoraBranchedBodhi: current 
+FedoraBranchedBodhi: preBeta 
diff --git a/vars/all/RelEngFrozen.yaml b/vars/all/RelEngFrozen.yaml
index 72af77976d..bd7553fb7f 100644
--- a/vars/all/RelEngFrozen.yaml
+++ b/vars/all/RelEngFrozen.yaml
@@ -1 +1 @@
-RelEngFrozen: False 
+RelEngFrozen: True