diff --git a/sets/laptop.nix b/sets/laptop.nix
index 03964bc..bad1b54 100644
--- a/sets/laptop.nix
+++ b/sets/laptop.nix
@@ -3,6 +3,7 @@
 {
   imports = [ ./wifi.nix ];
 
+  services.avahi.publish.enable = false;
   services.upower.enable = true;
   programs.light.enable = true;
   users.users.artemis.extraGroups = [ "video" ];
diff --git a/sets/workstation.nix b/sets/workstation.nix
index 04c3b66..e3485d1 100644
--- a/sets/workstation.nix
+++ b/sets/workstation.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }@args:
+{ pkgs, lib, inputs, ... }@args:
 
 {
   imports = [
@@ -27,6 +27,10 @@
     avahi = {
       enable = true;
       nssmdns = true;
+      publish = {
+        enable = lib.mkDefault true;
+        addresses = true;
+      };
     };
     flatpak.enable = true;
     pcscd.enable = true;
diff --git a/system/gallus/default.nix b/system/gallus/default.nix
index 06d508e..ac6e935 100644
--- a/system/gallus/default.nix
+++ b/system/gallus/default.nix
@@ -36,7 +36,10 @@
   services.avahi = {
     enable = true;
     nssmdns = true;
-    publish.enable = true;
+    publish = {
+      enable = true;
+      addresses = true;
+    };
   };
 
   # Requires a lot of dependencies we don't use