diff --git a/device/testing/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD
index 7e94894bc..4638b663b 100644
--- a/device/testing/device-asus-z010d/APKBUILD
+++ b/device/testing/device-asus-z010d/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-z010d
 pkgdesc="Asus Zenfone Max ZC550KL"
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,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() {
@@ -39,14 +38,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-asus-z010d-venus firmware-asus-z010d-wcnss"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-asus-z010d-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-asus-z010d/APKBUILD b/device/testing/firmware-asus-z010d/APKBUILD
index 3c9cdeb51..665122903 100644
--- a/device/testing/firmware-asus-z010d/APKBUILD
+++ b/device/testing/firmware-asus-z010d/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-asus-z010d
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware for Asus Zenfone Max ZC550KL"
 url="https://gitlab.com/camillathechicken/firmware-max"
-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,10 +21,11 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-modem() {
-	pkgdesc="Asus Zenfone Max ZC550KL modem firmware"
-	install -Dm644 "$builddir"/mba.mbn -t "$subpkgdir/$_fwdir"
-	install -Dm644 "$builddir"/modem.* -t "$subpkgdir/$_fwdir"
+wcnss_nv() {
+	pkgdesc="Asus Zenfone Max ZC550KL WiFi/BT firmware configuration"
+	replaces="firmware-asus-z010d-wcnss"
+	cd "$builddir"
+	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
 }
 
 venus() {
@@ -32,11 +33,4 @@ venus() {
 	install -Dm644 "$builddir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
 }
 
-wcnss() {
-	pkgdesc="Asus Zenfone Max ZC550KL WiFi/BT firmware"
-	cd "$builddir"
-	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
 sha512sums="870c4835de86aac68f29249d6f1545dc8b9ccdb4c3a19ed19eb3429c5d0ab40ed3ffceba36bf54b69a9e3ca2170fde66b2e357a8686580865bfa38e8b99e0cd6  firmware-asus-z010d-v0.1.tar.gz"