diff --git a/inventory/host_vars/autosign01.phx2.fedoraproject.org b/inventory/host_vars/autosign01.phx2.fedoraproject.org
index 7b82b7d065..48845589a0 100644
--- a/inventory/host_vars/autosign01.phx2.fedoraproject.org
+++ b/inventory/host_vars/autosign01.phx2.fedoraproject.org
@@ -2,9 +2,9 @@
 nm: 255.255.255.0
 gw: 10.5.125.254
 dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
-ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
-volgroup: /dev/vg_bvirthost06
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_bvirthost08
 eth0_ip: 10.5.125.21
-vmhost: bvirthost06.phx2.fedoraproject.org
+vmhost: bvirthost08.phx2.fedoraproject.org
 datacenter: phx2
diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml
index 7d0a583d26..e12949d82c 100644
--- a/playbooks/groups/autosign.yml
+++ b/playbooks/groups/autosign.yml
@@ -34,7 +34,7 @@
   roles:
   - base
   - rkhunter
-  - denyhosts
+  - { role: denyhosts, when: ansible_distribution_major_version != '7' }
   - nagios_client
   - hosts
   - fas_client
diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml
index d93e41f78d..50d872ff15 100644
--- a/playbooks/groups/bugzilla2fedmsg.yml
+++ b/playbooks/groups/bugzilla2fedmsg.yml
@@ -33,7 +33,6 @@
   roles:
   - base
   - rkhunter
-#  - denyhosts
   - nagios_client
   - hosts
   - fas_client
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index a38cabacb6..1a6328012a 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -16,7 +16,7 @@
   roles:
   - base
   - rkhunter
-#  - denyhosts
+  - { role: denyhosts, when: ansible_distribution_major_version != '7' }
   - nagios_client
   - hosts
   - fas_client