diff --git a/msmnile_au/wlan.mk b/msmnile_au/wlan.mk
index fd79edad0b4b70841425b05009c779ef1a0eeb4e..2fec3884f2b2efd474f27c60e8d86d2beea275ab 100644
--- a/msmnile_au/wlan.mk
+++ b/msmnile_au/wlan.mk
@@ -52,4 +52,4 @@ endif
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y
diff --git a/sdm710/WCNSS_qcom_cfg.ini b/sdm710/WCNSS_qcom_cfg.ini
index 34b9e7fe88275fb5ba41ad3e696bc073162a688d..4fbd7cd22fef40213ac493221257e06010008490 100644
--- a/sdm710/WCNSS_qcom_cfg.ini
+++ b/sdm710/WCNSS_qcom_cfg.ini
@@ -442,6 +442,7 @@ maxMSDUsPerRxInd=8
 # 1 - enable  0 - disable(default)
 gEnableNanSupport=1
 genable_nan_datapath=1
+nan_separate_iface_support=0
 ################ NAN feature set end #####################
 
 adaptive_dwell_mode_enabled=1
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index 432a7cddb6d4809991f17bf11cd0b069dc5fb69a..0c1debbbf5caa0a76dc7eb56ef601f6a95d0c00b 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -45,3 +45,10 @@ else
 # Value-added AOSP: STA + SAP + P2P or NAN
 WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
 endif
+
+# Override WLAN configurations
+# Usage:
+# To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
+# (<wlan_chip> is from $TARGET_WLAN_CHIP).
+#   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FW_THERMAL_THROTTLE=y
diff --git a/sm6150_au/wlan.mk b/sm6150_au/wlan.mk
index 2feea2ad23b0419c48a08572288e0a7c83c32355..798962094378aac93759ca2ca9ebba400dca4c62 100644
--- a/sm6150_au/wlan.mk
+++ b/sm6150_au/wlan.mk
@@ -47,17 +47,10 @@ else
 WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
 endif
 
-# Override WLAN configurations
-# # Usage:
-# # To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
-# # (<wlan_chip> is from $TARGET_WLAN_CHIP).
-# #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_IPA_OFFLOAD=y
-
 # Override WLAN configurations
 # Usage:
 # To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_IPA_DISABLE_OVERRIDE=y