diff --git a/pillar/firewall/minions.sls b/pillar/firewall/minions.sls
new file mode 100644
index 000000000..fd8e03672
--- /dev/null
+++ b/pillar/firewall/minions.sls
@@ -0,0 +1,2 @@
+minion_ips:
+  - 127.0.0.1
\ No newline at end of file
diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls
index ef969761f..b6ff6e549 100644
--- a/salt/firewall/init.sls
+++ b/salt/firewall/init.sls
@@ -1,3 +1,6 @@
+{% set minions = salt['pillar.get']('firewall.minions', {}) %}
+# Default Rules for everyone
+
 # Keep localhost in the game
 iptables_allow_localhost:
   iptables.append:
@@ -43,7 +46,44 @@ enable_reject_policy:
     - chain: INPUT
     - policy: DROP
     - require:
-      - firewall: iptables_allow_localhost
-      - firewall: iptables_allow_established
-      - firewall: iptables_allow_ssh
-      - firewall: iptables_allow_pings
\ No newline at end of file
+      - iptables: iptables_allow_localhost
+      - iptables: iptables_allow_established
+      - iptables: iptables_allow_ssh
+      - iptables: iptables_allow_pings
+
+# Rules if you are a Master
+{% if grains['role'] == 'so-master' %}
+{% for ip in minions.get('minion_ips', []) %}
+
+  enable_salt_minions_4505:
+    iptables.append:
+      - table: filter
+      - chain: INPUT
+      - jump: ACCEPT
+      - proto: tcp
+      - source: {{ ip }}
+      - dport: 4505
+      - save: True
+
+  enable_salt_minions_4506:
+    iptables.append:
+      - table: filter
+      - chain: INPUT
+      - jump: ACCEPT
+      - proto: tcp
+      - source: {{ ip }}
+      - dport: 4506
+      - save: True
+{% endfor %}
+{% endif %}
+
+# Rules if you are a Storage Node
+
+# Rules if you are a Sensor
+{% if grains['role'] == 'so-sensor' %}
+
+{% endif %}
+
+# Rules if you are a Hot Node
+
+# Rules if you are a Warm Node