diff --git a/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh b/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
index c62e55e..817a585 100755
--- a/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
+++ b/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
@@ -25,7 +25,7 @@
 #use hostapd master package revision, remove hostapd 2102 patches
 find ../mtk-openwrt-feeds/openwrt_patches-21.02 -name "*-2102-hostapd-*.patch" -delete
 
-#use mt76 lastest commit, remove mt76 master patches
+#have MT7986 specific non-upstream patches, remove feeds mt76 master patches
 find ../mtk-openwrt-feeds/openwrt_patches-21.02 -name "*-master-mt76-*.patch" -delete
 
 #step1 clean
@@ -44,40 +44,18 @@
 echo "CONFIG_WPS_UPNP=y"  >> ./package/network/services/hostapd/files/hostapd-full.config
 
 prepare_final ${branch_name}
-#hack mt76 firmware/eeprom
-FW_BIN_DIR=${BUILD_DIR}/package/kernel/mt76/firmware/mt7986/rebb
+
+#copy mt7915/mt7916/mt7986 default eeprom
 FW_SOURCE_DIR=${BUILD_DIR}/package/kernel/mt76/src/firmware
 mkdir -p ${FW_SOURCE_DIR}
-#===================firmware bin name format=========================
-#define MT7915_FIRMWARE_WA		"mediatek/mt7915_wa.bin"
-#define MT7915_FIRMWARE_WM		"mediatek/mt7915_wm.bin"
-#define MT7915_ROM_PATCH		"mediatek/mt7915_rom_patch.bin"
-#define MT7986_FIRMWARE_WA		"mediatek/mt7986_wa.bin"
-#define MT7986_FIRMWARE_WM		"mediatek/mt7986_wm.bin"
-#define MT7986_FIRMWARE_WM_MT7975	"mediatek/mt7986_wm_mt7975.bin"
-#define MT7986_ROM_PATCH		"mediatek/mt7986_rom_patch.bin"
-#define MT7986_ROM_PATCH_MT7975		"mediatek/mt7986_rom_patch_mt7975.bin"
-cp -rf ${FW_BIN_DIR}/7986_WACPU_RAM_CODE_release.bin ${FW_SOURCE_DIR}/mt7986_wa.bin
-cp -rf ${FW_BIN_DIR}/WIFI_RAM_CODE_MT7986.bin ${FW_SOURCE_DIR}/mt7986_wm.bin
-cp -rf ${FW_BIN_DIR}/mt7986_patch_e1_hdr.bin ${FW_SOURCE_DIR}/mt7986_rom_patch.bin
-cp -rf ${FW_BIN_DIR}/WIFI_RAM_CODE_MT7986_MT7975.bin ${FW_SOURCE_DIR}/mt7986_wm_mt7975.bin
-cp -rf ${FW_BIN_DIR}/mt7986_patch_e1_hdr_mt7975.bin ${FW_SOURCE_DIR}/mt7986_rom_patch_mt7975.bin
+cp -rf ../mtk-openwrt-feeds/autobuild_mac80211_release/default_bins/* ${FW_SOURCE_DIR}
+cp -rf ../mtk-openwrt-feeds/autobuild_mac80211_release/default_bins/* ${FW_SOURCE_DIR}/src/firmware/
 
-#===================eeprom bin name format=========================
-#define MT7986_EEPROM_MT7975_DEFAULT		"mediatek/mt7986_eeprom_mt7975.bin"
-#define MT7986_EEPROM_MT7975_DUAL_DEFAULT	"mediatek/mt7986_eeprom_mt7975_dual.bin"
-#define MT7986_EEPROM_MT7976_DEFAULT		"mediatek/mt7986_eeprom_mt7976.bin"
-#define MT7986_EEPROM_MT7976_DEFAULT_DBDC	"mediatek/mt7986_eeprom_mt7976_dbdc.bin"
-#define MT7986_EEPROM_MT7976_DUAL_DEFAULT	"mediatek/mt7986_eeprom_mt7976_dual.bin"
-cp -rf ${FW_BIN_DIR}/MT7986_iPAiLNA_EEPROM_AX7800.bin ${FW_SOURCE_DIR}/mt7986_eeprom_mt7975.bin
-cp -rf ${FW_BIN_DIR}/MT7986_iPAiLNA_EEPROM_AX6000.bin ${FW_SOURCE_DIR}/mt7986_eeprom_mt7975_dual.bin
-cp -rf ${FW_BIN_DIR}/MT7986_ePAeLNA_EEPROM_AX7800.bin ${FW_SOURCE_DIR}/mt7986_eeprom_mt7976.bin
-cp -rf ${FW_BIN_DIR}/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin ${FW_SOURCE_DIR}/mt7986_eeprom_mt7976_dbdc.bin
-cp -rf ${FW_BIN_DIR}/MT7986_ePAeLNA_EEPROM_AX6000.bin ${FW_SOURCE_DIR}/mt7986_eeprom_mt7976_dual.bin
-
-#apply hostapd patch
+#hack hostapd/mac80211/mt76 package in master branch
 patch -f -p1 -i ${BUILD_DIR}/autobuild/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
 patch -f -p1 -i ${BUILD_DIR}/autobuild/0002-master-hostapd-makefile-for-utils.patch
+patch -f -p1 -i ${BUILD_DIR}/autobuild/0003-master-mt76-makefile-for-new-chip.patch
+
 #step2 build
 if [ -z ${1} ]; then
 	build ${branch_name} -j1 || [ "$LOCAL" != "1" ]
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX6000.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX6000.bin
deleted file mode 100644
index 3b160f8..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX6000.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX7800.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX7800.bin
deleted file mode 100644
index de22667..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_AX7800.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin
deleted file mode 100644
index af75dd3..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_ePAeLNA_EEPROM_ONEADIE_DBDC.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX6000.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX6000.bin
deleted file mode 100644
index 702a5a3..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX6000.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX7800.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX7800.bin
deleted file mode 100644
index 84b6aa7..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/MT7986_iPAiLNA_EEPROM_AX7800.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wa.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wa.bin
new file mode 100644
index 0000000..434e757
--- /dev/null
+++ b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wm.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wm.bin
new file mode 100644
index 0000000..fef6005
--- /dev/null
+++ b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7915_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/mt7986_patch_e1_hdr.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/mt7986_patch_e1_hdr.bin
rename to autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/mt7986_patch_e1_hdr_mt7975.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/mt7986_patch_e1_hdr_mt7975.bin
rename to autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/7986_WACPU_RAM_CODE_release.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/7986_WACPU_RAM_CODE_release.bin
rename to autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/WIFI_RAM_CODE_MT7986.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/WIFI_RAM_CODE_MT7986.bin
rename to autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/WIFI_RAM_CODE_MT7986_MT7975.bin b/autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/firmware/mt7986/rebb/WIFI_RAM_CODE_MT7986_MT7975.bin
rename to autobuild_mac80211_release/mt7986_mac80211/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin
Binary files differ