diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
index 44823a4..dc1a30b 100644
--- a/vars/Archlinux.yml
+++ b/vars/Archlinux.yml
@@ -1,5 +1,5 @@
 ---
-  - avahi
-  - mdns-scan
-  - nss-mdns
 avahi_client__packages:
+  - 'avahi'
+  - 'nss-mdns'
+# - 'mdns-scan'
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 74e50fa..ef2da94 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -2,4 +2,7 @@
 avahi_client__packages:
   - 'avahi-discover'
   - 'avahi-utils'
-  - 'mdns-scan'
+  - 'libnss-mdns'
+# - 'avahi-autoipd'
+# - 'avahi-dnsconfd'
+# - 'mdns-scan'
diff --git a/vars/os_fallback.yml b/vars/os_fallback.yml
index 22c59c9..9042176 100644
--- a/vars/os_fallback.yml
+++ b/vars/os_fallback.yml
@@ -1,3 +1,3 @@
 ---
-  - mdns-scan
 avahi_client__packages:
+# - 'mdns-scan'