diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls
index f2d916a0a..8d0442db8 100644
--- a/salt/firewall/init.sls
+++ b/salt/firewall/init.sls
@@ -114,6 +114,40 @@ enable_maternode_redis_6379_{{ip}}:
     - position: 1
     - save: True
 
+enable_masternode_kibana_5601_{{ip}}:
+  iptables.insert:
+    - table: filter
+    - chain: DOCKER-USER
+    - jump: ACCEPT
+    - proto: tcp
+    - source: {{ ip }}
+    - dport: 5601
+    - position: 1
+    - save: True
+
+enable_masternode_ES_9200_{{ip}}:
+  iptables.insert:
+    - table: filter
+    - chain: DOCKER-USER
+    - jump: ACCEPT
+    - proto: tcp
+    - source: {{ ip }}
+    - dport: 9200
+    - position: 1
+    - save: True
+
+enable_masternode_ES_9300_{{ip}}:
+  iptables.insert:
+    - table: filter
+    - chain: DOCKER-USER
+    - jump: ACCEPT
+    - proto: tcp
+    - source: {{ ip }}
+    - dport: 9300
+    - position: 1
+    - save: True
+
+
 {% endfor %}
 
 # Make it so all the minions can talk to salt and update etc.
@@ -237,6 +271,18 @@ enable_standard_analyst_443_{{ip}}:
     - position: 1
     - save: True
 
+#THIS IS TEMPORARY
+enable_standard_analyst_5601_{{ip}}:
+  iptables.insert:
+    - table: filter
+    - chain: DOCKER-USER
+    - jump: ACCEPT
+    - proto: tcp
+    - source: {{ ip }}
+    - dport: 5601
+    - position: 1
+    - save: True
+
 {% endfor %}
 
 # Rules for storage nodes connecting to master
diff --git a/salt/top.sls b/salt/top.sls
index b7dd9cbf2..6b6b44374 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -2,6 +2,7 @@ base:
   'G@role:so-sensor':
     - ssl
     - common
+    - firewall
     - pcap
     - suricata
     - bro
@@ -29,26 +30,31 @@ base:
   'G@role:so-node and I@node:node_type:parser':
     - match: pillar
     - common
+    - firewall
     - logstash
 
   'G@role:so-node and I@node:node_type:hot':
     - match: pillar
     - common
+    - firewall
     - logstash
     - elasticsearch
 
   'G@role:so-node and I@node:node_type:warm':
     - match: pillar
     - common
+    - firewall
     - elasticsearch
 
   'G@role:so-node and I@node:node_type:storage':
     - match: compound
     - common
+    - firewall
     - logstash
     - elasticsearch
 
   'G@role:mastersensor':
     - common
+    - firewall
     - sensor
     - master
diff --git a/so-setup-network.sh b/so-setup-network.sh
index cd0f0ecfe..35de9273b 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -621,6 +621,8 @@ set_initial_firewall_policy() {
   get_main_ip
   if [ $INSTALLTYPE == 'MASTERONLY' ]; then
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/minions.sls
+    printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/masterfw.sls
+
 
   fi
   if [ $INSTALLTYPE == 'SENSORONLY' ]; then