diff --git a/hosts/containers/freifunk/default.nix b/hosts/containers/freifunk/default.nix
index 8ce59872..bfb5a141 100644
--- a/hosts/containers/freifunk/default.nix
+++ b/hosts/containers/freifunk/default.nix
@@ -56,13 +56,6 @@ in {
       ${pkgs.iptables}/bin/iptables -t nat -o bat0 -A POSTROUTING -j MASQUERADE
       set -e
     '';
-
-    forwardPorts = [ {
-      # Yggdrasil
-      destination = "${hostRegistry.hosts.yggdrasil.ip4}:46823";
-      proto = "tcp";
-      sourcePort = 46823;
-    } ];
   };
   # Configure rt_table name
   networking.iproute2 = {
diff --git a/lib/default.nix b/lib/default.nix
index 1168e242..e8cd08c9 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -106,8 +106,6 @@ in {
           description = "Whether to proxy the local MPD database";
         };
 
-        yggdrasil.enableGateway = mkEnableOption
-          "Whether to join the host to the Yggdrasil network via a gateway";
       };
 
     };