diff --git a/inventory/host_vars/bastion01.iad2.fedoraproject.org b/inventory/host_vars/bastion01.iad2.fedoraproject.org
index 4f2ff70781..42d1a56666 100644
--- a/inventory/host_vars/bastion01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bastion01.iad2.fedoraproject.org
@@ -19,3 +19,6 @@ ssh_hostnames:
 - bastion01.fedoraproject.org
 
 nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/batcave01.iad2.fedoraproject.org b/inventory/host_vars/batcave01.iad2.fedoraproject.org
index 4ebc1cd20d..2f4d3975b1 100644
--- a/inventory/host_vars/batcave01.iad2.fedoraproject.org
+++ b/inventory/host_vars/batcave01.iad2.fedoraproject.org
@@ -28,3 +28,8 @@ sar_output_file: koji.json
 # SSH into batcave through VPN, like from bastion in a different DC.
 ssh_hostnames:
 - batcave01.vpn.fedoraproject.org
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/log01.iad2.fedoraproject.org b/inventory/host_vars/log01.iad2.fedoraproject.org
index 7b1c26091b..deca031355 100644
--- a/inventory/host_vars/log01.iad2.fedoraproject.org
+++ b/inventory/host_vars/log01.iad2.fedoraproject.org
@@ -23,3 +23,8 @@ num_cpus: 16
 fas_client_groups: fi-apprentice,sysadmin-veteran,sysadmin-logs,sysadmin-noc,sysadmin-atomic
 
 #host_backup_targets: ['/var/log']
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/noc01.iad2.fedoraproject.org b/inventory/host_vars/noc01.iad2.fedoraproject.org
index cd2b39ea13..1aec8e3b9d 100644
--- a/inventory/host_vars/noc01.iad2.fedoraproject.org
+++ b/inventory/host_vars/noc01.iad2.fedoraproject.org
@@ -25,3 +25,8 @@ custom_rules: [
 
 nagios_srcdir: 'nagios'
 nagios_location: 'internal'
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/ns01.iad2.fedoraproject.org b/inventory/host_vars/ns01.iad2.fedoraproject.org
index 134e25243b..b6f764d4e1 100644
--- a/inventory/host_vars/ns01.iad2.fedoraproject.org
+++ b/inventory/host_vars/ns01.iad2.fedoraproject.org
@@ -14,7 +14,9 @@ vmhost: vmhost-x86-01.iad2.fedoraproject.org
 datacenter: iad2
 
 nagios_Can_Connect: false
-
+nagios_Check_Services:
+  nrpe: false
+  ping: false
 
 csi_relationship: |
  
diff --git a/inventory/host_vars/tang01.iad2.fedoraproject.org b/inventory/host_vars/tang01.iad2.fedoraproject.org
index b2154241fd..fe9f39fe8f 100644
--- a/inventory/host_vars/tang01.iad2.fedoraproject.org
+++ b/inventory/host_vars/tang01.iad2.fedoraproject.org
@@ -16,3 +16,8 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 lvm_size: 20000
 mem_size: 4096
 num_cpus: 2
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/tang02.iad2.fedoraproject.org b/inventory/host_vars/tang02.iad2.fedoraproject.org
index 4c0b236282..a052156518 100644
--- a/inventory/host_vars/tang02.iad2.fedoraproject.org
+++ b/inventory/host_vars/tang02.iad2.fedoraproject.org
@@ -16,3 +16,8 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 lvm_size: 20000
 mem_size: 4096
 num_cpus: 2
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org
index 11e905bb30..47b93e7c2c 100644
--- a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.11
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org
index 967a42984e..b9096a424b 100644
--- a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.12
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org
index b4a2760446..515f85474e 100644
--- a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.13
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org
index 170adc5fe5..d28e2f0bae 100644
--- a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.14
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org
index f4f43d8e33..1e8c401145 100644
--- a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.15
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org
index d37092e0ca..1881b25a76 100644
--- a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.16
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false
diff --git a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org
index fde297051e..8223a25f86 100644
--- a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org
@@ -1,6 +1,5 @@
 ---
 datacenter: iad2
-nagios_Can_Connect: false
 
 br0_ip: 10.3.163.17
 br0_nm: 255.255.255.0
@@ -8,3 +7,8 @@ br0_gw: 10.3.163.254
 br0_dev: eno1
 
 dns: 10.3.163.33
+
+nagios_Can_Connect: false
+nagios_Check_Services:
+  nrpe: false
+  ping: false