diff --git a/modules/nixos/access.nix b/modules/nixos/access.nix
index 00452943..91ec8964 100644
--- a/modules/nixos/access.nix
+++ b/modules/nixos/access.nix
@@ -16,7 +16,7 @@ in {
 
   config.networking.access = {
     hostnameForNetwork = {
-      local = mkIf config.services.avahi.enable "${hostName}.local";
+      local = mkIf config.services.avahi.enable "${hostName}.local.cutie.moe";
       tail = mkIf config.services.tailscale.enable "${hostName}.tail.cutie.moe";
       global = mkIf config.networking.enableIPv6 "${hostName}.cutie.moe";
     };
diff --git a/modules/nixos/home-assistant.nix b/modules/nixos/home-assistant.nix
index b9bf752c..885769ce 100644
--- a/modules/nixos/home-assistant.nix
+++ b/modules/nixos/home-assistant.nix
@@ -8,6 +8,7 @@
   inherit (lib.modules) mkIf mkMerge mkBefore mkDefault;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.lists) optional elem;
+  inherit (lib.strings) toLower;
 in {
   options.services.home-assistant = with lib.types; {
     mutableUiConfig = mkEnableOption "UI-editable config files";
@@ -51,7 +52,9 @@ in {
     # MDNS
     services.avahi = mkIf (cfg.enable && cfg.homekit.enable) {
       enable = mkDefault true;
-      publish.enable = false;
+      publish.enable = let
+        homekitNames = map (homekit: toLower homekit.name) cfg.config.homekit or [ ];
+      in mkIf (elem config.networking.hostName homekitNames) false;
     };
 
     systemd.services.home-assistant = mkIf (cfg.enable && cfg.mutableUiConfig) {
diff --git a/systems/tewi/nixos.nix b/systems/tewi/nixos.nix
index c82a5395..e9ba349b 100644
--- a/systems/tewi/nixos.nix
+++ b/systems/tewi/nixos.nix
@@ -218,6 +218,7 @@ in {
           DNSDefaultRoute = true;
           MulticastDNS = true;
         };
+        linkConfig.Multicast = true;
       };
       links.eno1 = {
         matchConfig = {