diff --git a/device/testing/device-asus-z00l/APKBUILD b/device/testing/device-asus-z00l/APKBUILD
index 23ace63c3..bf63db0c5 100644
--- a/device/testing/device-asus-z00l/APKBUILD
+++ b/device/testing/device-asus-z00l/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Antony J.R. <antonyjr@pm.me>
 pkgname=device-asus-z00l
 pkgdesc="ASUS Zenfone 2 Laser (720p)"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-mainline-modem:kernel_mainline_modem
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
 "
 
 build() {
@@ -40,14 +39,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-asus-z00l-venus firmware-asus-z00l-wcnss"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-asus-z00l-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-asus-z00l-wcnss-nv firmware-asus-z00l-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-asus-z00l/APKBUILD b/device/testing/firmware-asus-z00l/APKBUILD
index f0bdd04f1..f507e5bc7 100644
--- a/device/testing/firmware-asus-z00l/APKBUILD
+++ b/device/testing/firmware-asus-z00l/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-asus-z00l
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for ASUS Zenfone 2 Laser (720p) (ZE550KL)"
 url="https://github.com/antony-jr/firmware-asus-z00l-raw"
-subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
@@ -21,11 +21,12 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-modem() {
-	pkgdesc="ASUS Zenfone 2 Laser modem firmware"
+wcnss_nv() {
+	pkgdesc="ASUS Zenfone 2 Laser WiFi/BT firmware configuration"
+	replaces="firmware-asus-z00l-wcnss"
 	cd "$builddir"
-	install -Dm644 firmware/image/mba.mbn -t "$subpkgdir/$_fwdir"
-	install -Dm644 firmware/image/modem.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 etc-firmware/wlan/prima/WCNSS_qcom_wlan_nv_ze550kl.bin \
+		"$subpkgdir/$_fwdir"/wlan/prima/WCNSS_qcom_wlan_nv.bin
 }
 
 venus() {
@@ -35,12 +36,4 @@ venus() {
 		-t "$subpkgdir/$_fwdir"/qcom/venus-1.8
 }
 
-wcnss() {
-	pkgdesc="ASUS Zenfone 2 Laser WiFi/BT firmware"
-	cd "$builddir"
-	install -Dm644 firmware/image/wcnss.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 etc-firmware/wlan/prima/WCNSS_qcom_wlan_nv_ze550kl.bin \
-		"$subpkgdir/$_fwdir"/wlan/prima/WCNSS_qcom_wlan_nv.bin
-}
-
 sha512sums="176da0aa399eddb6b9ab582b12bc698af369397a19c28556c39a656b573a5d4b02effe11a97d2f4c81568df03bc7859d999eb5d196a842dde4940cee192b96b3  firmware-asus-z00l-d78364b2127e8187f79e271e94dde03f0f722432.tar.gz"