diff --git a/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg b/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg
new file mode 100644
index 0000000000..e4b0ac1c28
--- /dev/null
+++ b/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg
@@ -0,0 +1,5 @@
+define servicegroup {
+    servicegroup_name   freemedia
+    alias               FreeMedia
+}
+
diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/files/nagios/servicegroups/ipa.cfg
similarity index 100%
rename from roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
rename to roles/nagios_server/files/nagios/servicegroups/ipa.cfg
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 49223faf75..7b4828a858 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -435,11 +435,9 @@
   template: src=nagios/servicegroups/{{item}}.j2 dest=/etc/nagios/servicegroups/{{item}} mode=0644 owner=root group=root
   with_items:
     - bodhi.cfg
-    - freemedia.cfg
     - mgmt-https.cfg
     - fas.cfg
     - fp-wiki.cfg
-    - ipa.cfg
     - mgmt-http.cfg
     - mirrorlist.cfg
   when: nagios_location == "internal"
diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
deleted file mode 100644
index 9647905bda..0000000000
--- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-define servicegroup {
-    servicegroup_name   freemedia
-    alias               FreeMedia
-    members             {% for host in groups['sundries']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal{% if not loop.last %}, {% endif %}{% endif %} {% endfor %}
-
-}
-
diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2
index 5afb2ea36a..c1be521763 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   mgmt-http
     alias               mgmt interfaces on http
-    members 		{% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http  {% if not loop.last %} , {% endif %}{% endfor %}
+    members            {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http  {% if not loop.last %} , {% endif %}{% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/services/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/services/ipa.cfg.j2
index 118b9f41ee..d8fe25d82f 100644
--- a/roles/nagios_server/templates/nagios/services/ipa.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/ipa.cfg.j2
@@ -1,5 +1,6 @@
 define service {
   host_name             {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}},{% endif%}{% endfor %}
+
   service_description   IPA Replication Status
   check_command         check_by_nrpe!check_ipa_replication
   use                   lighttemplate
diff --git a/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2 b/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2
index 921c4f2c20..e64a52da33 100644
--- a/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2
@@ -1,20 +1,19 @@
 # HTTP
 
 {% for host in vars['phx2_management_hosts'] %}
-define service {
-  host_name             {{ host }}
-  service_description   {{ host }}-http
-  check_command         check_http!{{ host }}
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             {{ host }}
-  service_description   {{ host }}-https
-  check_command         check_https!{{ host }}
-  use                   defaulttemplate
-}
-
+ define service {
+   host_name             {{ host }}
+   service_description   {{ host }}-http
+   check_command         check_http!{{ host }}
+   use                   defaulttemplate
+ }
+ 
+ define service {
+   host_name             {{ host }}
+   service_description   {{ host }}-https
+   check_command         check_https!{{ host }}
+   use                   defaulttemplate
+ }
+ 
 
 {% endfor %}
-
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 61fe6ef5db..8861194dc0 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -40,6 +40,7 @@ define service {
   service_description   http-mirrors.fedoraproject.org-mirrorlist
   check_command         check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development
   use                   websitetemplate
+  servicegroups		mirrorlist
 }
 
 define service {
@@ -290,6 +291,7 @@ define service {
   service_description   http-freemedia-internal
   check_command         check_website!localhost!/freemedia/FreeMedia-form.html!Media
   use                   internalwebsitetemplate
+  servicegroups         freemedia
 }