diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index 5ac68795b8..64ff72cd1c 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.yml
@@ -16,9 +16,9 @@
   - base
   - rkhunter
   - nagios_client
+  - {role: zabbix/zabbix_agent, when: env == "staging"}
   - hosts
-  - { role: openvpn/client,
-      when: env != "staging" }
+  - {role: openvpn/client, when: env != "staging"}
   - ipa/client
   - collectd/base
   - fedmsg/base