diff --git a/roles/nagios_server/files/nagios/contactgroups/bodhi.cfg b/roles/nagios_server/files/nagios/contactgroups/bodhi.cfg
index c43f7e42bf..fc8cedaea1 100644
--- a/roles/nagios_server/files/nagios/contactgroups/bodhi.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/bodhi.cfg
@@ -1,6 +1,6 @@
 define contactgroup {
         contactgroup_name       bodhi
         alias                   Bodhi Notifications
-#        members                 bowlofeggs
-        members                 null
+        members                 bowlofeggs
+
 }
diff --git a/roles/nagios_server/files/nagios/contactgroups/build-sysadmin-email.cfg b/roles/nagios_server/files/nagios/contactgroups/build-sysadmin-email.cfg
deleted file mode 100644
index 92f56c5750..0000000000
--- a/roles/nagios_server/files/nagios/contactgroups/build-sysadmin-email.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#define contactgroup{
-#        contactgroup_name       build-sysadmin-email
-#        alias                   Build Sysadmin Email Contacts
-#        members kevin,aditya
-#        }
diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
index e6dec971e2..6fd49f1a9d 100644
--- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
@@ -2,6 +2,6 @@ define contactgroup{
         contactgroup_name       fedora-sysadmin-email
         alias                   Fedora Sysadmin Email Contacts
 # sysadmin-main: @ausil codeblock jstanley @kevin pbrobinson pingou puiterwijk ralph @smooge tflink
-#	members admin,ausil,codeblock,jstanley,kevin,pbrobinson,pingou,puiterwijkp,ralph,smooge,tflink
-	members			null
+	members admin,ausil,codeblock,jstanley,kevin,pbrobinson,pingou,puiterwijkp,ralph,smooge,tflink
+#	members			null
         }
diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
index d2a97c3285..f7acb038c3 100644
--- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
@@ -1,12 +1,11 @@
 define contactgroup{
     contactgroup_name       fedora-sysadmin-pager
     alias                   Fedora Sysadmin Pager Contacts
-#   members 		    smoogep,kevinp,puiterwijkp
-    members 		    null
+    members 		    smoogep,kevinp,puiterwijkp
 }
+
 define contactgroup{
     contactgroup_name       fedora-sysadmin-emergency
     alias                   Fedora Sysadmin Pager Contacts
-#    members 		    smooge-emergency,kevin-emergency,puiterwijk-emergency
-    members 		    null
+    members 		    smooge-emergency,kevin-emergency,puiterwijk-emergency
 }
diff --git a/roles/nagios_server/files/nagios/contactgroups/ppc-secondary-email.cfg b/roles/nagios_server/files/nagios/contactgroups/ppc-secondary-email.cfg
deleted file mode 100644
index cd4c2a3128..0000000000
--- a/roles/nagios_server/files/nagios/contactgroups/ppc-secondary-email.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define contactgroup {
-        contactgroup_name       ppc-secondary-email
-        alias                   Fedora PPC secondary arch Email Contacts
-#	members 		kevin,parasense,karsten
-	members			null
-}
diff --git a/roles/nagios_server/files/nagios/contactgroups/retrace.cfg b/roles/nagios_server/files/nagios/contactgroups/retrace.cfg
deleted file mode 100644
index e99c456c7a..0000000000
--- a/roles/nagios_server/files/nagios/contactgroups/retrace.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define contactgroup {
-        contactgroup_name       retrace-email
-        alias                   Fedora Retrace server Email Contacts
-#	members 		kevin,mtoman
-        members                 null
-}
diff --git a/roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg b/roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg
index ae7696582b..e25dfe84fa 100644
--- a/roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg
@@ -1,6 +1,5 @@
 define contactgroup {
         contactgroup_name       sysadmin-qa-email
         alias                   Fedora SysAdmin QA Email Contacts
-#	members 		sysadmin-qa
-	members                 null
+	members 		sysadmin-qa
 }
diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios_server/files/nagios/hosts/templates.cfg
index ecfc6e0f8c..ee9db1371f 100644
--- a/roles/nagios_server/files/nagios/hosts/templates.cfg
+++ b/roles/nagios_server/files/nagios/hosts/templates.cfg
@@ -24,7 +24,7 @@ define host {
     notification_interval         15
     notifications_enabled         1
     notification_options          d,r
-    contact_groups                fedora-sysadmin-ircbot
+    contact_groups                
     register                      0
 }
 
@@ -52,7 +52,7 @@ define host {
     notification_interval         15
     notifications_enabled         1
     notification_options          d,r
-    contact_groups                ppc-secondary-email
+    contact_groups                fedora-sysadmin-ircbot
     register                      0
 }
 
@@ -66,7 +66,7 @@ define host {
     notification_interval         15
     notifications_enabled         1
     notification_options          d,r
-    contact_groups                retrace-email
+    contact_groups                fedora-sysadmin-ircbot
     register                      0
 }