diff --git a/nixos/base.nix b/nixos/base.nix
index 66a2462..4529a40 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -166,7 +166,21 @@
   services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
   services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
   # services.tlp.enable = false;
-  services.avahi = { enable = true; nssmdns = true; };
+  services.avahi = {
+    enable = true;
+    openFirewall = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      domain = true;
+      userServices = true;
+      workstation = true;
+    };
+    extraServiceFiles = {
+      ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
+    };
+  };
 
   # SMART
   services.smartd = { enable = true; notifications.x11.enable = true; };
diff --git a/nixos/loki.nix b/nixos/loki.nix
index eb6fcf4..3c86da0 100644
--- a/nixos/loki.nix
+++ b/nixos/loki.nix
@@ -74,7 +74,13 @@
       enable = true;
       openFirewall = true;
       nssmdns = true;
-      publish = { enable = true; addresses = true; userServices = true; };
+      publish = {
+        enable = true;
+        addresses = true;
+        domain = true;
+        userServices = true;
+        workstation = true;
+      };
       extraServiceFiles = {
         ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
         smb = ''<?xml version="1.0" standalone='no'?><!--*-nxml-*--><!DOCTYPE service-group SYSTEM "avahi-service.dtd"><service-group><name replace-wildcards="yes">%h</name><service><type>_smb._tcp</type><port>445</port></service></service-group>'';
diff --git a/nixos/thor.nix b/nixos/thor.nix
index 8ea5dd8..5fa0428 100644
--- a/nixos/thor.nix
+++ b/nixos/thor.nix
@@ -77,7 +77,21 @@
   time.timeZone = "Europe/Rome";
 
   services = {
-    avahi = { enable = true; nssmdns = true; };
+    avahi = {
+      enable = true;
+      openFirewall = true;
+      nssmdns = true;
+      publish = {
+        enable = true;
+        addresses = true;
+        domain = true;
+        userServices = true;
+        workstation = true;
+      };
+      extraServiceFiles = {
+        ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
+      };
+    };
     clamav = { daemon.enable = true; updater.enable = true; };
     dbus.packages = with pkgs; [ gnome.dconf ];
     gnome.gnome-keyring.enable = true;