diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index ac3eb4ad23..25a1e7851b 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -1,5 +1,5 @@
 define service {
-  hostgroup_name	all,!cloud,!mincheck
+  hostgroup_name	all,!cloud,!mincheckgrp
   service_description   Disk_Space_/
   check_command		check_by_nrpe!check_disk_/
   use                   disktemplate
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 18bd90707f..11d96f0500 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -14,6 +14,13 @@ define hostgroup{
 {% endif %}
 {% endfor %}
 
+## Services with minimal monitoring
+define hostgroup{
+       hostgroup_name mincheckgrp
+       alias          mincheckgrp
+       members        {% for host in groups[key] %}{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}{{host}}, {% endif %}{% endfor %} 
+
+}
 
 ##
 ## Management hardware