diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 0e13c13938..49223faf75 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -193,7 +193,6 @@
     - file_age.cfg
     - fmn.cfg
     - haproxy.cfg
-    - ipa.cfg
     - koji.cfg
     - koschei.cfg
     - locking.cfg
@@ -326,6 +325,7 @@
 - name: Template over services (internal)
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
+    - ipa.cfg
     - phx2-mgmt.cfg
     - mirrorlist-proxies.cfg
   when: env == "production" and 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
index 9bb9ccde98..9647905bda 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   freemedia
     alias               FreeMedia
-    members             {% for host in groups['sundries'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal{% if not loop.last %}, {% endif %}{% endif %} {% endfor %}
+    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/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
index edbcb3b508..1439a6049e 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
@@ -1,6 +1,4 @@
 define servicegroup {
     servicegroup_name   ipa
     alias               IPA Servers
-    members             {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, IPA Replication Status{% if not loop.last %}, {% endif %}{% endif%}{% endfor %}
-
 }
diff --git a/roles/nagios_server/files/nagios/services/ipa.cfg b/roles/nagios_server/templates/nagios/services/ipa.cfg.j2
similarity index 50%
rename from roles/nagios_server/files/nagios/services/ipa.cfg
rename to roles/nagios_server/templates/nagios/services/ipa.cfg.j2
index 675242ec4c..118b9f41ee 100644
--- a/roles/nagios_server/files/nagios/services/ipa.cfg
+++ b/roles/nagios_server/templates/nagios/services/ipa.cfg.j2
@@ -1,6 +1,7 @@
 define service {
-  host_name             ipa01.phx2.fedoraproject.org,ipa02.phx2.fedoraproject.org
+  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
+  servicegroups		ipa
 }