diff --git a/device/testing/firmware-oneplus-msm8998/30-gpu-firmware.files b/device/testing/firmware-oneplus-msm8998/30-gpu-firmware.files
index 5f4dfe184..3f7e8c5ac 100644
--- a/device/testing/firmware-oneplus-msm8998/30-gpu-firmware.files
+++ b/device/testing/firmware-oneplus-msm8998/30-gpu-firmware.files
@@ -1,4 +1,4 @@
 /lib/firmware/qcom/a530_pfp.fw
 /lib/firmware/qcom/a530_pm4.fw
 /lib/firmware/qcom/a540_gpmu.fw2
-/lib/firmware/qcom/a540_zap.mbn
+/lib/firmware/qcom/msm8998/oneplus/a540_zap.mbn
diff --git a/device/testing/firmware-oneplus-msm8998/APKBUILD b/device/testing/firmware-oneplus-msm8998/APKBUILD
index 920f2a37f..dedef1842 100644
--- a/device/testing/firmware-oneplus-msm8998/APKBUILD
+++ b/device/testing/firmware-oneplus-msm8998/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
 pkgname=firmware-oneplus-msm8998
 pkgver=10.0.1
-pkgrel=0
-_commit="7ff57ed71367b70904f9b43bff873816d70f1cba"
+pkgrel=1
+_commit="a1a0dfd9be6fe250559c01678569e5295a4c335d"
 pkgdesc="Firmware for OnePlus 5/5T"
 url="https://github.com/JamiKettunen/firmware-mainline-oneplus5"
 # Conflicts with ath10k/WCN3990/hw1.0/firmware-5.bin, qca/cr{btfw21.tlv,nv21.bin} & qcom/a530_p{fp,m4}.fw
@@ -37,7 +37,7 @@ firmware_initramfs() {
 }
 
 sha512sums="
-14b8bac7cc899caa4b83ca4787d2e2dcf9db1ef8c46b7427e0afeb68f937e680164153d98b3ecbbd40a450296c7fe0f748946475d29dcaa9b9d25a6b36ace04c  firmware-oneplus-msm8998-7ff57ed71367b70904f9b43bff873816d70f1cba.tar.gz
-974b7bcef52b4ae6d6fa11212ede1ddc9a9944dc3d6b066b0813072d8a9586929db8052670d98277db15cc1e2aa2d731c97c9c3d443f26bd3afab7e885230cba  30-gpu-firmware.files
-4aa7fca56855ea9091257f138bcbf051c3e637d983965d702204d933dc457f77171492c1eb83ce2c6bb0ce2fce83fcbdbf0419e85b83364f33fcc1f1c4ea5e73  firmware.files
+c8997e5b2fde1c57651234be63f84b6f8d62f29fc8b55d8ebb8268cb7636241f7f5d11609bbcae71bd734eca9fd857330755979ad3e432a0c7bc6f3b034ea710  firmware-oneplus-msm8998-a1a0dfd9be6fe250559c01678569e5295a4c335d.tar.gz
+c29e0abb08dd345d88223e29e49290226d0df63470a809ef3c933f7f088f709fd54da6d01c9a7c249b42e84fb86ca39a20a38e5055d3d1c53f37e4a3ab892a16  30-gpu-firmware.files
+b1914c193421eb3cfd49f1cd06e82693a4b895b31381bf423215741a4a8679f290cf6720cedf264696392524ea2899fc5287ef0de9412c7a1e910451dcdf9513  firmware.files
 "
diff --git a/device/testing/firmware-oneplus-msm8998/firmware.files b/device/testing/firmware-oneplus-msm8998/firmware.files
index 05907669a..6404d9846 100644
--- a/device/testing/firmware-oneplus-msm8998/firmware.files
+++ b/device/testing/firmware-oneplus-msm8998/firmware.files
@@ -5,7 +5,7 @@ qca/crnv21.bin
 qcom/a530_pfp.fw
 qcom/a530_pm4.fw
 qcom/a540_gpmu.fw2
-qcom/a540_zap.mbn
+qcom/msm8998/oneplus/a540_zap.mbn
 qcom/msm8998/oneplus/adsp.mbn
 qcom/msm8998/oneplus/adspua.jsn
 qcom/msm8998/oneplus/ipa_fws.mbn