diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index a21a3f9..21997a4 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -82,7 +82,7 @@ jobs:
           . $GITHUB_WORKSPACE/scripts/merge_packages.sh
           . $GITHUB_WORKSPACE/scripts/patches.sh
           cd
-          svn export https://github.com/openwrt/luci/branches/master luci
+          git clone --depth=1 --single-branch https://github.com/openwrt/luci
           pushd luci
           ls -d */ | xargs -ri diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -ri echo CONFIG_PACKAGE_{}=m > ~/lede/more_luci.txt
           popd
diff --git a/scripts/patches.sh b/scripts/patches.sh
index 85f1597..f866499 100644
--- a/scripts/patches.sh
+++ b/scripts/patches.sh
@@ -115,7 +115,7 @@ if [[ $DEVICE == 'r1s' ]]; then
   rsync -a --delete target/linux/sunxi/. ~/lede/target/linux/sunxi/. && rsync -a --delete package/boot/. ~/lede/package/boot/.
   cd ~/lede
   sed -i 's/kmod-rtl8189es//;s/wpad-basic-openssl/wpad-basic-wolfssl/' target/linux/sunxi/image/cortexa53.mk
-  merge_package https://github.com/immortalwrt/immortalwrt/branches/openwrt-18.06-k5.4/package/emortal/autocore
+  merge_package "-b openwrt-18.06-k5.4 https://github.com/immortalwrt/immortalwrt" package/emortal/autocore
 
   sed -i '/luci/d' $GITHUB_WORKSPACE/common.seed $GITHUB_WORKSPACE/extra_packages.seed
 fi