diff --git a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2
index 184d6d6d33..9cc8950fca 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2
@@ -1,12 +1,12 @@
 define hostgroup {
         hostgroup_name  bustgateway
         alias           BUSTGATEWAY servers
-        members         {% for host in groups['bustgateway'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['busgateway'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
         hostgroup_name  bustgateway-stg
         alias           STG BUSTGATEWAY servers
-        members         {% for host in groups['bustgateway-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['busgateway-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
diff --git a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
index 9bd1abbe82..d223f0550b 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2
@@ -11,15 +11,15 @@ define hostgroup {
 }
 
 define hostgroup {
-        hostgroup_name  copr-disk-git
-        alias           COPR-DISK-GIT servers
-        members         {% for host in groups['copr-disk-git'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        hostgroup_name  copr-dist-git
+        alias           COPR-DIST-GIT servers
+        members         {% for host in groups['copr-dist-git'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
-        hostgroup_name  copr-disk-git-stg
-        alias           STG COPR-DISK-GIT servers
-        members         {% for host in groups['copr-disk-git-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        hostgroup_name  copr-dist-git-stg
+        alias           STG COPR-DIST-GIT servers
+        members         {% for host in groups['copr-dist-git-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2
index 316f41dd7a..6e67528110 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2
@@ -23,15 +23,15 @@ define hostgroup {
 }
 
 define hostgroup {
-        hostgroup_name  fedmsg-qa
+        hostgroup_name  fedmsg-qa-network
         alias           FEDMSG-QA servers
-        members         {% for host in groups['fedmsg-qa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['fedmsg-qa-network'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
         hostgroup_name  fedmsg-qa-stg
         alias           STG FEDMSG-QA servers
-        members         {% for host in groups['fedmsg-qa-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+        members         {% for host in groups['fedmsg-qa-network-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
 define hostgroup {
diff --git a/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2
index b1cd0e016d..aec41de695 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
-        hostgroup_name  mgmt_systems
+        hostgroup_name  phx2_mgmt_systems
         alias           Non-Ansibled Management Systems
-        members         {% for host in vars['management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+        members         {% for host in vars['phx2_management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
 
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2
index 60ef97e2ef..56aa3eacaa 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2
@@ -4,9 +4,3 @@ define hostgroup {
         members         {% for host in groups['relvalconsumer'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 }
 
-define hostgroup {
-        hostgroup_name  relvalconsumer-stg
-        alias           STG RELVALCONSUMER servers
-        members         {% for host in groups['relvalconsumer-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
-}
-