diff --git a/modules/system/services/nebula/default.nix b/modules/system/services/nebula/default.nix
index 02cd028..8f15db3 100644
--- a/modules/system/services/nebula/default.nix
+++ b/modules/system/services/nebula/default.nix
@@ -9,11 +9,6 @@ let
   netCfg = config.custom.networking;
 
   publicPort = 47141;
-
-  lighthouses =
-    netCfg.peers
-    |> lib.filter (peer: peer.overlay.isLighthouse)
-    |> lib.map (lighthouse: lighthouse.overlay.address);
 in
 {
   options.custom.services.nebula = {
@@ -76,16 +71,14 @@ in
       key = config.sops.secrets."nebula/host-key".path;
 
       tun.device = netCfg.overlay.interface;
-      listen = {
-        host = lib.mkIf (netCfg.underlay.address != null) netCfg.underlay.address;
-        port = lib.mkIf netCfg.underlay.isPublic publicPort;
-      };
+      listen.port = lib.mkIf netCfg.underlay.isPublic publicPort;
 
       inherit (netCfg.overlay) isLighthouse;
-      lighthouses = lib.mkIf (!netCfg.overlay.isLighthouse) lighthouses;
-
-      isRelay = netCfg.overlay.isLighthouse;
-      relays = lib.mkIf (!netCfg.overlay.isLighthouse) lighthouses;
+      lighthouses = lib.mkIf (!netCfg.overlay.isLighthouse) (
+        netCfg.peers
+        |> lib.filter (peer: peer.overlay.isLighthouse)
+        |> lib.map (lighthouse: lighthouse.overlay.address)
+      );
 
       staticHostMap =
         netCfg.peers