diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc
index 76a8309..8fe9268 100644
--- a/conf/init.cloudripper.rc
+++ b/conf/init.cloudripper.rc
@@ -51,13 +51,3 @@ on post-fs-data
     setprop wifi.direct.interface p2p-dev-wlan0
     setprop wifi.aware.interface aware_nmi0
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
-    -m/vendor/etc/wifi/p2p_supplicant.conf \
-    -g@android:wpa_wlan0 -dd
-    interface aidl android.hardware.wifi.supplicant.ISupplicant/default
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
-
diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index b087d95..48abe65 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -63,16 +63,6 @@ on post-fs-data
     chown system system /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg
     chmod 600 /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
-    -m/vendor/etc/wifi/p2p_supplicant.conf \
-    -g@android:wpa_wlan0 -dd
-    interface aidl android.hardware.wifi.supplicant.ISupplicant/default
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
-
 # NFC
 on property:ro.boot.hardware.revision=PROTO1.0
     setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf
diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc
index d2ce3d8..70bae17 100644
--- a/conf/init.ravenclaw.rc
+++ b/conf/init.ravenclaw.rc
@@ -43,13 +43,3 @@ on post-fs-data
     setprop wifi.direct.interface p2p-dev-wlan0
     setprop wifi.aware.interface aware_nmi0
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
-    -m/vendor/etc/wifi/p2p_supplicant.conf \
-    -g@android:wpa_wlan0 -dd
-    interface aidl android.hardware.wifi.supplicant.ISupplicant/default
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
-
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 64a6fb5..bc0cb80 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -30,8 +30,9 @@ WIFI_FEATURE_IMU_DETECTION := true
 WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
 BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 PRODUCT_COPY_FILES += \
-    device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
+    device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant_overlay.conf
similarity index 100%
rename from wifi/p2p_supplicant.conf
rename to wifi/p2p_supplicant_overlay.conf