diff --git a/bundles/avahi-daemon/files/avahi-daemon.conf b/bundles/avahi-daemon/files/avahi-daemon.conf
index efdd222..0ad1412 100644
--- a/bundles/avahi-daemon/files/avahi-daemon.conf
+++ b/bundles/avahi-daemon/files/avahi-daemon.conf
@@ -1,7 +1,7 @@
 [server]
 host-name=${node.name.split('.')[-1]}
 use-ipv4=yes
-use-ipv6=yes
+use-ipv6=${'yes' if node.metadata.get('avahi-daemon/use-ipv6') else 'no'}
 allow-interfaces=${','.join(sorted(node.metadata.get('interfaces', {}).keys()))}
 ratelimit-interval-usec=1000000
 ratelimit-burst=1000
@@ -14,7 +14,7 @@ disable-publishing=no
 disable-user-service-publishing=no
 publish-hinfo=yes
 publish-workstation=no
-publish-aaaa-on-ipv4=yes
+publish-aaaa-on-ipv4=no
 publish-a-on-ipv6=no
 
 [reflector]
diff --git a/bundles/avahi-daemon/metadata.py b/bundles/avahi-daemon/metadata.py
index 0bb909f..f6c3ef5 100644
--- a/bundles/avahi-daemon/metadata.py
+++ b/bundles/avahi-daemon/metadata.py
@@ -5,4 +5,7 @@ defaults = {
             'libnss-mdns': {},
         },
     },
+    'avahi-daemon': {
+        'use-ipv6': True,
+    }
 }
diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 576aa3e..c1adeb1 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -56,6 +56,9 @@ nodes['home.nas'] = {
                 # systemctl start yate
             },
         },
+        'avahi-daemon': {
+            'use-ipv6': False, # because having a dynamic address confuses the network somehow
+        },
         'backups': {
             'paths': {
                 '/storage/nas/Audiobooks',