diff --git a/roles/nagios_server/files/nagios/servicegroups/phx2-mgmt-http.cfg b/roles/nagios_server/files/nagios/servicegroups/phx2-mgmt-http.cfg
new file mode 100644
index 0000000000..3e9daa2cfa
--- /dev/null
+++ b/roles/nagios_server/files/nagios/servicegroups/phx2-mgmt-http.cfg
@@ -0,0 +1,9 @@
+define servicegroup {
+    servicegroup_name   mgmt-http
+    alias               mgmt interfaces on http
+}
+
+define servicegroup {
+    servicegroup_name   mgmt-https
+    alias               mgmt interfaces on https
+}
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 661bae3939..45183ccdc6 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -434,7 +434,6 @@
 - 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:
-    - mgmt-https.cfg
     - mgmt-http.cfg
   when: nagios_location == "internal"
   tags:
diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2
deleted file mode 100644
index c1be521763..0000000000
--- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-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 %}
-
-}
diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2
deleted file mode 100644
index b4120058ab..0000000000
--- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-define servicegroup {
-    servicegroup_name   mgmt-https
-    alias               mgmt interfaces on https
-    members 		{% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https  {% if not loop.last %} , {% endif %}{% endfor %}
-
-}
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 e64a52da33..4c65b0fdc5 100644
--- a/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/phx2-mgmt.cfg.j2
@@ -1,11 +1,12 @@
 # HTTP
 
-{% for host in vars['phx2_management_hosts'] %}
+{% for host in vars['phx2_management_hosts']|sort %}
  define service {
    host_name             {{ host }}
    service_description   {{ host }}-http
    check_command         check_http!{{ host }}
    use                   defaulttemplate
+   servicegroups	 mgmt-http
  }
  
  define service {
@@ -13,6 +14,7 @@
    service_description   {{ host }}-https
    check_command         check_https!{{ host }}
    use                   defaulttemplate
+   servicegroups	 mgmt-https
  }