diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index ab7d9dc482..9dc2634d2f 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -21,7 +21,7 @@
     - rsyncd
     - sudo
     - { role: openvpn/client,
-        when: env != "staging" }
+        when: env != "staging" and 'os-control' not in group_names }
 
   tasks:
     - name: put openshift 3.4 repo on os- systems