diff --git a/device/community/device-bq-paella/APKBUILD b/device/community/device-bq-paella/APKBUILD
index b7a921203..06fce9bd9 100644
--- a/device/community/device-bq-paella/APKBUILD
+++ b/device/community/device-bq-paella/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=3
-pkgrel=5
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -16,7 +16,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() {
@@ -41,18 +40,11 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-bq-picmt-venus
+	depends="linux-firmware-qcom msm-firmware-loader
 		 firmware-qcom-msm8916-wcnss firmware-bq-picmt-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-bq-picmt-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 0d766c480ca6c5b0d91610fd33a1269b6ecf8a30fed4366ea1988bdc6398ee3a5a0551e20976a43913a636dc3e27d2e13a7960ae92cd4f268421654cd1a0aaad  deviceinfo
 "