diff --git a/device/downstream/device-raspberry-pi4/APKBUILD b/device/downstream/device-raspberry-pi4/APKBUILD
index 3190c60f0..ded814e0f 100644
--- a/device/downstream/device-raspberry-pi4/APKBUILD
+++ b/device/downstream/device-raspberry-pi4/APKBUILD
@@ -1,17 +1,21 @@
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="Daniele Debernardi <drebrez@gmail.com>"
 pkgname=device-raspberry-pi4
-pkgver=5
+pkgver=6
 pkgrel=0
 pkgdesc="Raspberry Pi 4"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base raspberrypi-bootloader linux-rpi"
+depends="
+	linux-firmware-brcm
+	linux-rpi
+	postmarketos-base
+	raspberrypi-bootloader
+	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-openrc
 	$pkgname-plasma-bigscreen:plasma_bigscreen
 	$pkgname-udev
@@ -37,12 +41,6 @@ package() {
 	install -Dm755 "$srcdir"/enforce-platform.sh -t "$pkgdir"/etc/profile.d/
 }
 
-nonfree_firmware() {
-	pkgdesc="WiFi/Bluetooth firmware"
-	depends="linux-firmware-brcm"
-	mkdir "$subpkgdir"
-}
-
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
diff --git a/device/downstream/device-raspberry-pi5/APKBUILD b/device/downstream/device-raspberry-pi5/APKBUILD
index 886dc7d1b..a6a78c631 100644
--- a/device/downstream/device-raspberry-pi5/APKBUILD
+++ b/device/downstream/device-raspberry-pi5/APKBUILD
@@ -1,17 +1,21 @@
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="winbo-yml-exe <winbo.yml@proton.me>"
 pkgname=device-raspberry-pi5
-pkgver=8
+pkgver=9
 pkgrel=0
 pkgdesc="Raspberry Pi 5"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base raspberrypi-bootloader linux-rpi"
+depends="
+	linux-firmware-brcm
+	linux-rpi
+	postmarketos-base
+	raspberrypi-bootloader
+	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-openrc
 	$pkgname-plasma-bigscreen:plasma_bigscreen
 	$pkgname-udev
@@ -37,12 +41,6 @@ package() {
 	install -Dm755 "$srcdir"/enforce-platform.sh -t "$pkgdir"/etc/profile.d/
 }
 
-nonfree_firmware() {
-	pkgdesc="WiFi/Bluetooth firmware"
-	depends="linux-firmware-brcm"
-	mkdir "$subpkgdir"
-}
-
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
diff --git a/device/downstream/device-samsung-a51/APKBUILD b/device/downstream/device-samsung-a51/APKBUILD
index 64a263102..bae95dc30 100644
--- a/device/downstream/device-samsung-a51/APKBUILD
+++ b/device/downstream/device-samsung-a51/APKBUILD
@@ -2,19 +2,20 @@
 maintainer="Hendra Manudinata <hendra@manoedinata.com>"
 pkgname=device-samsung-a51
 pkgdesc="Samsung Galaxy A51"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-samsung-a51
 	linux-samsung-a51
+	make-dynpart-mappings
 	mkbootimg
+	msm-fb-refresher
 	postmarketos-base
 	postmarketos-base-downstream
-	make-dynpart-mappings
-	msm-fb-refresher
 "
 makedepends="devicepkg-dev"
 source="
@@ -22,7 +23,6 @@ source="
 	kernel-cmdline.conf
 	NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -35,12 +35,6 @@ package() {
 	install -Dm644 NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf "$pkgdir"/usr/lib/NetworkManager/conf.d/swlan0-p2p0-unmanaged.conf
 }
 
-nonfree_firmware() {
-	pkgdesc="Non-free firmware for Samsung Galaxy A51 (a51)"
-	depends="firmware-samsung-a51"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 526e27968c4b46a02c9a9cf7b2bb4170c3391614000bff7ac273ca395f62961906f50975ba649b230880b1e2ef9901dad3fee94dcb1396e806894d4e2c78c5c3  deviceinfo
 cfeb36f1157fa7413c046d72fd2232956cb4056b30124ac39bae6fdc9f0b49cabc2b6d4b1d4ef94c4191c93e92a770fc17b81b5e02c0dd618efbe95a3da4f7b5  kernel-cmdline.conf
diff --git a/device/downstream/device-samsung-beyond1lte/APKBUILD b/device/downstream/device-samsung-beyond1lte/APKBUILD
index 8c2f63f28..f423dfe62 100644
--- a/device/downstream/device-samsung-beyond1lte/APKBUILD
+++ b/device/downstream/device-samsung-beyond1lte/APKBUILD
@@ -2,21 +2,21 @@
 maintainer="chiffa <chiffathefoxx@gmail.com>"
 pkgname=device-samsung-beyond1lte
 pkgdesc="Samsung Galaxy S10"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-samsung-beyond1lte
 	linux-samsung-beyond1lte
 	mkbootimg
-	postmarketos-base
 	msm-fb-refresher
+	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="deviceinfo kernel-cmdline.conf initfs-hook.sh"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,12 +26,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for Galaxy S10"
-	depends="firmware-samsung-beyond1lte"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 e42caee5dc8bbd3807c505993b79b00e8a813c2f408604e3975f7729cd6946ee061cffc54595edce300d0d1f2c09893d1b056ad00d9b060ab50f9dbb72d10ee3  deviceinfo
 cb0731b5e71b427024bb47cd70aa48d3be409a89aa476f3fd4dea8e5b42ef87371a65bbe836bca7da04c0384178ad293b44da8a88557ad04fc57857bef502050  kernel-cmdline.conf
diff --git a/device/downstream/device-samsung-j4lte/APKBUILD b/device/downstream/device-samsung-j4lte/APKBUILD
index ce3cd2ada..c2b0eedd5 100644
--- a/device/downstream/device-samsung-j4lte/APKBUILD
+++ b/device/downstream/device-samsung-j4lte/APKBUILD
@@ -2,24 +2,24 @@
 maintainer="Hendra Manudinata <hendra@manoedinata.com>"
 pkgname=device-samsung-j4lte
 pkgdesc="Samsung Galaxy J4"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-samsung-j4lte
 	linux-samsung-j4lte
 	mkbootimg
+	msm-fb-refresher
 	postmarketos-base
 	postmarketos-base-downstream
-	msm-fb-refresher
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,12 +29,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Non-free firmware for Samsung Galaxy J4 (j4lte)"
-	depends="firmware-samsung-j4lte"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 af582a4eaba555bfb45983a7c4dad6b976301829b058fd7f3690b3a53376fd7d7047b992cb3f6d034e0ff9efab2002f42649ad80fb2f1492bb726e437d389d1d  deviceinfo
 "