diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
index 635ab6c97e..007bae06e7 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members         {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-bodhi  {% if not loop.last %} , {% endif %} {% endfor %}
+    members         {% for host in groups['bodhi2'] %}{{host}}, http-bodhi2-internal, {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-bodhi2  {% if not loop.last %} , {% endif %} {% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2
index f1734fdfcf..99ba710554 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2
@@ -1,7 +1,14 @@
 define servicegroup {
-    servicegroup_name   pkgdb
+    servicegroup_name   pkgdb-internal
     alias               Package Database
-    members         {% for host in groups['pkgdb'] %}{{host}}, http-pkgdb-external,{{host}}, http-pkgdb-internal {% if not loop.last %} , {% endif %} {% endfor %}
+    members         {% for host in groups['pkgdb'] %} {{host}}, http-pkgdb-internal {% if not loop.last %} , {% endif %} {% endfor %}
 
 }
 
+# define servicegroup {
+#     servicegroup_name   pkgdb-external
+#     alias               Package Database
+#     members         {% for host in groups['pkgdb'] %} {{host}}, http-pkgdb-external {% if not loop.last %} , {% endif %} {% endfor %}
+
+# }
+