diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 84ed0c4076..89b4b3e40a 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -3,8 +3,8 @@
 ###############
 ## {{ env }}
 
-{% for key, value in groups.iteritems() %}
 {% if env == "staging" %}
+{% for key, value in groups.iteritems() %}
 {% if groups[key] %}
 
 define hostgroup{
@@ -15,7 +15,11 @@ define hostgroup{
 }
 
 {% endif %}
+{% endfor %}
+
 {% else %}
+
+{% for key, value in groups.iteritems() %}
 {% if groups[key] %}
 define hostgroup{
        hostgroup_name {{ key }}
@@ -23,11 +27,11 @@ define hostgroup{
        members        {% for host in groups[key] %}{{host}}, {% endfor %} 
 
 }
-
-
-{$ endif %}
 {% endfor %}
 
+
+{% endif %}
+
 ##
 ## Management hardware
 define hostgroup {