diff --git a/device-akita.mk b/device-akita.mk
index 64dd884..423e699 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -267,7 +267,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=1
-
-# Wifi SAP Interface Name
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.wifi.sap.interface=wlan1
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index a941afa..1035c0f 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -23,7 +23,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_HOSTAPD_DRIVER := NL80211
 # Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 P2P}
 # or {1 STA + 1 NAN}
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN}, 1}}, {{{AP}, 1}}
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP}, 1}}
 WIFI_FEATURE_WIFI_EXT_HAL := true
 WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change