diff --git a/gemian-common.yaml b/gemian-common.yaml
index 283d793..3bf6e5a 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -15,7 +15,7 @@ actions:
 
   - action: apt
     description: Installing additional Debian packages
-    packages: [ curl, gnupg, net-tools, openssh-server, sudo ]
+    packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon ]
 
   - action: run
     chroot: true
diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh
index eaf24c5..03351fa 100755
--- a/scripts/setup-user.sh
+++ b/scripts/setup-user.sh
@@ -223,3 +223,4 @@ useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,aid_system,aid_graphics
 echo cosmo:cosmo | chpasswd
 
 usermod systemd-timesync -a -G aid_inet
+usermod avahi -a -G aid_inet