diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index c59ccbb27f..ef65b0fa1e 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -1,12 +1,12 @@
 define service {
-  hostgroup_name	virtservers
+  hostgroup_name	all,!cloud
   service_description   Disk_Space_/
   check_command		check_by_nrpe!check_disk_/
   use                   disktemplate
 }
 
 define service {
-  hostgroup_name	virtservers,proxies
+  hostgroup_name	all,!cloud
   service_description   Disk Space /boot
   check_command         check_by_nrpe!check_disk_/boot
   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 19698a63d3..59d27944bf 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -4,14 +4,12 @@
 ## {{ env }}
 
 {% for key, value in groups.iteritems() %}
-{% if groups[key] and key !='all' %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}
        members        {% for host in groups[key] %}{{host}}, {% endfor %} 
 
 }
-{% endif %}
 {% endfor %}