diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 37da5a1035..cd42e1da82 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -13,6 +13,28 @@ define hostgroup{
 {% endif %}
 {% endfor %}
 
+define hostgroup{
+       hostgroup_name no_ping
+       alias          no_ping
+       members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['ping'] == true or hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} 
+}
+
+## Services with minimal monitoring
+
+define hostgroup{
+       hostgroup_name cloud_aws_group
+       alias          cloud_aws_group
+       members        {% for host in groups['cloud_aws']|sort %}{{host}}, {% endfor %} 
+}
+
+
+define hostgroup{
+       hostgroup_name mincheckgrp
+       alias          mincheckgrp
+       members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] != true and hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} 
+
+}
+
 define hostgroup{
        hostgroup_name routers
        alias          routers
@@ -20,3 +42,11 @@ define hostgroup{
 }
 
 
+##
+## Management hardware
+define hostgroup {
+        hostgroup_name  phx2_mgmt_systems
+        alias           phx2_mgmt_systems
+        members         {% for host in vars['phx2_management_hosts']|sort %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+
+}