diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix
index 8417a96..e940c2d 100644
--- a/instances/freya/configuration.nix
+++ b/instances/freya/configuration.nix
@@ -57,19 +57,19 @@ in
   '';
 
   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";
-    # };
+    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";
+    };
     blueman.enable = true;
     dbus.packages = [ pkgs.dconf ];
     gnome.gnome-keyring.enable = true;
diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix
index 149ec11..6137698 100644
--- a/instances/loki/configuration.nix
+++ b/instances/loki/configuration.nix
@@ -60,21 +60,21 @@ in
   time.timeZone = "Europe/Rome";
 
   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";
-    #   };
-    # };
+    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";
+      };
+    };
     # bazarr = { enable = true; openFirewall = true; group = "users"; };
     blueman.enable = true;
     dbus = { packages = [ pkgs.dconf ]; implementation = "broker"; };
diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix
index 90eaf4b..9a222b2 100644
--- a/instances/odin/common_configuration.nix
+++ b/instances/odin/common_configuration.nix
@@ -245,21 +245,21 @@
     };
     tumbler.enable = true;
     # tlp.enable = false;
-    # 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";
-    #   };
-    # };
+    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";
+      };
+    };
     # Power-profiles
     power-profiles-daemon.enable = true;
     fprintd = {
diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix
index 718ee26..8b13318 100644
--- a/instances/thor/configuration.nix
+++ b/instances/thor/configuration.nix
@@ -134,21 +134,21 @@
   time.timeZone = "Europe/Rome";
 
   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";
-    #   };
-    # };
+    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";
+      };
+    };
     blueman.enable = true;
     # clamav = {
     #   daemon.enable = true;