diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 36bbb9bd01..cd42e1da82 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -38,7 +38,7 @@ define hostgroup{
 define hostgroup{
        hostgroup_name routers
        alias          routers
-       members        phx2-gw, ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw
+       members        phx2-gw, ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, iad2-gw
 }
 
 
diff --git a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
index 4236e85a8a..5b0e7246f2 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  CheckSwap
         alias           Swap-Is-Low
-        members         {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['swap'] == true and hostvars[host].nagios_Can_Connect == true %}{{host}}{% if not loop.last %},{% endif %} {% endif %} {% endfor %}
+        members         {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Can_Connect == true and hostvars[host].nagios_Check_Services['swap'] == true and hostvars[host].nagios_Can_Connect == true %}{{host}}{% if not loop.last %},{% endif %} {% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
index 53df68536c..b00249500f 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  nomail
         alias           Detect For 0 Mail In Queue
-        members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] == true and hostvars[host].nagios_Check_Services['mail'] == true%}{{host}}, {% endif %}{% endfor %}
+        members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Can_Connect == true and hostvars[host].nagios_Check_Services['nrpe'] == true and hostvars[host].nagios_Check_Services['mail'] == true%}{{host}}, {% endif %}{% endfor %}
 
 }