diff --git a/config/boards/xiaomi-elish.conf b/config/boards/xiaomi-elish.conf
index 5de7fbe737..d16c1b83c9 100644
--- a/config/boards/xiaomi-elish.conf
+++ b/config/boards/xiaomi-elish.conf
@@ -20,6 +20,8 @@ function post_family_config_branch_sm8250__pmos_kernel() {
 
 function xiaomi-elish_is_userspace_supported() {
 	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
 	return 1
 }
 
@@ -54,11 +56,22 @@ function post_family_tweaks__xiaomi-elish_enable_services() {
 		return 0
 	fi
 
-	display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
-	do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
+	if [[ "${RELEASE}" == "jammy" ]];then
+		display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
+		do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
+	fi
+
+	# we need unudhcpd from armbian repo, so enable it
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list
+
 	do_with_retries 3 chroot_sdcard_apt_get_update
 	display_alert "$BOARD" "Installing board tweaks" "info"
-	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools pd-mapper tqftpserv unudhcpd mkbootimg
+	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools protection-domain-mapper tqftpserv unudhcpd mkbootimg
+
+	# disable armbian repo back
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
+	do_with_retries 3 chroot_sdcard_apt_get_update
+
 	chroot_sdcard systemctl enable qbootctl.service
 	chroot_sdcard systemctl enable usbgadget-rndis.service
 	chroot_sdcard systemctl enable pd-mapper.service