diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 5ef03f967d..23ddc3f9a4 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -543,29 +543,12 @@ critpath.jsonpath = /etc/bodhi/critpath
 # files. This is used if critpath.type is not defined.
 # critpath_pkgs =
 
-{% if env == 'staging' %}
-
 # The net karma required to submit a critial path update to a pending release.
 # min_karma = 2
 
 # Allow critpath to submit for stable after 2 weeks with no negative karma
 # critpath.mandatory_days_in_testing = 14
 
-{% else %}
-
-# The number of admin approvals it takes to be able to push a critical path
-# update to stable for a pending release.
-# critpath.num_admin_approvals = 2
-critpath.num_admin_approvals = 0
-
-# The net karma required to submit a critial path update to a pending release.
-# critpath.min_karma = 2
-
-# Allow critpath to submit for stable after 2 weeks with no negative karma
-# critpath.stable_after_days_without_negative_karma = 14
-
-{% endif %}
-
 # The minimum amount of time an update must spend in testing before
 # it can reach the stable repository
 fedora.mandatory_days_in_testing = 7
@@ -587,8 +570,6 @@ fedora_modular.mandatory_days_in_testing = 7
 # Fedora 28 as a pre-beta, and we want it to have different rules in pre-beta and post-beta, we
 # could do something like this:
 
-{% if env == 'staging' %}
-
 {% if FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'preenable' %}
 f{{ FedoraBranchedNumber }}.status = pre_beta
 f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 0
@@ -621,42 +602,6 @@ eln.status = pre_beta
 eln.pre_beta.mandatory_days_in_testing = 0
 eln.pre_beta.critpath.mandatory_days_in_testing = 0
 
-{% else %}
-
-{% if FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'preenable' %}
-f{{ FedoraBranchedNumber }}.status = pre_beta
-f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 0
-f{{ FedoraBranchedNumber }}.pre_beta.critpath.min_karma = 0
-f{{ FedoraBranchedNumber }}.pre_beta.critpath.stable_after_days_without_negative_karma = 0
-{% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'prebeta' %}
-f{{ FedoraBranchedNumber }}.status = pre_beta
-f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 3
-f{{ FedoraBranchedNumber }}.pre_beta.critpath.min_karma = 1
-f{{ FedoraBranchedNumber }}.pre_beta.critpath.stable_after_days_without_negative_karma = 14
-{% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'postbeta' %}
-f{{ FedoraBranchedNumber }}.status = post_beta
-f{{ FedoraBranchedNumber }}.post_beta.mandatory_days_in_testing = 7
-f{{ FedoraBranchedNumber }}.post_beta.critpath.min_karma = 2
-f{{ FedoraBranchedNumber }}.post_beta.critpath.stable_after_days_without_negative_karma = 14
-{% endif %}
-
-# Rawhide layered containers are shipped through bodhi and rawhide containers not require any day
-# in testing
-f{{ FedoraRawhideNumber }}c.status = pre_beta
-f{{ FedoraRawhideNumber }}c.pre_beta.mandatory_days_in_testing = 0
-# Rawhide gating - Updates in rawhide don't require any days in testing.
-f{{ FedoraRawhideNumber }}.status = pre_beta
-f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0
-f{{ FedoraRawhideNumber }}.pre_beta.critpath.min_karma = 0
-f{{ FedoraRawhideNumber }}.pre_beta.critpath.stable_after_days_without_negative_karma = 0
-
-# ELN gating - Updates in ELN don't require any days in testing.
-eln.status = pre_beta
-eln.pre_beta.mandatory_days_in_testing = 0
-eln.pre_beta.critpath.stable_after_days_without_negative_karma = 0
-
-{% endif %}
-
 # EPEL bootstrap - During bootstrap updates don't require any days in testing.
 epel{{ EPELBootstrapNumber }}.status = pre_beta
 epel{{ EPELBootstrapNumber }}.pre_beta.mandatory_days_in_testing = 0
diff --git a/vars/apps/bodhi.yml b/vars/apps/bodhi.yml
index 1b354f2b80..afb4262f4c 100644
--- a/vars/apps/bodhi.yml
+++ b/vars/apps/bodhi.yml
@@ -1,5 +1,5 @@
 ---
 # Set the Bodhi variables
-bodhi_version: "{{ (env == 'production')|ternary('8.1.1', '8.1.1') }}"
+bodhi_version: "{{ (env == 'production')|ternary('8.2.0', '8.2.0') }}"
 bodhi_openshift_pods: 1
 bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*