diff --git a/nixos/hosts/osaka-linode-01/firewall.nix b/nixos/hosts/osaka-linode-01/firewall.nix
index 36ef7284..7f609a7c 100644
--- a/nixos/hosts/osaka-linode-01/firewall.nix
+++ b/nixos/hosts/osaka-linode-01/firewall.nix
@@ -22,22 +22,77 @@
   ];
 
   networking.firewall.extraCommands     = '' 
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 80    -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 443   -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 25    -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 465   -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 587   -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 143   -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 993   -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 4190  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 42420 -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 25565 -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 1443  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 4443  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 5222  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 5347  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 5280  -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 10000 -j DNAT --to-destination 10.100.0.2
-    iptables -t nat -A PREROUTING -i enp0s4 -d 172.234.84.222 --dport 3478  -j DNAT --to-destination 10.100.0.2
+    iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+    iptables -t nat -A POSTROUTING -s 10.100.0.2 -j SNAT --to 172.234.84.222
+
+    # TCP PORTS ##################################################################################################
+    # PORT 80
+    iptables -t nat -A PREROUTING  -p tcp --dport 80 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 80 -j MASQUERADE
+    
+    # PORT 443
+    iptables -t nat -A PREROUTING  -p tcp --dport 443 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 443 -j MASQUERADE
+    
+    # PORT 25  
+    iptables -t nat -A PREROUTING  -p tcp --dport 25 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 25 -j MASQUERADE
+    
+    # PORT 465 
+    iptables -t nat -A PREROUTING  -p tcp --dport 465 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 465 -j MASQUERADE
+    
+    # PORT 587 
+    iptables -t nat -A PREROUTING  -p tcp --dport 587 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 587 -j MASQUERADE
+    
+    # PORT 143 
+    iptables -t nat -A PREROUTING  -p tcp --dport 143 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 143 -j MASQUERADE
+    
+    # PORT 993 
+    iptables -t nat -A PREROUTING  -p tcp --dport 993 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 993 -j MASQUERADE
+    
+    # PORT 4190
+    iptables -t nat -A PREROUTING  -p tcp --dport 4190 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 4190 -j MASQUERADE
+    
+    # PORT 42420
+    iptables -t nat -A PREROUTING  -p tcp --dport 42420 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 42420 -j MASQUERADE
+    
+    # PORT 25565
+    iptables -t nat -A PREROUTING  -p tcp --dport 25565 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 25565 -j MASQUERADE
+    
+    # PORT 1443
+    iptables -t nat -A PREROUTING  -p tcp --dport 1443 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 1443 -j MASQUERADE
+    
+    # PORT 4443
+    iptables -t nat -A PREROUTING  -p tcp --dport 4443 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 4443 -j MASQUERADE
+    
+    # PORT 5222
+    iptables -t nat -A PREROUTING  -p tcp --dport 5222 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 5222 -j MASQUERADE
+    
+    # PORT 5347
+    iptables -t nat -A PREROUTING  -p tcp --dport 5347 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 5347 -j MASQUERADE
+    
+    # PORT 5280
+    iptables -t nat -A PREROUTING  -p tcp --dport 5280 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p tcp --dport 5280 -j MASQUERADE
+    
+    # UDP PORTS ##################################################################################################
+    # PORT 10000
+    iptables -t nat -A PREROUTING  -p udp --dport 10000 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p udp --dport 10000 -j MASQUERADE
+
+    # PORT 3478
+    iptables -t nat -A PREROUTING  -p udp --dport 3478 -j DNAT --to-destination 10.100.0.2
+    iptables -t nat -A POSTROUTING -p udp --dport 3478 -j MASQUERADE
   '';
 }
\ No newline at end of file