diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml
index a523e26a12..d40f03d1b9 100644
--- a/playbooks/groups/beaker.yml
+++ b/playbooks/groups/beaker.yml
@@ -23,6 +23,8 @@
   - collectd/base
   - sudo
   - apache
+   - { role: openvpn/client,
+       when: deployment_type == "prod", tags: ['openvpn_client'] }
 
   tasks:
   # this is how you include other task lists