diff --git a/device/testing/device-lenovo-a6000/APKBUILD b/device/testing/device-lenovo-a6000/APKBUILD
index 89ea40bfa..d0e6d16bf 100644
--- a/device/testing/device-lenovo-a6000/APKBUILD
+++ b/device/testing/device-lenovo-a6000/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,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() {
@@ -38,14 +37,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-qcom-msm8916-wcnss firmware-lenovo-a6000-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-lenovo-a6000-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-qcom-msm8916-wcnss firmware-lenovo-a6000-wcnss-nv"
 	mkdir "$subpkgdir"
 }