diff --git a/machines/vega/services/samba.nix b/machines/vega/services/samba.nix
index e2a7c61e..30d4cf05 100644
--- a/machines/vega/services/samba.nix
+++ b/machines/vega/services/samba.nix
@@ -82,8 +82,11 @@ in
   };
 
   services.avahi = {
-    publish.enable = true;
-    publish.userServices = true;
+    settings.publish = {
+      disable-publishing = false;
+      disable-user-service-publishing = false;
+      publish-addresses = true;
+    };
     # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile`
     nssmdns4 = true;
     # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it
diff --git a/modules/clan/samba/default.nix b/modules/clan/samba/default.nix
index 708e6da3..dae801b2 100644
--- a/modules/clan/samba/default.nix
+++ b/modules/clan/samba/default.nix
@@ -239,8 +239,11 @@
             };
 
             services.avahi = {
-              publish.enable = true;
-              publish.userServices = true;
+              settings.publish = {
+                disable-publishing = false;
+                disable-user-service-publishing = false;
+                publish-addresses = true;
+              };
               # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile`
               nssmdns4 = true;
               # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it