diff --git a/Android.mk b/Android.mk
index d50bd9e..c366165 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,7 +98,7 @@ WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
 $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "Creating wifi firmware symlinks: $@"
 	@mkdir -p $@
-	$(hide) ln -sf /mnt/vendor/persist/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
+	$(hide) ln -sf /odm/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
 	$(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin
 
 ALL_DEFAULT_INSTALLED_MODULES += $(ACDBDATA_SYMLINKS) $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)
diff --git a/device.mk b/device.mk
index 8fe8a57..0303de7 100644
--- a/device.mk
+++ b/device.mk
@@ -540,10 +540,6 @@ PRODUCT_PACKAGES += \
     wpa_supplicant \
     wpa_supplicant.conf
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-    $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e4e85c8..4f61778 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1798,8 +1798,10 @@ vendor/lib64/libtrustedapploader.so
 
 # WiFi
 odm/etc/wifi/regdb.bin
+odm/etc/wifi/WCNSS_qcom_cfg.ini
 vendor/bin/cnss-daemon
-vendor/etc/wifi/WCNSS_qcom_cfg.ini
+vendor/etc/wifi/p2p_supplicant_overlay.conf
+vendor/etc/wifi/wpa_supplicant_overlay.conf
 
 # WiFi Display
 -system/framework/WfdCommon.jar
diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf
deleted file mode 100644
index 2b27c5b..0000000
--- a/wifi/p2p_supplicant_overlay.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-disable_scan_offload=1
-p2p_no_group_iface=1
-persistent_reconnect=1
-bss_max_count=400
diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf
deleted file mode 100644
index 799420d..0000000
--- a/wifi/wpa_supplicant_overlay.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-disable_scan_offload=1
-p2p_disabled=1
-tdls_external_control=1
-wowlan_triggers=magic_pkt
-bss_max_count=400
-interworking=1
-config_methods=virtual_display virtual_push_button keypad
-driver_param="no_rrm=1 use_p2p_group_interface=1"