diff --git a/inventory/group_vars/centos-ci b/inventory/group_vars/centos-ci
deleted file mode 100644
index 8c98190eb6..0000000000
--- a/inventory/group_vars/centos-ci
+++ /dev/null
@@ -1,69 +0,0 @@
----
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: sysadmin
-  can_send:
-  - logger.log
-- service: fedmsg
-  owner: root
-  group: root
-  can_send:
-   - ci.pipeline.allpackages-build.complete
-   - ci.pipeline.allpackages-build.image.complete
-   - ci.pipeline.allpackages-build.image.queued
-   - ci.pipeline.allpackages-build.image.running
-   - ci.pipeline.allpackages-build.package.complete
-   - ci.pipeline.allpackages-build.package.ignore
-   - ci.pipeline.allpackages-build.package.ignored
-   - ci.pipeline.allpackages-build.package.queued
-   - ci.pipeline.allpackages-build.package.running
-   - ci.pipeline.allpackages-build.package.test.functional.complete
-   - ci.pipeline.allpackages-build.package.test.functional.queued
-   - ci.pipeline.allpackages-build.package.test.functional.running
-   - ci.pipeline.allpackages-pr.complete
-   - ci.pipeline.allpackages-pr.ignore
-   - ci.pipeline.allpackages-pr.ignored
-   - ci.pipeline.allpackages-pr.image.complete
-   - ci.pipeline.allpackages-pr.image.ignore
-   - ci.pipeline.allpackages-pr.image.ignored
-   - ci.pipeline.allpackages-pr.image.queued
-   - ci.pipeline.allpackages-pr.image.running
-   - ci.pipeline.allpackages-pr.package.complete
-   - ci.pipeline.allpackages-pr.package.ignore
-   - ci.pipeline.allpackages-pr.package.ignored
-   - ci.pipeline.allpackages-pr.package.queued
-   - ci.pipeline.allpackages-pr.package.running
-   - ci.pipeline.allpackages-pr.package.test.functional.complete
-   - ci.pipeline.allpackages-pr.package.test.functional.ignore
-   - ci.pipeline.allpackages-pr.package.test.functional.ignored
-   - ci.pipeline.allpackages-pr.package.test.functional.queued
-   - ci.pipeline.allpackages-pr.package.test.functional.running
-   - ci.pipeline.allpackages-pr.queued
-   - ci.pipeline.allpackages-pr.running
-   - ci.pipeline.complete
-   - ci.pipeline.compose.complete
-   - ci.pipeline.compose.running
-   - ci.pipeline.compose.test.integration.complete
-   - ci.pipeline.compose.test.integration.queued
-   - ci.pipeline.compose.test.integration.running
-   - ci.pipeline.image.complete
-   - ci.pipeline.image.running
-   - ci.pipeline.image.test.smoke.complete
-   - ci.pipeline.image.test.smoke.running
-   - ci.pipeline.package.complete
-   - ci.pipeline.package.ignore
-   - ci.pipeline.package.ignored
-   - ci.pipeline.package.queued
-   - ci.pipeline.package.running
-
-fedmsg_prefix: org.centos
-fedmsg_env: prod
-
-nagios_Check_Services:
-  monitor: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
diff --git a/inventory/group_vars/centos-ci-stg b/inventory/host_vars/relay-stg.ci.centos.org
similarity index 100%
rename from inventory/group_vars/centos-ci-stg
rename to inventory/host_vars/relay-stg.ci.centos.org
diff --git a/inventory/host_vars/relay.ci.centos.org b/inventory/host_vars/relay.ci.centos.org
index 4996e776da..8c98190eb6 100644
--- a/inventory/host_vars/relay.ci.centos.org
+++ b/inventory/host_vars/relay.ci.centos.org
@@ -1,7 +1,69 @@
 ---
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: sysadmin
+  can_send:
+  - logger.log
+- service: fedmsg
+  owner: root
+  group: root
+  can_send:
+   - ci.pipeline.allpackages-build.complete
+   - ci.pipeline.allpackages-build.image.complete
+   - ci.pipeline.allpackages-build.image.queued
+   - ci.pipeline.allpackages-build.image.running
+   - ci.pipeline.allpackages-build.package.complete
+   - ci.pipeline.allpackages-build.package.ignore
+   - ci.pipeline.allpackages-build.package.ignored
+   - ci.pipeline.allpackages-build.package.queued
+   - ci.pipeline.allpackages-build.package.running
+   - ci.pipeline.allpackages-build.package.test.functional.complete
+   - ci.pipeline.allpackages-build.package.test.functional.queued
+   - ci.pipeline.allpackages-build.package.test.functional.running
+   - ci.pipeline.allpackages-pr.complete
+   - ci.pipeline.allpackages-pr.ignore
+   - ci.pipeline.allpackages-pr.ignored
+   - ci.pipeline.allpackages-pr.image.complete
+   - ci.pipeline.allpackages-pr.image.ignore
+   - ci.pipeline.allpackages-pr.image.ignored
+   - ci.pipeline.allpackages-pr.image.queued
+   - ci.pipeline.allpackages-pr.image.running
+   - ci.pipeline.allpackages-pr.package.complete
+   - ci.pipeline.allpackages-pr.package.ignore
+   - ci.pipeline.allpackages-pr.package.ignored
+   - ci.pipeline.allpackages-pr.package.queued
+   - ci.pipeline.allpackages-pr.package.running
+   - ci.pipeline.allpackages-pr.package.test.functional.complete
+   - ci.pipeline.allpackages-pr.package.test.functional.ignore
+   - ci.pipeline.allpackages-pr.package.test.functional.ignored
+   - ci.pipeline.allpackages-pr.package.test.functional.queued
+   - ci.pipeline.allpackages-pr.package.test.functional.running
+   - ci.pipeline.allpackages-pr.queued
+   - ci.pipeline.allpackages-pr.running
+   - ci.pipeline.complete
+   - ci.pipeline.compose.complete
+   - ci.pipeline.compose.running
+   - ci.pipeline.compose.test.integration.complete
+   - ci.pipeline.compose.test.integration.queued
+   - ci.pipeline.compose.test.integration.running
+   - ci.pipeline.image.complete
+   - ci.pipeline.image.running
+   - ci.pipeline.image.test.smoke.complete
+   - ci.pipeline.image.test.smoke.running
+   - ci.pipeline.package.complete
+   - ci.pipeline.package.ignore
+   - ci.pipeline.package.ignored
+   - ci.pipeline.package.queued
+   - ci.pipeline.package.running
+
+fedmsg_prefix: org.centos
+fedmsg_env: prod
+
 nagios_Check_Services:
-  ping: false
+  monitor: false
   nrpe: false
   sshd: false
-  httpd: false
   swap: false
+  ping: false
diff --git a/inventory/inventory b/inventory/inventory
index 02cd0940bc..8a619c5599 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1012,14 +1012,13 @@ value
 [fedmsg-ircs-stg:children]
 value-stg
 
-[centos-ci]
-# This is the centos-ci relay host
+# This group is for "instances" we have in inventory but do not 
+# want to monitor in nagios because they don't really exist as 
+# hosts you can monitor.
+[nixnagios]
+# This is the centos-ci relay hosts as fedmsg sees it
 # We have it added here so we can authorize it to send fedmsgs
 relay.ci.centos.org
-
-[centos-ci-stg]
-# This is the centos-ci relay host
-# We have it added here so we can authorize it to send fedmsgs
 relay-stg.ci.centos.org
 
 [fedmsg-relays:children]
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index bf08f8089b..1d58cb7091 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -3,7 +3,7 @@
 ###############
 ## {{ env }}
 {% for key, value in groups.iteritems()|sort %}
-{% if groups[key] != [] and key != 'newcloud-compute' and key != 'newcloud-control' and key != 'newcloud' %}
+{% if groups[key] != [] and key != 'newcloud-compute' and key != 'newcloud-control' and key != 'newcloud' and key != 'nixnagios' %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}