diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml
index 4d057eff12..3108da5961 100644
--- a/playbooks/groups/bodhi2.yml
+++ b/playbooks/groups/bodhi2.yml
@@ -24,6 +24,9 @@
   - apache
   - mod_wsgi
 
+  - { role: bodhi2/base, when: "inventory_hostname.startswith('bodhi0')" }
+  - { role: fedmsg/base,  when: "inventory_hostname.startswith('bodhi0')" }
+
   - role: keytab/service
     owner_user: bodhi
     owner_group: bodhi
@@ -37,9 +40,6 @@
     host: "bodhi.stg.fedoraproject.org"
     when: env == "staging"
 
-  - { role: bodhi2/base, when: "inventory_hostname.startswith('bodhi0')" }
-  - { role: fedmsg/base,  when: "inventory_hostname.startswith('bodhi0')" }
-
   tasks:
   - include: "{{ tasks_path }}/yumrepos.yml"
   - include: "{{ tasks_path }}/2fa_client.yml"