diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index db776f803c..c56cf9808b 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -576,7 +576,10 @@ fedora_modular.mandatory_days_in_testing = 7
 # critpath number of admin approvals, and the critpath minimum karma. For example, if we want to set
 # 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 FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'prebeta' %}
+{% if FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'preenable' %}
+f{{ FedoraBranchedNumber }}.status = preenable
+f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 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
diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml
index f0cca9a925..aba8be21c8 100644
--- a/vars/all/FedoraBranchedBodhi.yaml
+++ b/vars/all/FedoraBranchedBodhi.yaml
@@ -1,2 +1,6 @@
-#options are: prebeta, postbeta, current
-FedoraBranchedBodhi: prebeta 
+# options are: preenable, prebeta, postbeta, current
+# preenable: After branching and before bodhi enablement/beta freeze
+# prebeta: After bodhi enablement/beta freeze and before beta release
+# postbeta: After beta release and before final release
+# current: After final release
+FedoraBranchedBodhi: preenable