diff --git a/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD b/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
index 776efe369..d4e30add8 100644
--- a/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
+++ b/device/archived/device-samsung-coreprimevelte-downstream/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -25,7 +25,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wi-Fi firmware"
-	depends="firmware-samsung-pxa1908"
+	depends="firmware-samsung-pxa1908-downstream"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-samsung-xcover3lte/APKBUILD b/device/testing/device-samsung-xcover3lte/APKBUILD
index 32c09285d..432095f3e 100644
--- a/device/testing/device-samsung-xcover3lte/APKBUILD
+++ b/device/testing/device-samsung-xcover3lte/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-xcover3lte
 pkgdesc="Samsung Galaxy Xcover 3"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,7 +31,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Non-free firmware for the Samsung Galaxy Xcover 3"
-	depends="firmware-samsung-pxa1908"
+	depends="firmware-samsung-pxa1908-downstream"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-samsung-pxa1908/APKBUILD b/device/testing/firmware-samsung-pxa1908/APKBUILD
index 7fce1e98f..a9c4d0620 100644
--- a/device/testing/firmware-samsung-pxa1908/APKBUILD
+++ b/device/testing/firmware-samsung-pxa1908/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-samsung-pxa1908
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Samsung PXA1908 devices"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -15,6 +15,7 @@ source="
 "
 _files="sd8777_uapsta.bin WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf"
 builddir="$srcdir/$_repo-$_commit"
+subpackages="$pkgname-downstream:downstream"
 
 package() {
 	cd proprietary/etc/firmware/mrvl/
@@ -23,8 +24,14 @@ package() {
 		install -Dm644 "$_i" \
 			-t "$pkgdir/lib/firmware/postmarketos/mrvl"
 	done
+}
 
-	install -Dm755 "$srcdir"/sd8x-wlan.initd "$pkgdir"/etc/init.d/sd8x-wlan
+downstream() {
+	pkgdesc="OpenRC service for enabling WLAN on downstream kernels"
+	depends="$pkgname"
+
+	mkdir "$subpkgdir"
+	install -Dm755 "$srcdir"/sd8x-wlan.initd "$subpkgdir"/etc/init.d/sd8x-wlan
 }
 
 sha512sums="