diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml
index 162ae4b9ed..aac4a3f9fd 100644
--- a/playbooks/groups/keyserver.yml
+++ b/playbooks/groups/keyserver.yml
@@ -34,7 +34,7 @@
   roles:
   - base
   - rkhunter
-  - denyhosts
+  - { role: denyhosts, when: ansible_distribution_major_version != '7' }
   - nagios_client
   - hosts
   - fas_client
@@ -46,6 +46,9 @@
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/openvpn_client.yml"
+    when: ansible_distribution_major_version != '7'
+  - include: "{{ tasks }}/openvpn_client_7.yml"
+    when: ansible_distribution_major_version == '7'
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/apache.yml"