diff --git a/device/testing/firmware-asus-s5507q/APKBUILD b/device/testing/firmware-asus-s5507q/APKBUILD
index 1a5eca7da..f605e5a6f 100644
--- a/device/testing/firmware-asus-s5507q/APKBUILD
+++ b/device/testing/firmware-asus-s5507q/APKBUILD
@@ -1,47 +1,53 @@
 maintainer="binarycraft007 <keep.it.sns@gmail.com>"
 pkgname=firmware-asus-s5507q
-pkgver=3
+pkgver=4
 pkgrel=0
 _commit="2f3f3b5cc679f88a6f672490778e19016e51a70b"
 pkgdesc="Firmware files for ASUS Vivobook S 15"
 url="https://github.com/binarycraft007/firmware-asus-s5507q"
 arch="aarch64"
+license="proprietary"
 # TODO: Replace with a dependency on firmware-qcom-adreno-gen70500 (which is not .zst compressed though)
 depends="
-	linux-firmware-qcom
-	linux-firmware-qca
 	linux-firmware-ath12k
+	linux-firmware-qca
+	linux-firmware-qcom
 "
-license="proprietary"
-source="$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz
+subpackages="
+	$pkgname-common
+	$pkgname-dpu
+"
+source="$pkgname-$_commit.tar.gz::https://github.com/binarycraft007/firmware-asus-s5507q/archive/$_commit.tar.gz
 	dpu.files
 	common.files
 "
-options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
-builddir="$srcdir/firmware-asus-s5507q-$_commit"
-
-subpackages="
-	$pkgname-common:common
-	$pkgname-dpu:dpu
-"
+options="!archcheck !check !spdx !strip !tracedeps pmb:cross-native"
+builddir="$srcdir/$pkgname-$_commit"
 
 package() {
-	mkdir -p "$pkgdir"
+	install -Dm644 "$srcdir/common.files" \
+		-t "$pkgdir"/usr/share/mkinitfs/files/
+	install -Dm644 "$srcdir/dpu.files" \
+		-t "$pkgdir"/usr/share/mkinitfs/files/
+
+	local _i _u
+	while IFS="" read -r _i || [ -n "$_i" ]; do
+		_u="${_i/usr\/lib/\/lib}"
+		[ ! -d "$(dirname "$_i")" ] && mkdir -p "$(dirname "$pkgdir"/"$_i")"
+		install -Dm644 "$builddir"/"$_u" "$pkgdir"/"$_i"
+	done < "$srcdir"/common.files
 }
 
 common() {
-	while IFS="" read -r _i || [ -n "$_i" ]; do
-		install -Dm644 "$builddir/$_i" "$subpkgdir/$_i"
-	done < "$srcdir/common.files"
-	install -Dm644 "$srcdir/common.files" "$subpkgdir/usr/share/mkinitfs/files/common.files"
+	amove usr/share/mkinitfs/files/common.files
 }
 
 dpu() {
-	install -Dm644 "$srcdir/dpu.files" "$subpkgdir/usr/share/mkinitfs/files/dpu.files"
+	amove usr/share/mkinitfs/files/dpu.files
 }
 
 sha512sums="
 45f66a759102987a47cb7c30a67a4350c2590958a62b542261324de4ea60ab160e96f16406f65241c91d1e172f6d486e1c8476f03e15ffc246e03a22b8c03ca4  firmware-asus-s5507q-2f3f3b5cc679f88a6f672490778e19016e51a70b.tar.gz
-1ab5d99b050db2a65d0ada43e333145bf59b38a9658116c80977d01f94b3dbb0c3e9c2f30824f96e43f949706857a777024c0f095b989eaef013c4d5e5238cfc  dpu.files
-1e2c5127e9dc40275419f518b5fe16304efd7028321a36c3e4fdf4ec1ce10f222ce841c1e7b249abd4349764053e1b5ed10e025778cc3d1f9bebad9ee02a731c  common.files
+3999e069d570c61728a1dfbd3ed8a28ac45556a22e9eb75ad851b81d9ca5f4e6162ddbfb18527867abcc13349b16d8a556c996b9de0bf2863545de9243a76afa  dpu.files
+b59a4f8800e1c6f4425272c47855d24093f31b3d5c3b7f5711a44fa1556d8ab1cdebb4db7c3700497297a2e54fcab9a0f22922e2fbceb6cc9e67f741a72cbd33  common.files
 "
diff --git a/device/testing/firmware-asus-s5507q/common.files b/device/testing/firmware-asus-s5507q/common.files
index 5ee3c810d..d9852bfa3 100644
--- a/device/testing/firmware-asus-s5507q/common.files
+++ b/device/testing/firmware-asus-s5507q/common.files
@@ -1,11 +1,11 @@
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adsp_dtbs.elf
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adspr.jsn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adsps.jsn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adspua.jsn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/battmgr.jsn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/cdsp_dtbs.elf
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/cdspr.jsn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcadsp8380.mbn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qccdsp8380.mbn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn
-/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcvss8380.mbn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adsp_dtbs.elf
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adspr.jsn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adsps.jsn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/adspua.jsn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/battmgr.jsn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/cdsp_dtbs.elf
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/cdspr.jsn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcadsp8380.mbn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qccdsp8380.mbn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn
+/usr/lib/firmware/qcom/x1e80100/ASUSTeK/vivobook-s15/qcvss8380.mbn
diff --git a/device/testing/firmware-asus-s5507q/dpu.files b/device/testing/firmware-asus-s5507q/dpu.files
index eff31a9f6..9e29e1196 100644
--- a/device/testing/firmware-asus-s5507q/dpu.files
+++ b/device/testing/firmware-asus-s5507q/dpu.files
@@ -1,2 +1,2 @@
-/lib/firmware/qcom/gen70500_sqe.fw.zst
-/lib/firmware/qcom/gen70500_gmu.bin.zst
+/usr/lib/firmware/qcom/gen70500_sqe.fw.zst
+/usr/lib/firmware/qcom/gen70500_gmu.bin.zst