diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml
index d02918efb7..202ae7ee61 100644
--- a/playbooks/vhost_reboot.yml
+++ b/playbooks/vhost_reboot.yml
@@ -77,10 +77,10 @@
     ignore_errors: true
 
   - name: reboot the virthost
-    command: /sbin/shutdown -r now
+    command: /sbin/shutdown -r 1
 
   - name: wait for virthost to come back - up to 15 minutes
-    local_action: wait_for host={{ target }} port=22 delay=120 timeout=900
+    local_action: wait_for host={{ target }} port=22 delay=120 timeout=900 search_regex=OpenSSH
 
   - name: wait for libvirtd to come back on the virthost
     wait_for: path=/var/run/libvirtd.pid state=present
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index a97681c024..f7b22db551 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -31,7 +31,7 @@
   - mod_auth_openid
 
 - name: Copy /etc/nagios config
-  synchronize: archive=yes src={{nagios_srcdir}}/ dest=/etc/nagios owner=nagios group=nagios
+  copy: src={{nagios_srcdir}}/ dest=/etc/nagios owner=nagios group=nagios
   tags:
   - nagios-config
 
@@ -45,7 +45,7 @@
   file: dest=/usr/lib64/nagios/plugins/eventhandlers/ state=directory
 
 - name: Copy plugins
-  synchronize: archive=yes src=plugins/ dest=/usr/lib64/nagios/plugins/ mode=0755 owner=root group=root
+  copy: src=plugins/ dest=/usr/lib64/nagios/plugins/ mode=0755 owner=root group=root
 
 # TODO: rhel7
 #- name: Copy xmpp plugin config