diff --git a/playbooks/host-reboot.yml b/playbooks/host-reboot.yml
index 1457ae8d25..c79fdd8382 100644
--- a/playbooks/host-reboot.yml
+++ b/playbooks/host-reboot.yml
@@ -10,8 +10,9 @@
     register: needsreboot
 
   - name: tell nagios to shush
-    action: nagios action=downtime host=${ansible_hostname} minutes=30 service=all
+    action: nagios action=silence host=${ansible_hostname}
     delegate_to: noc01.phx2.fedoraproject.org
+    only_if: "'${needsreboot.stdout}'.find('yes') != -1"
 
   - name: reboot the host
     action: command /sbin/reboot
@@ -21,7 +22,10 @@
     local_action: wait_for host=${inventory_hostname} port=22 delay=10 timeout=420
     only_if: "'${needsreboot.stdout}'.find('yes') != -1"
 
-  # ADDME give nagios the all clear
+  - name: tell nagios to shush
+    action: nagios action=unsilence host=${ansible_hostname}
+    delegate_to: noc01.phx2.fedoraproject.org
+    only_if: "'${needsreboot.stdout}'.find('yes') != -1"