diff --git a/configs/wifi/txpowerctrl.cfg b/configs/wifi/txpowerctrl.cfg
new file mode 100644
index 0000000..bc2ce9c
--- /dev/null
+++ b/configs/wifi/txpowerctrl.cfg
@@ -0,0 +1,9 @@
+DSI-0;1;2;1;[2G4,40,36,36,34,34,34,39,39,39][5GBAND1,34][5GBAND2,34][5GBAND3,34][5GBAND4,31]
+DSI-1;1;2;1;[2G4,40,36,36,34,34,34,39,39,39][5GBAND1,34][5GBAND2,34][5GBAND3,34][5GBAND4,31]
+DSI-2;1;2;1;[1,36,31,31,29,29,34,39,39,39][2-10,38,36,36,34,34,34,39,39,39][11,38,32,32,29,29,34,39,39,39][12-13,38,36,36,34,34,34,39,39,39][5GBAND1,33,33,33,28,28,27,27,34,34][5GBAND2,32,32,32,28,28,25,25,34,34][5GBAND3,28,28,28,26,26,26,26,34,34][5GBAND4,31,31,31,31,31,31,31,31,31]
+DSI-3;1;2;1;[1,34,31,31,29,29,34,39,39,39][2-10,34,34,34,34,34,34,39,39,39][11,34,32,32,29,29,34,39,39,39][12-13,34,34,34,34,34,34,39,39,39][5GBAND1,29,29,29,28,28,27,27,29,29][5GBAND2,29,29,29,28,28,25,25,29,29][5GBAND3,28,28,28,26,26,26,26,29,29][5GBAND4,29,29,29,29,29,29,29,29,29]
+DSI-4;1;2;1;[2G4,40,36,36,34,34,34,39,39,39][5GBAND1,34][5GBAND2,34][5GBAND3,34][5GBAND4,31]
+DSI-5;1;2;1;[2G4,40,36,36,34,34,34,39,39,39][5GBAND1,34][5GBAND2,34][5GBAND3,34][5GBAND4,31]
+DSI-6;1;2;1;[1,36,31,31,29,29,34,39,39,39][2-10,38,36,36,34,34,34,39,39,39][11,38,32,32,29,29,34,39,39,39][12-13,38,36,36,34,34,34,39,39,39][5GBAND1,33,33,33,28,28,27,27,34,34][5GBAND2,32,32,32,28,28,25,25,34,34][5GBAND3,28,28,28,26,26,26,26,34,34][5GBAND4,31,31,31,31,31,31,31,31,31]
+DSI-7;1;2;1;[1,36,31,31,29,29,34,39,39,39][2-10,38,36,36,34,34,34,39,39,39][11,38,32,32,29,29,34,39,39,39][12-13,38,36,36,34,34,34,39,39,39][5GBAND1,33,33,33,28,28,27,27,34,34][5GBAND2,32,32,32,28,28,25,25,34,34][5GBAND3,28,28,28,26,26,26,26,34,34][5GBAND4,31,31,31,31,31,31,31,31,31]
+DSI-8;1;2;1;[1,34,31,31,29,29,34,39,39,39][2-10,34,34,34,34,34,34,39,39,39][11,34,32,32,29,29,34,39,39,39][12-13,34,34,34,34,34,34,39,39,39][5GBAND1,29,29,29,28,28,27,27,29,29][5GBAND2,29,29,29,28,28,25,25,29,29][5GBAND3,28,28,28,26,26,26,26,29,29][5GBAND4,29,29,29,29,29,29,29,29,29]
\ No newline at end of file
diff --git a/configs/wifi/wifi.cfg b/configs/wifi/wifi.cfg
new file mode 100644
index 0000000..9639071
--- /dev/null
+++ b/configs/wifi/wifi.cfg
@@ -0,0 +1,13 @@
+RoamingTXErrRCPIThreshold 90
+RoamingRCPIGoodValue 70
+RoamingRCPIPoorValue 70
+RoamingRCPIDelta0 2
+RoamingRCPIDelta1 2
+RoamingRcpiHi 70
+AisRoamingNumber 1
+coexBwcIsoCtrl 18
+
+DropPacketsIPV4Low 0x2c2
+DropPacketsIPV6Low 0x2
+DropPacketsSNAPLow 0xe
+
diff --git a/device.mk b/device.mk
index f0f4ebe..d361a4f 100644
--- a/device.mk
+++ b/device.mk
@@ -126,8 +126,7 @@
     init.project.rc \
     init.sensor_1_0.rc \
     init.target.rc \
-    ueventd.mtk.rc \
-    ueventd.oplus.rc
+    ueventd.mtk.rc
 
 # Kernel
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := true
@@ -324,3 +323,7 @@
     android.hardware.wifi.supplicant@1.3.vendor:64 \
     libkeystore-engine-wifi-hidl:64 \
     libkeystore-wifi-hidl:64
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/wifi/txpowerctrl.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/txpowerctrl.cfg \
+    $(LOCAL_PATH)/configs/wifi/wifi.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi.cfg
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 324288b..8b53c09 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2007,7 +2007,6 @@
 odm/firmware/fastchg/20682/oplus_vooc_fw.bin
 
 # Wifi
-odm/etc/wifi/txpowerctrl.cfg
 -vendor/bin/hw/wpa_supplicant
 -vendor/bin/stp_dump3
 -vendor/bin/wfca
@@ -2036,5 +2035,3 @@
 # Wifi (Firmware)
 vendor/firmware/WIFI_RAM_CODE_soc1_0_2a_1.bin
 vendor/firmware/WMT_SOC.cfg
-vendor/firmware/wifi_19661.cfg
-vendor/firmware/wifi_20682.cfg
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index 21aded8..f5e053a 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -79,10 +79,3 @@
     filename_from_src: true,
     vendor: true,
 }
-
-prebuilt_etc {
-    name: "ueventd.oplus.rc",
-    src: "etc/ueventd.oplus.rc",
-    filename: "ueventd.rc",
-    device_specific: true,
-}
diff --git a/rootdir/etc/ueventd.oplus.rc b/rootdir/etc/ueventd.oplus.rc
deleted file mode 100644
index 83e40fd..0000000
--- a/rootdir/etc/ueventd.oplus.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (C) 2022 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# WiFi
-firmware_directories /odm/etc/wifi/