diff --git a/playbooks/groups/zabbix.yml b/playbooks/groups/zabbix.yml
index 8f1f89d7a8..7de9ef4686 100644
--- a/playbooks/groups/zabbix.yml
+++ b/playbooks/groups/zabbix.yml
@@ -20,6 +20,7 @@
   - collectd/base
   - sudo
   - zabbix/zabbix_server
+  - { role: openvpn/client, when: env != "staging" }
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
diff --git a/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org
new file mode 100644
index 0000000000..398591e4ec
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/zabbix01.iad2.fedoraproject.org
@@ -0,0 +1,2 @@
+ifconfig-push 192.168.1.211 192.168.0.211
+