diff --git a/inventory/host_vars/db-fas01.iad2.fedoraproject.org b/inventory/host_vars/db-fas01.iad2.fedoraproject.org
index 343d5790bf..f9554beba4 100644
--- a/inventory/host_vars/db-fas01.iad2.fedoraproject.org
+++ b/inventory/host_vars/db-fas01.iad2.fedoraproject.org
@@ -44,3 +44,13 @@ nrpe_procs_crit: 800
 db_backup_dir: ['/backups']
 shared_buffers: "2GB"
 effective_cache_size: "6GB"
+
+nagios_Can_Connect: false
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/ipa01.iad2.fedoraproject.org b/inventory/host_vars/ipa01.iad2.fedoraproject.org
index de360e31e4..924f1eb505 100644
--- a/inventory/host_vars/ipa01.iad2.fedoraproject.org
+++ b/inventory/host_vars/ipa01.iad2.fedoraproject.org
@@ -8,3 +8,13 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.3.163.54
 vmhost: vmhost-x86-02.iad2.fedoraproject.org
 datacenter: iad2
+
+nagios_Can_Connect: false
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/ipa02.iad2.fedoraproject.org b/inventory/host_vars/ipa02.iad2.fedoraproject.org
index 8c9444ee55..0e0455ce6e 100644
--- a/inventory/host_vars/ipa02.iad2.fedoraproject.org
+++ b/inventory/host_vars/ipa02.iad2.fedoraproject.org
@@ -8,3 +8,13 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.3.163.55
 vmhost: vmhost-x86-03.iad2.fedoraproject.org
 datacenter: iad2
+
+nagios_Can_Connect: false
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/ns01.iad2.fedoraproject.org b/inventory/host_vars/ns01.iad2.fedoraproject.org
index 85feaae09b..03624717ad 100644
--- a/inventory/host_vars/ns01.iad2.fedoraproject.org
+++ b/inventory/host_vars/ns01.iad2.fedoraproject.org
@@ -13,17 +13,12 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 vmhost: vmhost-x86-01.iad2.fedoraproject.org
 datacenter: iad2
 
-csi_relationship: |
- 
-    ns01 is a master dns server. 
-    It serves about every domain under fedoraproject, fedo*, as well as others, both forward and reverse. 
+nagios_Can_Connect: false
 
-    * This host relies on:
-    - The virthost it's hosted on (vmhost-x86-01.iad2.fedoraproject.org)
-    - batcave for dns git and keys
-    - connectivity to maxmind to create geoIP dns acl
-    
-    * Things that rely on this host:
-    - The Internet/Community to resolve everything related to fedora and reverse-IP for allocated subnets
-    - If this host is down, dns queries will slow down by the portion of this host to the total name servers responsible for the same domain set.
-    - secodary/slave dns servers
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/ns02.iad2.fedoraproject.org b/inventory/host_vars/ns02.iad2.fedoraproject.org
index ac94b0afcf..15669108b5 100644
--- a/inventory/host_vars/ns02.iad2.fedoraproject.org
+++ b/inventory/host_vars/ns02.iad2.fedoraproject.org
@@ -13,17 +13,12 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 vmhost: vmhost-x86-02.iad2.fedoraproject.org
 datacenter: iad2
 
-csi_relationship: |
- 
-    ns02 is a master dns server. 
-    It serves about every domain under fedoraproject, fedo*, as well as others, both forward and reverse. 
+nagios_Can_Connect: false
 
-    * This host relies on:
-    - The virthost it's hosted on (vmhost-x86-01.iad2.fedoraproject.org)
-    - batcave for dns git and keys
-    - connectivity to maxmind to create geoIP dns acl
-    
-    * Things that rely on this host:
-    - The Internet/Community to resolve everything related to fedora and reverse-IP for allocated subnets
-    - If this host is down, dns queries will slow down by the portion of this host to the total name servers responsible for the same domain set.
-    - secodary/slave dns servers
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/sundries01.iad2.fedoraproject.org b/inventory/host_vars/sundries01.iad2.fedoraproject.org
index a9dca538cc..15d8468a1a 100644
--- a/inventory/host_vars/sundries01.iad2.fedoraproject.org
+++ b/inventory/host_vars/sundries01.iad2.fedoraproject.org
@@ -15,3 +15,13 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 # This overrides a group var and lets the playbook know that we should
 # install special cron jobs here.
 master_sundries_node: False
+
+nagios_Can_Connect: false
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
index 176266a0d3..a010fedc85 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
     hostgroup_name   retrace
-    alias               Retrace Hosts
+    alias            Retrace Hosts
     members         {% for host in groups['retrace']|sort %}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
index 5a5837eef9..2ccfcfcfa5 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2 {% if not loop.last %} , {% endif %}{% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2, {% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
index 67c0a85e8f..34ed997606 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
@@ -1,7 +1,14 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki , {% endif %}{% endfor %}{% for host in groups['proxies'|sort] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached  {% if not loop.last %} , {% endif %}{% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki, {% endif %}{% endfor %}
+
+}
+
+define servicegroup {
+    servicegroup_name   fp-wiki-non-cached
+    alias               Fedora Project Wiki
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached, {% endif %}{% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
index 570d1f2727..73454f745d 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   freemedia
     alias               FreeMedia
-    members             {% for host in groups['sundries'] %}{{host}}, http-freemedia-internal  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['sundries'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal, {% endif %} {% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
index e2098f25d4..ccab9ee464 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   ipa
     alias               IPA Servers
-    members             {% for host in groups['ipa'] %}{{host}}, IPA Replication Status  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, IPA Replication Status , {% endif%}{% endfor %}
 
 }