diff --git a/install/network/avahi.sh b/install/network/avahi.sh
index 561fbc118d..6d8c1b6143 100644
--- a/install/network/avahi.sh
+++ b/install/network/avahi.sh
@@ -22,6 +22,13 @@ AVAHI_SERVICE_PATH="/etc/avahi/services"
 )
 curl -fsSL $CONFIGURE_NETWORK_PATH/blueos.service > "${AVAHI_SERVICE_PATH}/blueos.service"
 
+AVAHI_DAEMON_CONFIG_PATH="/etc/avahi/avahi-daemon.conf"
+[ ! -e "${AVAHI_DAEMON_CONFIG_PATH}" ] && (
+    echo "Avahi daemon config file does not exist: ${AVAHI_DAEMON_CONFIG_PATH}"
+    exit 1
+)
+sed -i "s/#host-name=.*/host-name=blueos-avahi/g" ${AVAHI_DAEMON_CONFIG_PATH}
+
 echo "Configure hostname to blueos"
 OLD_HOSTNAME="$(cat /etc/hostname)"
 NEW_HOSTNAME="blueos"