diff --git a/device/community/device-samsung-a3/APKBUILD b/device/community/device-samsung-a3/APKBUILD
index 9c08f0bf8aa6f4702f4e22763afe6d22f3c54ba2..20bf28d82dceae9143ff9afe4d4ffed697151f46 100644
--- a/device/community/device-samsung-a3/APKBUILD
+++ b/device/community/device-samsung-a3/APKBUILD
@@ -4,7 +4,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -52,8 +52,8 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-a3-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a3-wcnss-nv"
 	replaces=""
 	for pkg in $_substitutes; do replaces="$replaces $pkg-nonfree-firmware"; done
 	for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done
diff --git a/device/community/device-samsung-a5/APKBUILD b/device/community/device-samsung-a5/APKBUILD
index 12137a85910d1ee3ed4fc3529e033d146f60738a..3f6f3a7e110cb7dbf22cad57296dc6b47d72ae90 100644
--- a/device/community/device-samsung-a5/APKBUILD
+++ b/device/community/device-samsung-a5/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -50,8 +50,8 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-a5-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a5-wcnss-nv"
 	replaces=""
 	for pkg in $_substitutes; do replaces="$replaces $pkg-nonfree-firmware"; done
 	for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done
diff --git a/device/community/device-samsung-gt510/APKBUILD b/device/community/device-samsung-gt510/APKBUILD
index 0691d2e714e345b16c33f16bc9b2f49c143c5fdf..61090b54c79afcfb0e94658869f5f4a5bdf020a8 100644
--- a/device/community/device-samsung-gt510/APKBUILD
+++ b/device/community/device-samsung-gt510/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,8 +46,8 @@ kernel_mainline_modem_lte() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-gt510-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-gt510-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/community/device-samsung-gt58/APKBUILD b/device/community/device-samsung-gt58/APKBUILD
index 96f83b74f6fb4edbfbbdbfabc1eb0850c7400391..e32df97f3c0690ae6243a21cda11fe1f126a722a 100644
--- a/device/community/device-samsung-gt58/APKBUILD
+++ b/device/community/device-samsung-gt58/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,8 +42,8 @@ kernel_mainline_modem_lte() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-gt58-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-gt58-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/community/device-samsung-serranove/APKBUILD b/device/community/device-samsung-serranove/APKBUILD
index 00ea00741e004ea316721e51aaa24b3cc1d0b995..8507b548c42f35cc3f3a92bd12199e4051877d8e 100644
--- a/device/community/device-samsung-serranove/APKBUILD
+++ b/device/community/device-samsung-serranove/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,8 +46,8 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-serranove-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-serranove-wcnss-nv"
 	replaces="$_substitutes-nonfree-firmware"
 	provides="$replaces=$pkgver-r$pkgrel"
 	mkdir "$subpkgdir"
diff --git a/device/testing/device-asus-z00l/APKBUILD b/device/testing/device-asus-z00l/APKBUILD
index 19d8f1e9cf3c083e3a5dc06dcb44e1abe8bf36c5..aa650ae6c51949150d0c03f747b497e901a2235e 100644
--- a/device/testing/device-asus-z00l/APKBUILD
+++ b/device/testing/device-asus-z00l/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Antony J.R. <antonyjr@pm.me>
 pkgname=device-asus-z00l
 pkgdesc="ASUS Zenfone 2 Laser (720p)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -38,8 +38,8 @@ kernel_mainline_modem() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-asus-z00l-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-asus-z00l-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-samsung-j5/APKBUILD b/device/testing/device-samsung-j5/APKBUILD
index d34272d6e37df5b56a8a6cd1c88dd490d9274f60..b37167f49d61c6978a5eaaf65c15f46559ca77a1 100644
--- a/device/testing/device-samsung-j5/APKBUILD
+++ b/device/testing/device-samsung-j5/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-j5
 pkgdesc="Samsung Galaxy J5 (2015)"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,8 +21,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-j5-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-j5-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-samsung-matisseve/APKBUILD b/device/testing/device-samsung-matisseve/APKBUILD
index 019ca30fa210dee8a1fe675cf076d25812f1e162..fc720c5683cfce9d828ee91d7c4f95e17ba2d0fa 100644
--- a/device/testing/device-samsung-matisseve/APKBUILD
+++ b/device/testing/device-samsung-matisseve/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-matisseve
 pkgdesc="Samsung Galaxy Tab 4 10.1"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,8 +21,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-matisseve-wcnss-nv"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-matisseve-wcnss-nv"
 	mkdir "$subpkgdir"
 }