diff --git a/BoardConfig.mk b/BoardConfig.mk
index cb48dc6..b890178 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -203,6 +203,7 @@ TARGET_USES_QCOM_WCNSS_QMI := true
 WIFI_DRIVER_FW_PATH_AP := "ap"
 WIFI_DRIVER_FW_PATH_STA := "sta"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 # inherit from the proprietary version
 -include vendor/samsung/mondrianwifi/BoardConfigVendor.mk
diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf
index acbace2..71f2e4f 100755
--- a/configs/p2p_supplicant_overlay.conf
+++ b/configs/p2p_supplicant_overlay.conf
@@ -1 +1,3 @@
 disable_scan_offload=1
+p2p_search_delay=100
+p2p_no_group_iface=1
diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf
index 06fc042..55b3f37 100755
--- a/configs/wpa_supplicant_overlay.conf
+++ b/configs/wpa_supplicant_overlay.conf
@@ -1 +1,4 @@
+disable_scan_offload=1
 p2p_disabled=1
+tdls_external_control=1
+driver_param=use_p2p_group_interface=1
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 615fe59..f721422 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -907,16 +907,6 @@ service qmuxd /vendor/bin/qmuxd
     user radio
     group radio audio bluetooth gps oem_2950 log
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
-    -g@android:wpa_wlan0
-    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
 service macloader /vendor/bin/macloader
     class late_start
     oneshot
@@ -1049,4 +1039,4 @@ service init-input-sh /vendor/bin/init.input.sh
     class core
     user root
     group root
-    oneshot
\ No newline at end of file
+    oneshot