diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml
index 1953ba787a..b824f15ff5 100644
--- a/playbooks/groups/beaker.yml
+++ b/playbooks/groups/beaker.yml
@@ -24,7 +24,7 @@
   - sudo
   - apache
   - { role: openvpn/client,
-      when: deployment_type == "prod", tags: ['openvpn_client'] }
+      when: env != "staging", tags: ['openvpn_client'] }
 
   tasks:
   # this is how you include other task lists