diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD
index 3c6484323..de84ec3df 100644
--- a/device/community/device-motorola-harpia/APKBUILD
+++ b/device/community/device-motorola-harpia/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -40,8 +40,9 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader
+		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD
index d2099a0ff..afac2e1c7 100644
--- a/device/community/device-wileyfox-crackling/APKBUILD
+++ b/device/community/device-wileyfox-crackling/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,8 +39,9 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader
+		 firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-alcatel-idol347/APKBUILD b/device/testing/device-alcatel-idol347/APKBUILD
index 2b6b088d9..fc66d9348 100644
--- a/device/testing/device-alcatel-idol347/APKBUILD
+++ b/device/testing/device-alcatel-idol347/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Vincent Knecht <vincent.knecht@mailoo.org>
 pkgname=device-alcatel-idol347
 pkgdesc="Alcatel OneTouch Idol 3 (4.7)"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -40,8 +40,9 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-alcatel-idol347-wcnss-nv firmware-alcatel-idol347-venus"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader
+		 firmware-alcatel-idol347-wcnss-nv firmware-alcatel-idol347-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD
index 4638b663b..b9e0ee51d 100644
--- a/device/testing/device-asus-z010d/APKBUILD
+++ b/device/testing/device-asus-z010d/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-z010d
 pkgdesc="Asus Zenfone Max ZC550KL"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -37,8 +37,9 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader
+		 firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-motorola-osprey/APKBUILD b/device/testing/device-motorola-osprey/APKBUILD
index 4ffe8722c..37d4a1d8e 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=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -38,9 +38,10 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
 	# osprey's wcnss-nv + venus firmware seems identical to harpia's :>
-	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader
+		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
 	mkdir "$subpkgdir"
 }