diff --git a/device/testing/firmware-xiaomi-vince/APKBUILD b/device/testing/firmware-xiaomi-vince/APKBUILD
index 2f290abc7..abfe48ae3 100644
--- a/device/testing/firmware-xiaomi-vince/APKBUILD
+++ b/device/testing/firmware-xiaomi-vince/APKBUILD
@@ -1,41 +1,51 @@
 # Maintainer: m0rf30 <morf3089@gmail.com>
 pkgname=firmware-xiaomi-vince
-pkgver=1
+pkgver=2
 pkgrel=0
-_commit="545e0ce388b40d4e63e61add9b3286205df45f03"
-_commit_vince_fw="432ab3db085d06f17dc866fbe722b11792e58ae1"
+_commit="9ecd545a85eb0d78d1ffd3d5507dcb793294d6c7"
 pkgdesc="Firmware files for Xiaomi Redmi 5 Plus"
 url="https://postmarketos.org"
 arch="aarch64"
 license="proprietary"
 depends="wcnss-wlan adsp-audio"
-source="$pkgname-$_commit.tar.gz::https://github.com/Blacksuan19/android_vendor_xiaomi_vince/archive/$_commit.tar.gz
-vince-fw-$_commit_vince_fw.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-vince/archive/$_commit_vince_fw.tar.gz"
+source="vince-fw-$_commit.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-vince/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
-builddir="$srcdir/postmarketos-vendor-xiaomi-vince-$_commit"
 
-_files_adreno="a506_zap.b00 a506_zap.b01 a506_zap.b02 a506_zap.mdt a530_pfp.fw a530_pm4.fw"
-_files_camera="cpp_firmware_v1_10_0.fw cpp_firmware_v1_12_0.fw cpp_firmware_v1_1_1.fw cpp_firmware_v1_1_6.fw cpp_firmware_v1_2_0.fw cpp_firmware_v1_4_0.fw cpp_firmware_v1_5_0.fw cpp_firmware_v1_5_1.fw cpp_firmware_v1_5_2.fw cpp_firmware_v1_6_0.fw cpp_firmware_v1_8_0.fw"
-_files_finger="goodix_firmware.bin"
-_files_touch="novatek_ts_fw.bin"
-_files_audio="tas2557_uCDSP.bin"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
-	cd $srcdir
-	# /lib/firmware/postmarketos
-	for _i in $_files_adreno \
-		$_files_audio \
-		$_files_camera \
-		$_files_touch \
-		$_files_finger; do
-		install -Dm644 android_vendor_xiaomi_vince-"$_commit"/proprietary/vendor/firmware/"$_i" \
-			"$pkgdir"/lib/firmware/postmarketos/"$_i"
-	done
+	cd "$srcdir/postmarketos-vendor-xiaomi-vince-$_commit"
 
-	cd "$srcdir"
-	cp -r postmarketos-vendor-xiaomi-vince-"$_commit_vince_fw"/* \
-		"$pkgdir"/lib/firmware/postmarketos/
+	# ADSP firmware
+	install -Dm0644 adsp/adsp.* -t "$pkgdir/$_fwdir"
+
+	# Camera firmware
+	install -Dm0644 camera/*.fw -t "$pkgdir/$_fwdir"
+
+	# Fingerprint firmware
+	install -Dm0644 fingerprint/goodix_firmware.bin -t "$pkgdir/$_fwdir"
+
+	# GPU and video acceleration firmwares
+	install -Dm0644 gpu/a530* -t "$pkgdir/$_fwdir/../qcom"
+	install -Dm0644 gpu/a506_zap.* -t "$pkgdir/$_fwdir"
+
+	install -Dm0644 venus/venus.* -t "$pkgdir/$_fwdir"
+
+	# Modem firmware
+	install -Dm0644 modem/mba.mbn -t "$pkgdir/$_fwdir"
+	install -Dm0644 modem/modem.* -t "$pkgdir/$_fwdir"
+
+	# Speaker Amp firmware
+	install -Dm0644 speakeramp/*.bin -t "$pkgdir/$_fwdir"
+
+	# Touchscreen firmware
+	install -Dm0644 touchscreen/novatek_ts_fw.bin -t "$pkgdir/$_fwdir"
+
+	# Wifi/BT firmware
+	install -Dm0644 wcnss/wcnss.* -t "$pkgdir/$_fwdir"
+	cp -r wlan "$pkgdir/$_fwdir"
 }
 
-sha512sums="fa841014bc0bf3101928d0a44fbddbbc2a112d6d31d134aa8482f5d41bf67a5dcdffe93a83d7ddc96c56865890a197a1d0f92d279090be8f0f797f69e892b43f  firmware-xiaomi-vince-545e0ce388b40d4e63e61add9b3286205df45f03.tar.gz
-fd679b823043d40393555cecd77011973affca596fe5151fad4badc9970444655d552cce864180322203e84b3c5ba415a12c59172cac84b4b683c1714596a676  vince-fw-432ab3db085d06f17dc866fbe722b11792e58ae1.tar.gz"
+sha512sums="
+45c840d3fec59ead78e78fc634cbca5dabd3dcef0f02592827196fb92475404b5a2a77a385da38236b2f983054c9ced4fe77ef198d9bdca65f7db2ba7a37e0af  vince-fw-9ecd545a85eb0d78d1ffd3d5507dcb793294d6c7.tar.gz
+"