diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml
index 311c6a2ebc..f602caa7fd 100644
--- a/playbooks/groups/bugzilla2fedmsg.yml
+++ b/playbooks/groups/bugzilla2fedmsg.yml
@@ -15,7 +15,6 @@
 
   tasks:
   - include: "{{ tasks }}/virt_instance_create.yml"
-  - include: "{{ tasks }}/accelerate_prep.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
@@ -33,7 +32,7 @@
 
   roles:
   - base
-  - rkhunter
+  - {role: rkhunter, when: ansible_distribution_major_version != 7}
   - denyhosts
   - nagios_client
   - fas_client