diff --git a/jobs/avahi-daemon/avahi-daemon.job b/jobs/avahi-daemon/avahi-daemon.job
deleted file mode 100755
index d06d327..0000000
--- a/jobs/avahi-daemon/avahi-daemon.job
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-RUN "sudo apt install avahi-daemon"
diff --git a/src/run.sh b/src/run.sh
index 5350d1c..d565de9 100644
--- a/src/run.sh
+++ b/src/run.sh
@@ -61,6 +61,13 @@ queue_apt_install() {
 	done
 }
 
+queue_firewall_rule() {
+	local rule="$*";
+	subtask_begin "[firewall] Queuing firewall rule ${rule}";
+	echo "${rule}" >>"${temp_dir}/ufw-rules.txt";
+	subtask_end "$?";
+}
+
 ###############################################################################
 
 
diff --git a/src/steps-preinstall/50-avahi-daemon.job b/src/steps-preinstall/50-avahi-daemon.job
new file mode 100755
index 0000000..7a83f78
--- /dev/null
+++ b/src/steps-preinstall/50-avahi-daemon.job
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+task_begin "Configuring avahi-daemon";
+
+queue_apt_install "avahi-daemon";
+queue_firewall_rule allow 5353/udp comment mdns-avahi-daemon
+
+task_end "$?";