diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml
index a54343947a..48fa2cbed9 100644
--- a/playbooks/groups/fedocal.yml
+++ b/playbooks/groups/fedocal.yml
@@ -40,13 +40,13 @@
   - fas_client
   - rsyncd
   - sudo
+  - { role: openvpn/client,
+      when: env != "staging" }
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
-  - include: "{{ tasks }}/openvpn_client.yml"
-    when: env != "staging"
   - include: "{{ tasks }}/apache.yml"
   - include: "{{ tasks }}/mod_wsgi.yml"