@@ -5,6 +5,8 @@ , ... }:
 let
   fsTypes = [ "f2fs" "ext" "exfat" "vfat" ];
+  domain = "home.arpa";
+  ts_domain = "hydra-pinecone.ts.net";
 in
 {
   imports = [
@@ -88,8 +90,8 @@ }; 
   networking = {
     hostName = "nanopi";
-    domain = "lan";
-    search = [ "lan" ];
+    domain = domain;
+    search = [ domain ];
     useDHCP = false;
     useNetworkd = true;
     firewall = {
@@ -223,7 +225,7 @@ !config.networking.resolvconf.enable       &&
       !config.services.resolved.enable
     ) ''
-    search lan hydra-pinecone.ts.net
+    search ${domain} ${ts_domain}
     nameserver ::1
     nameserver 127.0.0.1
     options edns0
@@ -320,6 +322,9 @@ IPv6AcceptRA = false;           IPv6SendRA = true;
           DHCPPrefixDelegation = true;
           ConfigureWithoutCarrier = true;
+          MulticastDNS = true;
+          BindCarrier = [ "lan0" "lan1" ];
+          Domains = [ domain ];
         };
         dhcpPrefixDelegationConfig = {
           UplinkInterface = "wan0";
@@ -467,7 +472,7 @@ resolveLocalQueries = false;     alwaysKeepRunning = true;
     settings = {
       local-ttl = 60;
-      domain = "lan";
+      domain = domain;
       dhcp-fqdn = false;
       domain-needed = true;
       bogus-priv = true;
@@ -496,11 +501,6 @@ "homeassistant,ha"       ];
       interface-name = [
         "nanopi,bridge0"
-        "nanopi.lan,bridge0"
-        "home.alanpearce.eu,wan0"
-        "nanopi.alanpearce.eu,wan0"
-        "nanopi.lan.alanpearce.eu,bridge0"
-        "syncthing.lan.alanpearce.eu,bridge0"
         "wan,wan0"
         "wlan,wlan0"
         "wwan,wwan0"
@@ -856,7 +856,7 @@ "[::1]:5553"         "10.0.0.1:53 -group lan -exclude-default-group"
       ];
       nameserver = [
-        "/lan/lan"
+        "/${domain}/${domain}"
       ];
       dualstack-ip-selection = true;
       dualstack-ip-selection-threshold = 10;