diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 7a76f61734..d15e154908 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -84,6 +84,9 @@ rules:
 --- !Policy
 id: "no_requirements_testing"
 product_versions:
+  - fedora-33-modular
+  - fedora-33-containers
+  - fedora-33-flatpaks
   - fedora-32-modular
   - fedora-32-containers
   - fedora-32-flatpaks
@@ -107,6 +110,9 @@ rules: []
 --- !Policy
 id: "no_requirements_for_stable"
 product_versions:
+  - fedora-33-modular
+  - fedora-33-containers
+  - fedora-33-flatpaks
   - fedora-32-modular
   - fedora-32-containers
   - fedora-32-flatpaks
@@ -133,6 +139,7 @@ id: "openqa_release_critical_tasks_for_testing"
 product_versions:
   - fedora-rawhide
   - fedora-eln
+  - fedora-33
   - fedora-32
   - fedora-31
   - fedora-30
@@ -147,6 +154,7 @@ id: "openqa_release_critical_tasks_for_stable"
 product_versions:
   - fedora-rawhide
   - fedora-eln
+  - fedora-33
   - fedora-32
   - fedora-31
   - fedora-30
diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 16a67085cf..68f4251f69 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -259,8 +259,8 @@ handlers = ["console"]
             type = "modular"
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f33-modular-updates-candidate"
-            to = "f33-modular"
+            from = "f33-modular-signing-pending"
+            to = "f33-modular-updates-testing-pending"
             key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('9570ff31', '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