diff --git a/msmnile_au/wlan.mk b/msmnile_au/wlan.mk
index 32e84df115f563de7c06d4566acda6ede3af7d0d..abe56bfbc4cac2b9a027fdcb8319866cb4fcb30e 100644
--- a/msmnile_au/wlan.mk
+++ b/msmnile_au/wlan.mk
@@ -42,8 +42,9 @@ 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}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index 6dcd3f0925b045df5e989fd1d8ece17a34c3427c..34c646ec1d3256d82cf8310aa8874882c79b0e69 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -42,8 +42,9 @@ 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}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations
diff --git a/sm6150_au/wlan.mk b/sm6150_au/wlan.mk
index e2a8984a37a9e231bcf9dadb5438222d204b4263..4757c1f32c066b71b2d355710058d3b51f01485b 100644
--- a/sm6150_au/wlan.mk
+++ b/sm6150_au/wlan.mk
@@ -43,8 +43,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WIFI_HIDL_FEATURE_AWARE := true
 else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations