diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml
index 1aa0683c48..addad1bf4b 100644
--- a/playbooks/groups/mbs.yml
+++ b/playbooks/groups/mbs.yml
@@ -41,7 +41,7 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   roles:
-  - openvpn/client
+  - role: { openvpn/client, when: datacenter == 'phx2' }
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml
index 766a5df97c..2ae8397fdc 100644
--- a/playbooks/groups/pdc.yml
+++ b/playbooks/groups/pdc.yml
@@ -42,7 +42,7 @@
 
   roles:
   - role: openvpn/client
-    when: env != "staging"
+    when: env != "staging" and datacenter == 'phx2'
   - mod_wsgi
   - { role: fedmsg/base,
       when: deployment_type == "prod" }