diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
index d8b3584cff..50be8f2e33 100644
--- a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,proxy12-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal
+    members             proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,proxy12-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal
 
 }
 
diff --git a/roles/nagios_server/files/nagios/servicegroups/fas.cfg b/roles/nagios_server/files/nagios/servicegroups/fas.cfg
index 85a8f5822a..bf0385cd9a 100644
--- a/roles/nagios_server/files/nagios/servicegroups/fas.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/fas.cfg
@@ -1,5 +1,5 @@
 define servicegroup {
     servicegroup_name   fas
     alias               Fedora Account System
-    members             proxy01-wildcard,accounts,proxy02-wildcard,accounts,proxy03-fpo,accounts,proxy04-fpo,accounts,proxy08-wildcard,proxy12-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,proxy12-fpo,accounts,proxy06-fpo,accounts
+    members             proxy01-wildcard,accounts,proxy02-wildcard,accounts,proxy03-fpo,accounts,proxy04-fpo,accounts,proxy08-wildcard,accounts,proxy12-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,accounts,proxy12-fpo,accounts,proxy06-fpo,accounts
 }
diff --git a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
index 7616db7bf7..becac60d9d 100644
--- a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             proxy01-fpo,fedoraproject.org - wiki - non-cached,proxy02-fpo,fedoraproject.org - wiki - non-cached,proxy03-fpo,fedoraproject.org - wiki - non-cached,proxy04-fpo,fedoraproject.org - wiki - non-cached,proxy06-fpo,fedoraproject.org - wiki - non-cached,proxy07-fpo,fedoraproject.org - wiki - non-cached,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki - non-cached,proxy01-fpo,fedoraproject.org - wiki,proxy02-fpo,fedoraproject.org - wiki,proxy03-fpo,fedoraproject.org - wiki,proxy04-fpo,fedoraproject.org - wiki,proxy06-fpo,fedoraproject.org - wiki,proxy07-fpo,fedoraproject.org - wiki,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki,proxy05-fpo,fedoraproject.org - wiki,proxy10-fpo,fedoraproject.org - wiki,proxy11-fpo,proxy12-fpo,fedoraproject.org - wiki
+    members             proxy01-fpo,fedoraproject.org - wiki - non-cached,proxy02-fpo,fedoraproject.org - wiki - non-cached,proxy03-fpo,fedoraproject.org - wiki - non-cached,proxy04-fpo,fedoraproject.org - wiki - non-cached,proxy06-fpo,fedoraproject.org - wiki - non-cached,proxy07-fpo,fedoraproject.org - wiki - non-cached,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki - non-cached,proxy01-fpo,fedoraproject.org - wiki,proxy02-fpo,fedoraproject.org - wiki,proxy03-fpo,fedoraproject.org - wiki,proxy04-fpo,fedoraproject.org - wiki,proxy06-fpo,fedoraproject.org - wiki,proxy07-fpo,fedoraproject.org - wiki,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki,proxy05-fpo,fedoraproject.org - wiki,proxy10-fpo,fedoraproject.org - wiki,proxy11-fpofedoraproject.org - wiki,proxy12-fpo,fedoraproject.org - wiki
 }
 
diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg
index 4f52f062b8..b5d27347c5 100644
--- a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   mirrorlist
     alias               Mirrorlist
-    members             proxy01-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy02-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy03-fpo,mirrors.fedoraproject.org - mirrorlist,proxy04-fpo,mirrors.fedoraproject.org - mirrorlist,proxy06-fpo,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,proxy12-fpo,mirrors.fedoraproject.org - mirrorlist
+    members             proxy01-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy02-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy03-fpo,mirrors.fedoraproject.org - mirrorlist,proxy04-fpo,mirrors.fedoraproject.org - mirrorlist,proxy06-fpo,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,mirrors.fedoraproject.org,proxy12-fpo,mirrors.fedoraproject.org - mirrorlist
 }
 
diff --git a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
index 056bbdfc29..a75ee7a547 100644
--- a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   pkgdb
     alias               Package Database
-    members             proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-fpo,pkgdb-external,proxy08-wildcard,proxy09-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11-fpo,proxy12-fpo,Check PackageDB DB
+    members             proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-fpo,pkgdb-external,proxy08-wildcard,proxy09-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11-fpo,Check PackageDB DB,proxy12-fpo,Check PackageDB DB
 }