diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 77972ba1b1..5ef03f967d 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -548,6 +548,9 @@ critpath.jsonpath = /etc/bodhi/critpath
 # 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
@@ -558,11 +561,11 @@ critpath.num_admin_approvals = 0
 # The net karma required to submit a critial path update to a pending release.
 # critpath.min_karma = 2
 
-{% endif %}
-
 # 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
@@ -600,7 +603,7 @@ f{{ FedoraBranchedNumber }}.pre_beta.critpath.mandatory_days_in_testing = 14
 f{{ FedoraBranchedNumber }}.status = post_beta
 f{{ FedoraBranchedNumber }}.post_beta.mandatory_days_in_testing = 7
 f{{ FedoraBranchedNumber }}.post_beta.min_karma = 2
-f{{ FedoraBranchedNumber }}.post_beta.critpath.stable_after_days_without_negative_karma = 14
+f{{ FedoraBranchedNumber }}.post_beta.critpath.mandatory_days_in_testing = 14
 {% endif %}
 
 # Rawhide layered containers are shipped through bodhi and rawhide containers not require any day
@@ -613,6 +616,11 @@ f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0
 f{{ FedoraRawhideNumber }}.pre_beta.min_karma = 0
 f{{ FedoraRawhideNumber }}.pre_beta.critpath.mandatory_days_in_testing = 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.mandatory_days_in_testing = 0
+
 {% else %}
 
 {% if FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'preenable' %}
@@ -642,13 +650,13 @@ 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
 
-{% endif %}
-
 # 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