diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml
index 619f0f58ff..4bae24b9d8 100644
--- a/playbooks/groups/github2fedmsg.yml
+++ b/playbooks/groups/github2fedmsg.yml
@@ -21,9 +21,10 @@
   - 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
   - rsyncd
@@ -55,4 +56,4 @@
   roles:
   - github2fedmsg
   - fedmsg/base
-  - { role: rabbit/user, when: deployment_type == "stg" }
+  - {role: rabbit/user, when: deployment_type == "stg"}