diff --git a/nixos/hosts/osaka-linode-01/firewall.nix b/nixos/hosts/osaka-linode-01/firewall.nix
index 730faecd..f9977caa 100644
--- a/nixos/hosts/osaka-linode-01/firewall.nix
+++ b/nixos/hosts/osaka-linode-01/firewall.nix
@@ -67,17 +67,27 @@
       
       frontend tcp
         mode tcp
-        bind :443
         bind :42420
         bind :25565
+        bind :4443
+        bind :443
+        default_backend backend_tcp
+
+      frontend mail 
+        mode tcp
         bind :25
         bind :143
         bind :465
         bind :587
         bind :993
         bind :4190
-        bind :4443
-        default_backend backend_tcp
+        default_backend backend_mail 
+
+      backend backend_mail
+        mode tcp 
+        option forwarded
+        option forwardfor if-none 
+        server mailserver-wg 10.100.1.3
 
       backend backend_tcp
         mode tcp