diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index f168932..b6d6336 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -31,6 +31,10 @@
     ];
   };
   services.resolved.enable = true;
+  # MDNS Taken by avahi
+  services.resolved.extraConfig = ''
+    MulticastDNS=false
+  '';
 
   networking.nameservers = lib.mkDefault [
     "1.1.1.1"
diff --git a/hosts/common/optional/avahi.nix b/hosts/common/optional/avahi.nix
index 7880469..b56a8f9 100644
--- a/hosts/common/optional/avahi.nix
+++ b/hosts/common/optional/avahi.nix
@@ -3,7 +3,10 @@
   services.avahi = {
     enable = true;
     nssmdns4 = true;
+    nssmdns6 = true;
     publish.enable = true;
     publish.addresses = true;
+    ipv4 = true;
+    ipv6 = true;
   };
 }