diff --git a/inventory/builders b/inventory/builders
index 8da57b0819..4466e5ca33 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -196,7 +196,7 @@ buildhw-09.phx2.fedoraproject.org
 buildhw-10.phx2.fedoraproject.org
 buildhw-11.phx2.fedoraproject.org
 buildhw-12.phx2.fedoraproject.org
-buildhw-aarch64-01.arm.fedoraproject.org
+# buildhw-aarch64-01.arm.fedoraproject.org
 buildhw-aarch64-02.arm.fedoraproject.org
 buildhw-aarch64-03.arm.fedoraproject.org
 buildhw-aarch64-04.arm.fedoraproject.org
@@ -245,7 +245,7 @@ buildvm-ppc64le-31.ppc.fedoraproject.org
 
 [bkernel]
 bkernel03.phx2.fedoraproject.org
-bkernel04.phx2.fedoraproject.org
+#bkernel04.phx2.fedoraproject.org
 
 # These hosts get the runroot plugin installed.
 # They should be added to their own 'compose' channel in the koji db
diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 3aac22ee70..ece4c893bd 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -39,7 +39,6 @@ phx2_management_hosts:
   - beaker-client01.mgmt.fedoraproject.org
   - beaker-client02.mgmt.fedoraproject.org
   - bkernel03.mgmt.fedoraproject.org
-  - bkernel04.mgmt.fedoraproject.org
   - bvirthost01.mgmt.fedoraproject.org
   - bvirthost04.mgmt.fedoraproject.org
   - bvirthost05.mgmt.fedoraproject.org
@@ -62,8 +61,6 @@ phx2_management_hosts:
   - dell-fx02-07.mgmt.fedoraproject.org
   - dell-fx02-08.mgmt.fedoraproject.org
   - dell-fx02.mgmt.fedoraproject.org
-  - cloud-fx01.mgmt.fedoraproject.org
-  - cloud-fx02.mgmt.fedoraproject.org
   - qa09.mgmt.fedoraproject.org
   - qa10.mgmt.fedoraproject.org
   - qa11.mgmt.fedoraproject.org
@@ -73,7 +70,6 @@ phx2_management_hosts:
   - retrace01.mgmt.fedoraproject.org
   - retrace02.mgmt.fedoraproject.org
   - sign-vault05.mgmt.fedoraproject.org
-  - sign-vault06.mgmt.fedoraproject.org
   - virthost-comm03.mgmt.fedoraproject.org
   - virthost-comm04.mgmt.fedoraproject.org
   - virthost01-stg.mgmt.fedoraproject.org
@@ -97,13 +93,10 @@ phx2_management_hosts:
 # to test ping against. No http/https
 #
 phx2_management_limited:
-#  - fed-cloud-ppc01.mgmt.fedoraproject.org
-  - fed-cloud-ppc02.mgmt.fedoraproject.org
   - moonshot01-ilo.mgmt.fedoraproject.org
   - moonshot01-sw1.mgmt.fedoraproject.org
   - moonshot01-sw2.mgmt.fedoraproject.org
   - opengear01.mgmt.fedoraproject.org
-  - opengear02.mgmt.fedoraproject.org
   - qa05.mgmt.fedoraproject.org
   - qa07.mgmt.fedoraproject.org
   - sign-vault03.mgmt.fedoraproject.org
diff --git a/inventory/hardware b/inventory/hardware
index 44713def66..090e996f72 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -61,7 +61,7 @@ qa12.qa.fedoraproject.org
 qa13.qa.fedoraproject.org
 qa14.qa.fedoraproject.org
 bkernel03.phx2.fedoraproject.org
-bkernel04.phx2.fedoraproject.org
+#bkernel04.phx2.fedoraproject.org
 
 [ibms]
 virthost-cc-rdu03.fedoraproject.org
@@ -108,7 +108,7 @@ aarch64-c29n1-oqa.arm.fedoraproject.org
 aarch64-c30n1-oqa.arm.fedoraproject.org
 
 [appliedmicro]
-buildhw-aarch64-01.arm.fedoraproject.org
+# buildhw-aarch64-01.arm.fedoraproject.org
 buildhw-aarch64-02.arm.fedoraproject.org
 buildhw-aarch64-03.arm.fedoraproject.org
 buildhw-aarch64-04.arm.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index db9f77cd78..8edf92764a 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -36,7 +36,7 @@ composer.stg.phx2.fedoraproject.org
 
 [retrace]
 retrace01.qa.fedoraproject.org
-retrace03.fedorainfracloud.org
+#retrace03.fedorainfracloud.org
 
 [retrace_stg_aws]
 retrace-stg.aws.fedoraproject.org
@@ -186,8 +186,8 @@ mdapi01.phx2.fedoraproject.org
 [mdapi_stg]
 mdapi01.stg.phx2.fedoraproject.org
 
-[minimal]
-bkernel04.phx2.fedoraproject.org
+# [minimal]
+# bkernel04.phx2.fedoraproject.org
 
 [bodhi_backend]
 # This one handles the mashing/releng stuff
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 30007fc506..36bbb9bd01 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -38,7 +38,7 @@ define hostgroup{
 define hostgroup{
        hostgroup_name routers
        alias          routers
-       members        phx2-gw, ibiblio-gw, cloud-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw
+       members        phx2-gw, ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw
 }
 
 
diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
index 3b7b6e90c5..8bb2d1c1ef 100644
--- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
@@ -31,18 +31,6 @@ define host {
 
 }
 
-define host {
-  host_name                    cloud-gw
-  alias                        cloud gateway
-  use                          mincheck
-  check_command                check-host-alive4
-  address                      209.132.184.254
-{% if vars['nagios_location'] == 'internal' %}
-  parents                      phx2-gw
-{% else %}
-  parents                      ibiblio-gw
-{% endif %}
-}
 
 #'dedicatedsolutions'
 define host {