diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf
new file mode 100644
index 0000000..c6a0efd
--- /dev/null
+++ b/configs/p2p_supplicant_overlay.conf
@@ -0,0 +1,15 @@
+disable_scan_offload=1
+p2p_listen_reg_class=81
+p2p_listen_channel=1
+p2p_oper_reg_class=124
+p2p_oper_channel=149
+manufacturer=SAMSUNG_ELECTRONICS
+model_name=SAMSUNG_MOBILE
+model_number=2014
+serial_number=19691101
+update_config=1
+p2p_add_cli_chan=1
+ip_addr_go=192.168.49.1
+ip_addr_mask=255.255.255.0
+ip_addr_start=192.168.49.200
+ip_addr_end=192.168.49.254
diff --git a/configs/wpa_supplicant.conf b/configs/wpa_supplicant.conf
new file mode 100644
index 0000000..4d05858
--- /dev/null
+++ b/configs/wpa_supplicant.conf
@@ -0,0 +1,5 @@
+update_config=1
+eapol_version=1
+ap_scan=1
+fast_reauth=1
+p2p_add_cli_chan=1
diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf
new file mode 100644
index 0000000..8479b25
--- /dev/null
+++ b/configs/wpa_supplicant_overlay.conf
@@ -0,0 +1,2 @@
+p2p_disabled=1
+update_config=1
\ No newline at end of file
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3cd92c3..11fe591 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -209,7 +209,4 @@ vendor/etc/wifi/mx140_t_wlan.hcf
 vendor/etc/wifi/mx140_t_wlan_t.hcf
 vendor/etc/wifi/mx140_wlan.hcf
 vendor/etc/wifi/mx140_wlan_t.hcf
-vendor/etc/wifi/p2p_supplicant_overlay.conf
 vendor/etc/wifi/platform.txt
-vendor/etc/wifi/wpa_supplicant.conf
-vendor/etc/wifi/wpa_supplicant_overlay.conf
diff --git a/universal7904-common.mk b/universal7904-common.mk
index d0bd50f..2be30f5 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -244,3 +244,8 @@ PRODUCT_PACKAGES += \
     hostapd \
     TetheringConfigOverlay \
     wpa_supplicant
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    $(LOCAL_PATH)/configs/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+    $(LOCAL_PATH)/configs/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf