diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml
index e6d3a3d4f5..640a890781 100644
--- a/playbooks/vhost_reboot.yml
+++ b/playbooks/vhost_reboot.yml
@@ -119,6 +119,10 @@
 
   tasks:
 
+  - name: Wait for host to come back (ipa or rabbitmq)
+    local_action: wait_for port=22 delay=30 timeout=300 state=started host={{ inventory_hostname }}
+    when: inventory_hostname.startswith(('ipa', 'rabbitmq'))
+
   - name: restart gssproxy if we rebooted a ipa server
     service: name=gssproxy state=restarted
     when: inventory_hostname.startswith('ipa')