diff --git a/defconfig/mt7981-ax3000.config b/defconfig/mt7981-ax3000.config
index 6e7005c76c..41b814f0dd 100644
--- a/defconfig/mt7981-ax3000.config
+++ b/defconfig/mt7981-ax3000.config
@@ -132,11 +132,11 @@ CONFIG_MTK_MEMORY_SHRINK=y
 CONFIG_MTK_MEMORY_SHRINK_AGGRESS=y
 CONFIG_MTK_MGMT_TXPWR_CTRL=y
 CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
-CONFIG_MTK_MT7981_NEW_FW=y
 CONFIG_MTK_MT_AP_SUPPORT=m
 CONFIG_MTK_MT_DFS_SUPPORT=y
 CONFIG_MTK_MT_MAC=y
 CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7672=y
 CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
 CONFIG_MTK_MUMIMO_SUPPORT=y
 CONFIG_MTK_MU_RA_SUPPORT=y
diff --git a/defconfig/mt7986-ax4200.config b/defconfig/mt7986-ax4200.config
index 856859f498..6e91f08299 100644
--- a/defconfig/mt7986-ax4200.config
+++ b/defconfig/mt7986-ax4200.config
@@ -69,11 +69,11 @@ CONFIG_MTK_MBSS_SUPPORT=y
 CONFIG_MTK_MCAST_RATE_SPECIFIC=y
 CONFIG_MTK_MGMT_TXPWR_CTRL=y
 CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
-CONFIG_MTK_MT7986_NEW_FW=y
 CONFIG_MTK_MT_AP_SUPPORT=m
 CONFIG_MTK_MT_DFS_SUPPORT=y
 CONFIG_MTK_MT_MAC=y
 CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7672=y
 CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
 CONFIG_MTK_MUMIMO_SUPPORT=y
 CONFIG_MTK_MU_RA_SUPPORT=y
@@ -289,7 +289,6 @@ CONFIG_PKG_FORTIFY_SOURCE_2=y
 CONFIG_WARP_CHIPSET="mt7986"
 CONFIG_WARP_DBG_SUPPORT=y
 CONFIG_WARP_MEMORY_LEAK_DBG=y
-CONFIG_WARP_NEW_FW=y
 CONFIG_WARP_VERSION=2
 CONFIG_WED_HW_RRO_SUPPORT=y
 # CONFIG_WOLFSSL_HAS_ECC25519 is not set
diff --git a/defconfig/mt7986-ax6000-256m.config b/defconfig/mt7986-ax6000-256m.config
index a8b489eb2f..f872781572 100644
--- a/defconfig/mt7986-ax6000-256m.config
+++ b/defconfig/mt7986-ax6000-256m.config
@@ -72,6 +72,7 @@ CONFIG_MTK_MT_AP_SUPPORT=m
 CONFIG_MTK_MT_DFS_SUPPORT=y
 CONFIG_MTK_MT_MAC=y
 CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7672=y
 CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
 CONFIG_MTK_MUMIMO_SUPPORT=y
 CONFIG_MTK_MU_RA_SUPPORT=y
@@ -286,7 +287,6 @@ CONFIG_PACKAGE_zram-swap=y
 CONFIG_PKG_FORTIFY_SOURCE_2=y
 CONFIG_WARP_CHIPSET="mt7986"
 CONFIG_WARP_DBG_SUPPORT=y
-CONFIG_WARP_NEW_FW=y
 CONFIG_WARP_VERSION=2
 CONFIG_WED_HW_RRO_SUPPORT=y
 # CONFIG_WOLFSSL_HAS_ECC25519 is not set
diff --git a/defconfig/mt7986-ax6000.config b/defconfig/mt7986-ax6000.config
index 2e41dc739e..f5a29e868d 100644
--- a/defconfig/mt7986-ax6000.config
+++ b/defconfig/mt7986-ax6000.config
@@ -80,11 +80,11 @@ CONFIG_MTK_MBSS_SUPPORT=y
 CONFIG_MTK_MCAST_RATE_SPECIFIC=y
 CONFIG_MTK_MGMT_TXPWR_CTRL=y
 CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
-CONFIG_MTK_MT7986_NEW_FW=y
 CONFIG_MTK_MT_AP_SUPPORT=m
 CONFIG_MTK_MT_DFS_SUPPORT=y
 CONFIG_MTK_MT_MAC=y
 CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7672=y
 CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
 CONFIG_MTK_MUMIMO_SUPPORT=y
 CONFIG_MTK_MU_RA_SUPPORT=y
@@ -300,7 +300,6 @@ CONFIG_PKG_FORTIFY_SOURCE_2=y
 CONFIG_WARP_CHIPSET="mt7986"
 CONFIG_WARP_DBG_SUPPORT=y
 CONFIG_WARP_MEMORY_LEAK_DBG=y
-CONFIG_WARP_NEW_FW=y
 CONFIG_WARP_VERSION=2
 CONFIG_WED_HW_RRO_SUPPORT=y
 # CONFIG_WOLFSSL_HAS_ECC25519 is not set
diff --git a/defconfig/mt7986-ax7800.config b/defconfig/mt7986-ax7800.config
index 3899c6347d..ef8198c256 100644
--- a/defconfig/mt7986-ax7800.config
+++ b/defconfig/mt7986-ax7800.config
@@ -69,11 +69,11 @@ CONFIG_MTK_MBSS_SUPPORT=y
 CONFIG_MTK_MCAST_RATE_SPECIFIC=y
 CONFIG_MTK_MGMT_TXPWR_CTRL=y
 CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
-CONFIG_MTK_MT7986_NEW_FW=y
 CONFIG_MTK_MT_AP_SUPPORT=m
 CONFIG_MTK_MT_DFS_SUPPORT=y
 CONFIG_MTK_MT_MAC=y
 CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7672=y
 CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
 CONFIG_MTK_MULTI_INF_SUPPORT=y
 CONFIG_MTK_MUMIMO_SUPPORT=y
@@ -294,7 +294,6 @@ CONFIG_PKG_FORTIFY_SOURCE_2=y
 CONFIG_WARP_CHIPSET="mt7986"
 CONFIG_WARP_DBG_SUPPORT=y
 CONFIG_WARP_MEMORY_LEAK_DBG=y
-CONFIG_WARP_NEW_FW=y
 CONFIG_WARP_VERSION=2
 CONFIG_WED_HW_RRO_SUPPORT=y
 # CONFIG_WOLFSSL_HAS_ECC25519 is not set