diff --git a/sdmshrike_au/WCNSS_qcom_cfg.ini b/sdmshrike_au/WCNSS_qcom_cfg.ini
index 35e017b641a85c91e068d2d108097f8e4423ba02..881d81ffc7b29163c51b280ed04c391d64742f92 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg.ini
@@ -1,6 +1,9 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=1
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
index 35e017b641a85c91e068d2d108097f8e4423ba02..881d81ffc7b29163c51b280ed04c391d64742f92 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
@@ -1,6 +1,9 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=1
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
index 091b46dfde1189ce4e3d2b586337650da1790af0..9c7b478985bd593c606c0096f9142c26c474d4c7 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
@@ -1,6 +1,9 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=0
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
index 2d3ddc825552b162d4cc506900bacf90ce7e3ccc..ee4cf91afd2b9fbb3c40391b3be819b2c9429db6 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -1,6 +1,9 @@
 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=0
 #gEnableImps=0
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index de630fdd2f5dd5f04691f4b7a29b13c3a8de9755..85f94627a45e640086e2a1023faba92328de61ae 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -37,3 +37,11 @@ PRODUCT_PACKAGES += init.qcom.wlan.sh
 PRODUCT_COPY_FILES += \
     device/qcom/wlan/msmnile_au/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh
 endif
+
+ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
+# Pure AOSP: Use pre-defined interface combinations with STA+SAP support
+WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
+else
+# Value-added AOSP: STA + SAP + P2P or NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+endif