diff --git a/pillar/top.sls b/pillar/top.sls
index dcc7d3a28..bf024aa8a 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -8,4 +8,4 @@ base:
     - masters.schedule
     - masters.{{ grains.host }}
     - static
-    - firewall
+    - firewall.*
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 66fee7910..d3766f48b 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -296,6 +296,5 @@ so-elastalert:
     - binds:
       - /etc/elastalert/rules/:/etc/elastalert/rules/
       - /opt/so/log/elastalert:/var/log/elastalert
-    - network_mode: so-elastic-net
 
 {% endif %}
diff --git a/salt/idstools/init.sls b/salt/idstools/init.sls
index 9cbbe25fd..11750a606 100644
--- a/salt/idstools/init.sls
+++ b/salt/idstools/init.sls
@@ -59,4 +59,4 @@ so-idstools:
     - binds:
       - /opt/so/conf/idstools/etc:/opt/so/idstools/etc:ro
       - /opt/so/rules/nids:/opt/so/rules/nids:rw
-    - network_mode: so-elastic-net
+
diff --git a/salt/top.sls b/salt/top.sls
index ed454a9d5..e33b7efae 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -17,6 +17,7 @@ base:
     - common
     - ca
     - ssl
+    - firewall
     - master
     - idstools
     - redis