diff --git a/device/testing/device-xiaomi-raphael/APKBUILD b/device/testing/device-xiaomi-raphael/APKBUILD
index d05ae2dd3..c2a3bbc41 100644
--- a/device/testing/device-xiaomi-raphael/APKBUILD
+++ b/device/testing/device-xiaomi-raphael/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-raphael
 pkgdesc="Xiaomi Mi 9T Pro / Redmi K20 Pro"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,8 +42,10 @@ nonfree_firmware() {
 		firmware-xiaomi-raphael-cdsp
 		firmware-xiaomi-raphael-ipa
 		firmware-xiaomi-raphael-slpi
+		firmware-xiaomi-raphael-modem
 		firmware-xiaomi-raphael-touchscreen
 		firmware-xiaomi-raphael-venus
+		firmware-xiaomi-raphael-wlan
 		linux-firmware-ath11k
 		linux-firmware-qcom
 		msm-modem
diff --git a/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files b/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
index 0b0113595..e9a0920d1 100644
--- a/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
+++ b/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
@@ -1,36 +1,37 @@
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_gmu.bin
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/adsp.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/adspr.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/cdsp.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/cdspr.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/modem.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/modemr.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/modemuw.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/slpir.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/slpius.jsn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/venus.mbn
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/CAMERA_ICP.elf
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a612_rgmu.bin
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a630_gmu.bin
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a630_sqe.fw
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b00
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b01
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b02
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.elf
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mdt
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_cfg_f11.bin
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_fw_f11.bin
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b00
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b01
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b02
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b03
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b04
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.elf
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.mdt
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b00
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b01
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b02
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.elf
-./lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.mdt
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_gmu.bin
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/adsp.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/adspr.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/cdsp.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/cdspr.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/modem.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/modemr.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/modemuw.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/slpir.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/slpius.jsn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/venus.mbn
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/CAMERA_ICP.elf
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a612_rgmu.bin
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a630_gmu.bin
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a630_sqe.fw
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b00
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b01
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b02
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.elf
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mdt
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_cfg_f11.bin
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_fw_f11.bin
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b00
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b01
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b02
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b03
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.b04
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.elf
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_fws.mdt
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b00
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b01
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.b02
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.elf
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/ipa_uc.mdt
+/lib/firmware/qcom/sm8150/Xiaomi/raphael/wlanmdsp.mbn
diff --git a/device/testing/firmware-xiaomi-raphael/APKBUILD b/device/testing/firmware-xiaomi-raphael/APKBUILD
index 8083e87d6..1cd997282 100644
--- a/device/testing/firmware-xiaomi-raphael/APKBUILD
+++ b/device/testing/firmware-xiaomi-raphael/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-xiaomi-raphael
 pkgver=20240820
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for Xiaomi Mi 9T Pro / Redmi K20 Pro"
 arch="aarch64"
 _carch="arm64"
@@ -10,9 +10,11 @@ subpackages="
 	$pkgname-camera
 	$pkgname-cdsp
 	$pkgname-ipa
+	$pkgname-modem
 	$pkgname-slpi
 	$pkgname-touchscreen
 	$pkgname-venus
+	$pkgname-wlan
 	"
 
 url="https://github.com/dabao1955/pmos_firmware_xiaomi_raphael"
@@ -38,41 +40,41 @@ adreno() {
 	depends="firmware-qcom-adreno-a650"
 	ls "$builddir"
 	install -Dm644 "$builddir"/sm8150/raphael/a6* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 adsp() {
 	pkgdesc="Xiaomi raphael adsp firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/adsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 camera() {
 	pkgdesc="Xiaomi raphael camera firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/CAMERA_ICP.elf -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 cdsp() {
 	pkgdesc="Xiaomi raphael cdsp firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/cdsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 ipa() {
 	pkgdesc="Xiaomi raphael ipa firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/ipa* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 modem() {
 	pkgdesc="Xiaomi raphael modem firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/modem* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 
@@ -80,23 +82,29 @@ slpi() {
 	pkgdesc="Xiaomi raphael slpi firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/slpi* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 touchscreen() {
 	pkgdesc="Xiaomi raphael touchscreen firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/good* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 venus() {
 	pkgdesc="Xiaomi raphael venus firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/venus.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/raphael/"
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+}
+
+wlan() {
+	pkgdesc="Xiaomi raphael wlan firmware"
+
+	install -Dm644 "$builddir"/sm8150/raphael/wlanmdsp.mbn -t \
+		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
 }
 
 sha512sums="
 6e1b7d49846fa9834ccd8ee3bb64751c844bdfff52a4501a048f9055e59afb1f31b69bd5b2cd8296d86b89064c86cabb9c7e9dc9db9cd9fb43db9e4b4b478a39 45b6e993cf5d6fec447d924cf773783a8dbfb596.tar.gz
-c4e4a36dc0fd52569dec9f18c09849862d864fbbe56b044f22ce0d5c1ceb4380d08645c894a86f0668250fe48e5eef6a5f1f5147200efd918e4a340547ca084e  30-gpu-firmware.files
-"
+84f75192d6e9c413c2c583b034fcd87e44e39197883047cd77d976b47e8d31e6429db24110addfeed348712773163af69492fb0687a770f3994d697b740875c9  30-gpu-firmware.files"