diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index a1b86a1b39..b724e914d6 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -132,7 +132,7 @@ iad2_external:
 # to add that group to this list. Other items on this list are ones
 # where it is an enormous group not needed.
 # Exclude these ansible host groups in hostgroups/all.cfg
-exclude_hostgroups:
+exclude_phx2_hostgroups:
   - nixnagios
   - dbgserver_stg
   - virt_guest
@@ -144,3 +144,16 @@ exclude_hostgroups:
   - datacenter_iad2
   - buildvm_ppc64le_iad2
   - sign_vault
+  - bugzilla2fedmsg
+  - github2fedmsg
+  - moksha_hubs
+  - rabbitmq
+
+exclude_iad2_hostgroups:
+  - nixnagios
+  - dbgserver_stg
+  - virt_guest
+  - virt_host
+  - iad2
+  - openqa_iad
+  - sign_vault
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2
index 63816f2877..0a9fd1b26a 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all-iad2.cfg.j2
@@ -3,7 +3,7 @@
 ###############
 ## {{ env }}
 {% for key, value in groups.items()|sort %}
-{% if groups[key] != [] and key not in vars['exclude_hostgroups'] %}
+{% if groups[key] != [] and key not in vars['exclude_iad2_hostgroups'] %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 4151725b5e..e5bf180ff3 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.items()|sort %}
-{% if groups[key] != [] and key not in vars['exclude_hostgroups'] %}
+{% if groups[key] != [] and key not in vars['exclude_phx2_hostgroups'] %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}