diff --git a/bundles/avahi-daemon/files/avahi-daemon.conf b/bundles/avahi-daemon/files/avahi-daemon.conf
index 7a639fd..efdd222 100644
--- a/bundles/avahi-daemon/files/avahi-daemon.conf
+++ b/bundles/avahi-daemon/files/avahi-daemon.conf
@@ -2,6 +2,7 @@
 host-name=${node.name.split('.')[-1]}
 use-ipv4=yes
 use-ipv6=yes
+allow-interfaces=${','.join(sorted(node.metadata.get('interfaces', {}).keys()))}
 ratelimit-interval-usec=1000000
 ratelimit-burst=1000
 
diff --git a/bundles/avahi-daemon/items.py b/bundles/avahi-daemon/items.py
index 74bcdd3..0a0f1aa 100644
--- a/bundles/avahi-daemon/items.py
+++ b/bundles/avahi-daemon/items.py
@@ -13,5 +13,6 @@ svc_systemd['avahi-daemon'] = {
     'needs': {
         'file:/etc/avahi/avahi-daemon.conf',
         'pkg_apt:avahi-daemon',
+        'pkg_apt:libnss-mdns',
     },
 }
diff --git a/bundles/avahi-daemon/metadata.py b/bundles/avahi-daemon/metadata.py
index b1400d9..0bb909f 100644
--- a/bundles/avahi-daemon/metadata.py
+++ b/bundles/avahi-daemon/metadata.py
@@ -2,6 +2,7 @@ defaults = {
     'apt': {
         'packages': {
             'avahi-daemon': {},
+            'libnss-mdns': {},
         },
     },
 }