diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 38bed32338..a71e53dfca 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -22,7 +22,25 @@ define hostgroup{
        members        {% for host in groups[key] %}{{host}}, {% endfor %} 
 
 }
+{% endif %}
 {% endfor %}
 
+##
+## VPN clients
+define hostgroup {
+        hostgroup_name  vpnclients
+        alias           vpnclients
+        members         {% for host in groups['all'] %}{% if hostvars[host].vpn %}{{host}},{% endif %} {% endfor %}
+
+}
 
 {% endif %}
+
+##
+## Management hardware
+define hostgroup {
+        hostgroup_name  phx2_mgmt_systems
+        alias           phx2_mgmt_systems
+        members         {% for host in vars['phx2_management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+
+}