diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index 373752f..99315ea 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -201,10 +201,10 @@ jobs:
           mv *imagebuilder* ib && cd ib
           . $GITHUB_WORKSPACE/merge_files.sh
           mkdir -p files/local_feed && sudo mount --bind packages files/local_feed
-          sed -i '/luci-lib-base/d;/luci-lib-ipkg/d' include/target.mk
           sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile)
           sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile
-          PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
+          ls packages/*.ipk | xargs -n1 basename > package.files
+          PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | grep -v CONFIG_PACKAGE_luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort | uniq -u | xargs echo)
           make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
 
           mkdir -p $GITHUB_WORKSPACE/release
@@ -246,12 +246,12 @@ jobs:
           mv *imagebuilder* ib && cd ib
           . $GITHUB_WORKSPACE/merge_files.sh
           sed -i '/local/d;s/#//' files/etc/opkg/distfeeds.conf
-          sed -i '/luci-lib-base/d;/luci-lib-ipkg/d' include/target.mk
           sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile)
           sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile
-          PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
-          LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | grep -v docker | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
-          LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo)
+          ls packages/*.ipk | xargs -n1 basename > package.files
+          PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | grep -v CONFIG_PACKAGE_luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort | uniq -u | xargs echo)
+          LUCI=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE_luci-app | grep -v docker | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort | uniq -u | xargs echo)
+          LP=$(echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i grep -o {}-zh-cn package.files | xargs echo)
           make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
 
           mkdir -p $GITHUB_WORKSPACE/release
@@ -266,8 +266,8 @@ jobs:
           fi
           cd $GITHUB_WORKSPACE/ib
           rm -rf bin/
-          LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}_* 2>/dev/null' | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo)
-          LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo)
+          LUCI=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE_luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort | uniq -u | xargs echo)
+          LP=$(echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i grep -o {}-zh-cn package.files | xargs echo | xargs echo)
           make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
           mv $(ls -1 ./bin/targets/*/*/*img.gz | head -1) $GITHUB_WORKSPACE/release/$DEVICE-with-docker.img.gz
           cd $GITHUB_WORKSPACE/release/ && md5sum $DEVICE-with-docker.img.gz > $DEVICE-with-docker.img.gz.md5
diff --git a/merge_packages.sh b/merge_packages.sh
index c7da7c7..ee93e53 100644
--- a/merge_packages.sh
+++ b/merge_packages.sh
@@ -22,7 +22,8 @@ function merge_feed(){
     ./scripts/feeds install -a -p $1
 }
 
-merge_feed nas "https://github.com/linkease/nas-packages.git;master"
+merge_feed nas "https://github.com/linkease/nas-packages;master"
+merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main"
 merge_package https://github.com/project-lede/luci-app-godproxy
 merge_package https://github.com/Beginner-Go/luci-app-tencentddns
 merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus
diff --git a/r1p.config.seed b/r1p.config.seed
index 8b7d5a8..59b2744 100644
--- a/r1p.config.seed
+++ b/r1p.config.seed
@@ -26,7 +26,7 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y
+CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r2c.config.seed b/r2c.config.seed
index fcec787..374a149 100644
--- a/r2c.config.seed
+++ b/r2c.config.seed
@@ -26,7 +26,7 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y
+CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r2s.config.seed b/r2s.config.seed
index 70db6b8..5bcf56b 100644
--- a/r2s.config.seed
+++ b/r2s.config.seed
@@ -26,7 +26,7 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y
+CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r4s.config.seed b/r4s.config.seed
index 7ad97a4..1a50717 100644
--- a/r4s.config.seed
+++ b/r4s.config.seed
@@ -26,7 +26,7 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y
+CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/x86.config.seed b/x86.config.seed
index f52fa50..a79500c 100644
--- a/x86.config.seed
+++ b/x86.config.seed
@@ -25,7 +25,7 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y
+CONFIG_PACKAGE_ddns-scripts_cloudflare=y