diff --git a/device/testing/device-motorola-osprey/APKBUILD b/device/testing/device-motorola-osprey/APKBUILD
index d80e9bfa4..2746946f4 100644
--- a/device/testing/device-motorola-osprey/APKBUILD
+++ b/device/testing/device-motorola-osprey/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-osprey
-pkgver=2
-pkgrel=3
+pkgver=3
+pkgrel=0
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://postmarketos.org"
 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/Wi-Fi/Bluetooth/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-motorola-osprey-wcnss firmware-motorola-osprey-venus"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-motorola-osprey-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-osprey-wcnss-nv firmware-motorola-osprey-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-motorola-osprey/APKBUILD b/device/testing/firmware-motorola-osprey/APKBUILD
index 7d9d3a7a5..b6cd99abd 100644
--- a/device/testing/firmware-motorola-osprey/APKBUILD
+++ b/device/testing/firmware-motorola-osprey/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=firmware-motorola-osprey
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Motorola Moto G 2015"
 url="https://github.com/pmsourcedump/firmware-motorola-osprey"
-subpackages="$pkgname-wcnss $pkgname-venus $pkgname-modem"
+subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
@@ -18,10 +18,10 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-wcnss() {
-	pkgdesc="Motorola Moto G 2015 Wi-Fi/Bluetooth firmware"
+wcnss_nv() {
+	pkgdesc="Motorola Moto G 2015 Wi-Fi/Bluetooth firmware configuration"
+	replaces="firmware-motorola-osprey-wcnss"
 	cd "$srcdir/firmware-motorola-osprey-$_commit"
-	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
 	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir/wlan/prima"
 }
 
@@ -32,11 +32,4 @@ venus() {
 	install -Dm644 venus.mdt -t "$subpkgdir/$_fwdir/qcom/venus-1.8"
 }
 
-modem() {
-	pkgdesc="Motorola Moto G 2015 modem firmware"
-	cd "$srcdir/firmware-motorola-osprey-$_commit"
-	install -Dm644 modem.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 mba.mbn -t "$subpkgdir/$_fwdir"
-}
-
 sha512sums="7e8d02baa8864c50b4a8be1f9af830e8b5440eee61a012725ed114d93012f0fb19ec005908832d3c96e0ba54b51a5ec7bcf137bfcc64c63594212f2497604629  firmware-motorola-osprey-a47c5a1c2dd806226c61305c9c97135f2734d0c7.tar.gz"