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
diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml
index a5f52843e9..0352db7bbb 100644
--- a/roles/openvpn/base/tasks/main.yml
+++ b/roles/openvpn/base/tasks/main.yml
@@ -6,6 +6,7 @@
   with_items:
   - openvpn
   tags:
+  - openvpn
   - packages
   when: ansible_distribution_major_version|int < 8
 
@@ -14,6 +15,7 @@
   with_items:
   - openvpn
   tags:
+  - openvpn
   - packages
   when: ansible_distribution_major_version|int > 7 and ansible_cmdline.ostree is not defined