diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 8863b2cb91..5e30d1790a 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -283,6 +283,23 @@
     - vpnclients.cfg
     - web.cfg
     - wiki.cfg
+
+- name: Build out nagios servicegroup templates
+  template: src=nagios/servicegroups/{{item}}.j2 dest=/etc/nagios/servicegroups/{{item}} mode=0644 owner=root group=root
+  with_items:
+    - bodhi.cfg
+    - fedorahosted.org.cfg
+    - freemedia.cfg
+    - kvmHosts.cfg
+    - mgmt-https.cfg
+    - pkgdb.cfg
+    - fas.cfg
+    - fp-wiki.cfg
+    - ipa.cfg
+    - mgmt-http.cfg
+    - mirrorlist.cfg
+    - retrace.cfg
+
 ##
 ## not implemented yet
 #    - zanata2fedmsg.cfg
diff --git a/roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg b/roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg
deleted file mode 100644
index 40afa49724..0000000000
--- a/roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-define servicegroup {
-    servicegroup_name   ppc-secondary
-    alias               PPC Secondary Hosts
-    members             ppc-koji01.ppc.fedoraproject.org,ppc-koji-frontend
-}
diff --git a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg
deleted file mode 100644
index e69de29bb2..0000000000