diff --git a/device/testing/device-bq-piccolo/APKBUILD b/device/testing/device-bq-piccolo/APKBUILD
index 8c4e23f67..ef207464f 100644
--- a/device/testing/device-bq-piccolo/APKBUILD
+++ b/device/testing/device-bq-piccolo/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-adreno firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss"
+	depends="linux-firmware-qcom firmware-qcom-adreno-a420 firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index d3639b122..34255ae11 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/device/testing/device-fairphone-fp2/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
 pkgver=3
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -64,7 +64,7 @@ downstream_firmware() {
 
 mainline_firmware() {
 	pkgdesc="Firmware support packages for mainline kernel"
-	depends="msm-modem firmware-adreno"
+	depends="msm-modem firmware-qcom-adreno-a330"
 	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 
diff --git a/device/testing/device-huawei-kiwi/APKBUILD b/device/testing/device-huawei-kiwi/APKBUILD
index 921b593b0..3e0305bec 100644
--- a/device/testing/device-huawei-kiwi/APKBUILD
+++ b/device/testing/device-huawei-kiwi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-huawei-kiwi
 pkgdesc="Huawei Honor 5X"
 pkgver=1
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 nonfree_firmware() {
 	pkgdesc="Modem/GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-huawei-kiwi firmware-adreno"
+	depends="linux-firmware-qcom firmware-huawei-kiwi firmware-qcom-adreno-a420"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index 3ae76c01b..bf4684cf7 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
 pkgver=2
-pkgrel=28
+pkgrel=29
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -58,7 +58,7 @@ weston() {
 nonfree_firmware() {
 	pkgdesc="WiFi, GPU, Modem and ADSP firmware"
 	depends="
-		firmware-adreno
+		firmware-qcom-adreno-a330
 		firmware-lg-hammerhead
 		firmware-lg-hammerhead-adsp
 		firmware-lg-hammerhead-modem
diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD
index a053e344b..fe9ce3ffa 100644
--- a/device/testing/device-oneplus-bacon/APKBUILD
+++ b/device/testing/device-oneplus-bacon/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=26
+pkgrel=27
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -41,7 +41,7 @@ kernel_mainline() {
 
 nonfree_firmware() {
 	pkgdesc="GPU, Wi-Fi firmware"
-	depends="firmware-adreno firmware-oneplus-bacon"
+	depends="firmware-qcom-adreno-a330 firmware-oneplus-bacon"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index 521c559a6..c53f7330b 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F)"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -34,7 +34,7 @@ package() {
 nonfree_firmware() {
 	pkgdesc="GPU, Wi-Fi, Bluetooth firmware"
 	depends="
-		firmware-adreno
+		firmware-qcom-adreno-a330
 		firmware-samsung-klte-bt
 		firmware-samsung-klte-wifi
 		msm-firmware-loader
diff --git a/device/testing/device-sony-castor/APKBUILD b/device/testing/device-sony-castor/APKBUILD
index b20d11b4a..f7822f480 100644
--- a/device/testing/device-sony-castor/APKBUILD
+++ b/device/testing/device-sony-castor/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-castor
 pkgver=2
-pkgrel=4
+pkgrel=5
 pkgdesc="Sony Xperia Z2 Tablet"
 url="https://postmarketos.org"
 arch="armv7"
@@ -30,7 +30,7 @@ nonfree_firmware() {
 	depends="
 		linux-firmware-brcm
 		linux-firmware-cypress
-		firmware-adreno
+		firmware-qcom-adreno-a330
 		firmware-sony-castor
 	"
 	mkdir "$subpkgdir"
diff --git a/device/testing/device-sony-sirius/APKBUILD b/device/testing/device-sony-sirius/APKBUILD
index ea6d57183..8c66bdc31 100644
--- a/device/testing/device-sony-sirius/APKBUILD
+++ b/device/testing/device-sony-sirius/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-sirius
 pkgver=1
-pkgrel=19
+pkgrel=20
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
 arch="armv7"
@@ -52,7 +52,7 @@ weston() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi/GPU firmware"
-	depends="linux-firmware-qcom linux-firmware-brcm linux-firmware-cypress firmware-adreno"
+	depends="linux-firmware-qcom linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-adreno/APKBUILD b/device/testing/firmware-qcom-adreno-extra/APKBUILD
similarity index 60%
rename from device/testing/firmware-adreno/APKBUILD
rename to device/testing/firmware-qcom-adreno-extra/APKBUILD
index 398d5819f..654de3c0c 100644
--- a/device/testing/firmware-adreno/APKBUILD
+++ b/device/testing/firmware-qcom-adreno-extra/APKBUILD
@@ -1,7 +1,7 @@
-pkgname=firmware-adreno
-pkgver=1
-pkgrel=7
-pkgdesc="Firmware for adreno gpus"
+pkgname=firmware-qcom-adreno-extra
+pkgver=2
+pkgrel=0
+pkgdesc="Extra Qualcomm Adreno GPU firmware from TheMuppets"
 url="https://github.com/TheMuppets/proprietary_vendor_sony"
 arch="armhf aarch64 armv7"
 license="proprietary"
@@ -20,6 +20,11 @@ for _i in $_files2; do
 	source="$source $pkgname-$_commit-$_i::$_url2/$_i";
 done
 
+_gpus="a225 a330 a420"
+for gpu in $_gpus; do
+	subpackages="$subpackages firmware-qcom-adreno-$gpu:_gpu"
+done
+
 package() {
 	for _i in $_files1 $_files2; do
 		install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \
@@ -27,10 +32,19 @@ package() {
 	done
 }
 
-sha512sums="b278ea24a84036f24f3fa583e63b2c1236312d8b163398d874367ffc91b4652ceb0b3ce5dd2097748dd2083ea1222c0f9413efcc5b72553da3ef753f5910f24a  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pm4.fw
-d127fdca476233fca6e6e59e62bced8563663bac65de30a81eb1912f182cd27fdf8726085e65820c4c26c389daa1ffef9792a598c7b7568f277e781b5e775d5f  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pfp.fw
-339a632a554a8c6e7fd1ff1465c3c985417f9e199e6934a5b149862245566f0c7171c924fc0a7a0d96bc6c5c5efd3c86dd0252d7064f7fee8ac502be8fc977f0  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225p5_pm4.fw
-a642584990333d62ba6a985eeaddc6898c37a8e80aabb61121f93a90d5076861eb698422101e7b00706b7d3dfc00f9f358ea5e44a70fda7369931eb58b455931  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pfp.fw
-999e3e0777b8dffc0e0d20b214c8217dab577a31753b6a29af2fae57293693196e992a905265e35a586a7978c04547aa8c88496dbe6f836b74ed39026eaa5f05  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pm4.fw
-dc6c1ce867f31a3e04a299b380c5625a7acf55fbf93c3f1b7097fe5e518b1649996d902f528c0e45859bfb436044401ddeebb70266da58d4ef7eacab926702b9  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pfp.fw
-7e7bc1fb80445de09b0eaaef0f49d1c817c91cbbcc031e0ee94e17a36945321c3ee2c8b1766e54e9de28de2f89e09ba3e4a2aee202aed2199afce879b3e343b8  firmware-adreno-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pm4.fw"
+_gpu() {
+	local gpu=${subpkgname##firmware-qcom-adreno-}
+	pkgdesc="$pkgdesc ($gpu)"
+
+	amove lib/firmware/qcom/$gpu*
+}
+
+sha512sums="
+b278ea24a84036f24f3fa583e63b2c1236312d8b163398d874367ffc91b4652ceb0b3ce5dd2097748dd2083ea1222c0f9413efcc5b72553da3ef753f5910f24a  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pm4.fw
+d127fdca476233fca6e6e59e62bced8563663bac65de30a81eb1912f182cd27fdf8726085e65820c4c26c389daa1ffef9792a598c7b7568f277e781b5e775d5f  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pfp.fw
+339a632a554a8c6e7fd1ff1465c3c985417f9e199e6934a5b149862245566f0c7171c924fc0a7a0d96bc6c5c5efd3c86dd0252d7064f7fee8ac502be8fc977f0  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225p5_pm4.fw
+a642584990333d62ba6a985eeaddc6898c37a8e80aabb61121f93a90d5076861eb698422101e7b00706b7d3dfc00f9f358ea5e44a70fda7369931eb58b455931  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pfp.fw
+999e3e0777b8dffc0e0d20b214c8217dab577a31753b6a29af2fae57293693196e992a905265e35a586a7978c04547aa8c88496dbe6f836b74ed39026eaa5f05  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pm4.fw
+dc6c1ce867f31a3e04a299b380c5625a7acf55fbf93c3f1b7097fe5e518b1649996d902f528c0e45859bfb436044401ddeebb70266da58d4ef7eacab926702b9  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pfp.fw
+7e7bc1fb80445de09b0eaaef0f49d1c817c91cbbcc031e0ee94e17a36945321c3ee2c8b1766e54e9de28de2f89e09ba3e4a2aee202aed2199afce879b3e343b8  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pm4.fw
+"
diff --git a/device/unmaintained/device-huawei-kiwi-downstream/APKBUILD b/device/unmaintained/device-huawei-kiwi-downstream/APKBUILD
index 20b008c37..55e1ea55e 100644
--- a/device/unmaintained/device-huawei-kiwi-downstream/APKBUILD
+++ b/device/unmaintained/device-huawei-kiwi-downstream/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,7 +23,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem/GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-huawei-kiwi firmware-adreno"
+	depends="linux-firmware-qcom firmware-huawei-kiwi firmware-qcom-adreno-a420"
 	mkdir "$subpkgdir"
 }