diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml
index 98a28c9507..10f819638a 100644
--- a/roles/openshift-apps/greenwave/templates/fedora.yaml
+++ b/roles/openshift-apps/greenwave/templates/fedora.yaml
@@ -62,20 +62,13 @@ product_versions:
 decision_context: bodhi_update_push_testing
 blacklist: []
 subject_type: koji_build
-{% if env == 'staging' %}
 rules:
   - !RemoteRule {}
-{% else %}
-rules:
-  - !RemoteRule {}
-{% endif %}
 
 --- !Policy
 id: "taskotron_release_critical_tasks_for_stable"
 product_versions:
-{% if env == 'staging' %}
   - fedora-31
-{% endif %}
   - fedora-30
   - fedora-29
   - fedora-28
@@ -84,13 +77,8 @@ product_versions:
 decision_context: bodhi_update_push_stable
 blacklist: []
 subject_type: koji_build
-{% if env == 'staging' %}
 rules:
   - !RemoteRule {}
-{% else %}
-rules:
-  - !RemoteRule {}
-{% endif %}
 
 --- !Policy
 id: "no_requirements_testing"