diff --git a/playbooks/host_reboot.yml b/playbooks/host_reboot.yml
index a974b4155c..4f30a602ee 100644
--- a/playbooks/host_reboot.yml
+++ b/playbooks/host_reboot.yml
@@ -8,7 +8,7 @@
 
   tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -22,6 +22,6 @@
     command: ntpdate -u 66.187.233.4
 
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/manual/rebuild/fedora-packages.yml b/playbooks/manual/rebuild/fedora-packages.yml
index 1a5150ee6b..5c53a4bc19 100644
--- a/playbooks/manual/rebuild/fedora-packages.yml
+++ b/playbooks/manual/rebuild/fedora-packages.yml
@@ -23,7 +23,7 @@
     when: install_packages_indexer
 
   - name: tell nagios to shush for these hosts
-    nagios: action=downtime minutes=300 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=300 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -91,6 +91,6 @@
     - fcomm-cache-worker
 
   - name: tell nagios to start bothering us again
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/manual/restart-fedmsg-services.yml b/playbooks/manual/restart-fedmsg-services.yml
index 5af80b64be..0e3f93a99a 100644
--- a/playbooks/manual/restart-fedmsg-services.yml
+++ b/playbooks/manual/restart-fedmsg-services.yml
@@ -59,7 +59,7 @@
 
   tasks:
   - name: schedule a 15 minute downtime.  give notifs backend time to start up.
-    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
diff --git a/playbooks/manual/upgrade/badges.yml b/playbooks/manual/upgrade/badges.yml
index ae60a12d4a..792b8fb387 100644
--- a/playbooks/manual/upgrade/badges.yml
+++ b/playbooks/manual/upgrade/badges.yml
@@ -68,7 +68,7 @@
 
   pre_tasks:
   - name: tell nagios to shush w.r.t. the frontend
-    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -90,7 +90,7 @@
 
   pre_tasks:
   - name: tell nagios to shush w.r.t. the backend
-    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -111,7 +111,7 @@
 
   post_tasks:
   - name: tell nagios to unshush w.r.t. the backend
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -130,6 +130,6 @@
 
   post_tasks:
   - name: tell nagios to unshush w.r.t. the frontend
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml
index fb12cf7177..8af88e3450 100644
--- a/playbooks/manual/upgrade/datanommer.yml
+++ b/playbooks/manual/upgrade/datanommer.yml
@@ -40,7 +40,7 @@
   - include: "{{ handlers }}/restart_services.yml"
   pre_tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
   roles:
@@ -59,7 +59,7 @@
   - include: "{{ handlers }}/restart_services.yml"
   pre_tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
   roles:
@@ -78,7 +78,7 @@
   - include: "{{ handlers }}/restart_services.yml"
   pre_tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
   roles:
@@ -97,7 +97,7 @@
   - include: "{{ handlers }}/restart_services.yml"
   pre_tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
   roles:
@@ -118,7 +118,7 @@
 
   post_tasks:
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -137,7 +137,7 @@
   - service: name="httpd" state=started
   post_tasks:
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -154,6 +154,6 @@
   - service: name="fedmsg-hub" state=started
   post_tasks:
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml
index 70e5f22746..ef53369184 100644
--- a/playbooks/manual/upgrade/fmn.yml
+++ b/playbooks/manual/upgrade/fmn.yml
@@ -33,7 +33,7 @@
 
   pre_tasks:
   - name: tell nagios to shush w.r.t. the frontend
-    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -55,7 +55,7 @@
 
   pre_tasks:
   - name: tell nagios to shush w.r.t. the backend
-    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -78,7 +78,7 @@
   # up anyways, so just let the downtime expire.
   #post_tasks:
   #- name: tell nagios to unshush w.r.t. the backend
-  #  nagios: action=unsilence service=host host={{ inventory_hostname }}
+  #  nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
   #  delegate_to: noc01.phx2.fedoraproject.org
   #  ignore_errors: true
 
@@ -97,6 +97,6 @@
 
   post_tasks:
   - name: tell nagios to unshush w.r.t. the frontend
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/manual/upgrade/hotness.yml b/playbooks/manual/upgrade/hotness.yml
index 8517d90965..fe5244401c 100644
--- a/playbooks/manual/upgrade/hotness.yml
+++ b/playbooks/manual/upgrade/hotness.yml
@@ -33,7 +33,7 @@
 
   pre_tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -43,6 +43,6 @@
   post_tasks:
   - service: name="fedmsg-hub" state=restarted
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml
index 21b3c99046..cfe3d02206 100644
--- a/playbooks/vhost_reboot.yml
+++ b/playbooks/vhost_reboot.yml
@@ -43,16 +43,9 @@
 
   tasks:
   - name: schedule regular host downtime
-    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}
+    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
-    when: inventory_hostname.find('.stg.') == -1
-
-  - name: schedule stg host downtime
-    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}.stg
-    delegate_to: noc01.phx2.fedoraproject.org
-    ignore_errors: true
-    when: inventory_hostname.find('.stg.') != -1
 
   - name: halt the vm instances - to poweroff
     command: /sbin/shutdown -h 1
@@ -75,7 +68,7 @@
 
   tasks:
   - name: tell nagios to shush
-    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname }}
+    nagios: action=downtime minutes=60 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
@@ -100,7 +93,7 @@
     when: inventory_hostname_short.startswith('serverbeach')
 
   - name: tell nagios to unshush
-    nagios: action=unsilence service=host host={{ inventory_hostname }}
+    nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
 
diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml
index 2ddfa21d5f..4c759985b5 100644
--- a/playbooks/vhost_update.yml
+++ b/playbooks/vhost_update.yml
@@ -27,16 +27,9 @@
 
   tasks:
   - name: schedule regular host downtime
-    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}
+    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }}
     delegate_to: noc01.phx2.fedoraproject.org
     ignore_errors: true
-    when: inventory_hostname.find('.stg.') == -1
-
-  - name: schedule stg host downtime
-    nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}.stg
-    delegate_to: noc01.phx2.fedoraproject.org
-    ignore_errors: true
-    when: inventory_hostname.find('.stg.') != -1
 
   - name: expire-caches
     command: yum clean expire-cache