diff --git a/.github/workflows/bpi-r4-mediatek.yaml b/.github/workflows/bpi-r4-mediatek.yaml
index 57db55b..98fda28 100644
--- a/.github/workflows/bpi-r4-mediatek.yaml
+++ b/.github/workflows/bpi-r4-mediatek.yaml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Clone Mediatek feed
         run: |
-          git clone https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds || true
+          git clone https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds mtk-openwrt-feeds
 
       - name: Add missing kernel config
         run: |
@@ -74,23 +74,26 @@ jobs:
 
       - name: Run Mediatek prepare
         run: |
-          bash -x ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-BE19000 prepare log_file=make
+          bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mt7988_rfb-mt7996 prepare log_file=make
 
       - name: Configure firmware image
         run: |
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }} > .config
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci >> .config
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-short >> .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }}" > .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci" >> .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-short" >> .config
           sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/openssl >> .config
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/lte-5g-modem >> .config
-          curl -SL https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.ROLE_CONFIG }} >> .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/openssl" >> .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/lte-5g-modem" >> .config
+          curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.ROLE_CONFIG }}" >> .config
 
       # Full diff list is here: https://github.com/danpawlik/openwrt-builder/commit/13e8e751e28e9a9bd852e427b89ed4f3bc0cf15d#diff-c5c79fcc9dff2632be242ed35cef9527aab61e542217f71cd2d396155c976ec4R49
       - name: Set configs, that were set in Mediatek Feed prepare step
         run: |
           echo "CONFIG_PACKAGE_mt7988-wo-firmware=y" >> .config
 
+      - name: Print config file
+        run: cat .config
+
       - name: Run defconfig
         run: |
           make defconfig
@@ -103,8 +106,14 @@ jobs:
         run: |
           sed -i 's/CONFIG_PACKAGE_kmod-crypto-eip=y/# CONFIG_PACKAGE_kmod-crypto-eip is not set/g' .config
 
+      - name: Run defconfig once again
+        run: make defconfig
+
+      - name: Print the config file
+        run: cat .config
+
       - name: Build the firmware image
-        run: make -j $(nproc) defconfig download world
+        run: make -j $(nproc) download world
 
       - name: Compress all packages
         run: |
diff --git a/build-mediatek-version.sh b/build-mediatek-version.sh
index 06f9960..78cea16 100755
--- a/build-mediatek-version.sh
+++ b/build-mediatek-version.sh
@@ -15,10 +15,10 @@ echo '# CONFIG_IXGBE_IPSEC is not set' >> target/linux/generic/config-6.6
 echo '# CONFIG_RTL8261N_PHY is not set' >> target/linux/generic/config-6.6
 
 # Run prepare instead of build
-bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-BE19000 prepare log_file=make
+bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mt7988_rfb-mt7996 prepare log_file=make
 
 # To build via mtk feed:
-# bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-BE19000 log_file=make
+# bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mt7988_rfb-mt7996 log_file=make
 
 # It will fail, so let's re-use packages set in Mediatek feed + my packages
 # and make world!