diff --git a/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb b/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
index 3da6f5bd8..41e257c31 100644
--- a/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
+++ b/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
@@ -10,21 +10,25 @@ HOMEPAGE = "https://developer.amazon.com/avs/sdk"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d92e60ee98664c54f68aa515a6169708"
 
-DEPENDS = "curl nghttp2 sqlite3 openssl gstreamer1.0 gstreamer1.0-plugins-base libopus portaudio"
+DEPENDS = "curl nghttp2 sqlite3 openssl gstreamer1.0 gstreamer1.0-plugins-base libopus portaudio libarchive"
 
-SRC_URI = "https://xajhuang.com:888/dl/avs-device-adk.${PV}.tar.gz"
-
-SRC_URI[md5sum] = "7b0f84c6e416d7a5d8a30f7a78fdf099"
-SRC_URI[sha256sum] = "9ede179ae47e8ee3380316b7a3dc43fc31d7eb02f350f47ea70c4bc21c4d053e"
+SRC_URI = "git://xajhuang.com:3100/avs/avs-device-sdk.git;protocol=https;branch=master"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_HOST = "aarch64-poky-linux"
 
+S = "${WORKDIR}/git"
+
 EXTRA_OECMAKE = "${S} -DCMAKE_SKIP_RPATH=TRUE  \
         -DGSTREAMER_MEDIA_PLAYER=ON -DPORTAUDIO=ON -DCMAKE_BUILD_TYPE=DEBUG -DPKCS11=OFF \        
         -DPORTAUDIO_LIB_PATH=${STAGING_DIR_HOST}${libdir}/libportaudio.so \
         -DPORTAUDIO_INCLUDE_DIR=${STAGING_DIR_HOST}${includedir} \
         -DCURL_INCLUDE_DIR=${STAGING_DIR_HOST}${includedir}/curl \
-        -DCURL_LIBRARY=${STAGING_DIR_HOST}${libdir}/libcurl.so"
+        -DCURL_LIBRARY=${STAGING_DIR_HOST}${libdir}/libcurl.so \
+        -DLibArchive_INCLUDE_DIR=${STAGING_DIR_HOST}${includedir} \
+        -DLibArchive_LIBRARY=${STAGING_DIR_HOST}${libdir}/libarchive.so \
+    "
+
 
 inherit cmake
 
diff --git a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
index c948f2001..834e04601 100755
--- a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
+++ b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
@@ -74,6 +74,7 @@ IMAGE_INSTALL_append = " \
     libopus \
     libarchive \
     faad2 \
+    avs-device-sdk \
 "
 
 install_proc() {
diff --git a/meta/meta-mediatek/classes/mkusrdata.bbclass b/meta/meta-mediatek/classes/mkusrdata.bbclass
index 661766488..bc368b835 100755
--- a/meta/meta-mediatek/classes/mkusrdata.bbclass
+++ b/meta/meta-mediatek/classes/mkusrdata.bbclass
@@ -26,11 +26,11 @@ mk_userdata_image() {
 	  rm -rf ${IMAGE_ROOTFS}/usr/lib/public/bluetooth_hfp/Sleep_Away.mp3
 	fi
 
-	cp -a ${IMAGE_ROOTFS}/data/dingdong ${STATE_DIR_CONTENT}
+#	cp -a ${IMAGE_ROOTFS}/data/dingdong ${STATE_DIR_CONTENT}
 	cp -a ${IMAGE_ROOTFS}/data/res ${STATE_DIR_CONTENT}
 	cp -a ${IMAGE_ROOTFS}/etc/wpa_supplicant.conf ${STATE_DIR_CONTENT}/etc/wpa_supplicant.conf
 	rm -rf ${IMAGE_ROOTFS}/data/res
-	rm -rf ${IMAGE_ROOTFS}/data/dingdong
+#	rm -rf ${IMAGE_ROOTFS}/data/dingdong
 	#rm -rf ${IMAGE_ROOTFS}/usr/bin/*.coreutils
 	rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg
 	#rm -rf ${IMAGE_ROOTFS}/lib64/security