diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 5c642a84d2..342980a404 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -92,6 +92,7 @@ product_versions:
   - fedora-32
   - fedora-33
   - fedora-34
+  - fedora-35
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_stable_critpath
diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index e8aa8aef2b..eaecc5a1d4 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -226,8 +226,8 @@ handlers = ["console"]
             type = "modular"
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f35-modular-updates-candidate"
-            to = "f35-modular"
+            from = "f35-modular-signing-pending"
+            to = "f35-modular-updates-testing-pending"
             key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
             type = "modular"
diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml
index aba8be21c8..606eb2e208 100644
--- a/vars/all/FedoraBranchedBodhi.yaml
+++ b/vars/all/FedoraBranchedBodhi.yaml
@@ -3,4 +3,4 @@
 # prebeta: After bodhi enablement/beta freeze and before beta release
 # postbeta: After beta release and before final release
 # current: After final release
-FedoraBranchedBodhi: preenable
+FedoraBranchedBodhi: prebeta
diff --git a/vars/all/RelEngFrozen.yaml b/vars/all/RelEngFrozen.yaml
index 5836689199..87d85f360b 100644
--- a/vars/all/RelEngFrozen.yaml
+++ b/vars/all/RelEngFrozen.yaml
@@ -1 +1 @@
-RelEngFrozen: False
+RelEngFrozen: True