diff --git a/device/community/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD
index 94038fac8..35008990f 100644
--- a/device/community/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -20,7 +20,6 @@ depends="
 	firmware-fairphone-fp4-wlan
 	firmware-qcom-adreno-a630
 	hexagonrpcd>=0.3.2-r3
-	hexagonrpcd-openrc
 	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
 	make-dynpart-mappings
@@ -29,13 +28,10 @@ depends="
 	msm-modem
 	msm-modem-uim-selection
 	pd-mapper
-	pd-mapper-openrc
 	postmarketos-base
 	qbootctl
-	qbootctl-openrc
 	swclock-offset
 	tqftpserv
-	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-openrc"
@@ -65,7 +61,13 @@ package() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="
+		hexagonrpcd-openrc
+		openrc
+		pd-mapper-openrc
+		qbootctl-openrc
+		tqftpserv-openrc
+	"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-google-sargo/APKBUILD b/device/community/device-google-sargo/APKBUILD
index 1f2c17796..b4d53c5f4 100644
--- a/device/community/device-google-sargo/APKBUILD
+++ b/device/community/device-google-sargo/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -62,7 +62,7 @@ openrc() {
 	# Enable HexagonRPCD by default, but not if the user installed this
 	# package then disabled it.
 	install="$subpkgname.post-install"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD
index 1a8139922..2c9896611 100644
--- a/device/community/device-oneplus-fajita/APKBUILD
+++ b/device/community/device-oneplus-fajita/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=15
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD
index 590a08694..929a76a71 100644
--- a/device/community/device-pine64-pinebookpro/APKBUILD
+++ b/device/community/device-pine64-pinebookpro/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -57,7 +57,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="eudev-hwids"
+	depends="eudev-hwids openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-pine64-pinephonepro/APKBUILD b/device/community/device-pine64-pinephonepro/APKBUILD
index 4cfac17e1..9a9ec32b7 100644
--- a/device/community/device-pine64-pinephonepro/APKBUILD
+++ b/device/community/device-pine64-pinephonepro/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=4
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -123,7 +123,7 @@ gnome() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="eg25-manager-openrc"
+	depends="eg25-manager-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD
index f4dea4ee5..569ad1139 100644
--- a/device/community/device-purism-librem5/APKBUILD
+++ b/device/community/device-purism-librem5/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=6
-pkgrel=0
+pkgrel=1
 _confver=68
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -106,6 +106,7 @@ tinydm() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
@@ -121,6 +122,7 @@ smartcard() {
 smartcard_openrc() {
 	install_if="$pkgname-smartcard=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+	depends="openrc"
 
 	install -D -m644 "$srcdir"/pcscd-librem5-reader.conf \
 		"$subpkgdir"/etc/reader.conf.d/librem5-ttxs-reader
diff --git a/device/community/device-qcom-sm7150/APKBUILD b/device/community/device-qcom-sm7150/APKBUILD
index cd93da544..c4169324d 100644
--- a/device/community/device-qcom-sm7150/APKBUILD
+++ b/device/community/device-qcom-sm7150/APKBUILD
@@ -7,7 +7,7 @@
 pkgname=device-qcom-sm7150
 pkgdesc="Generic device package for Qualcomm SM7150 devices"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -75,6 +75,7 @@ openrc() {
 	install="$subpkgname.post-install"
 	depends="
 		hexagonrpcd-openrc
+		openrc
 		qbootctl-openrc
 		tqftpserv-openrc
 		"
diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD
index b60f1993e..7c54530e6 100644
--- a/device/community/device-shift-axolotl/APKBUILD
+++ b/device/community/device-shift-axolotl/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD
index 29d3a6a52..4d5f74f7c 100644
--- a/device/community/device-xiaomi-beryllium/APKBUILD
+++ b/device/community/device-xiaomi-beryllium/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=12
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/soc-qcom-msm8953/APKBUILD b/device/community/soc-qcom-msm8953/APKBUILD
index 0fce63347..f7b038b83 100644
--- a/device/community/soc-qcom-msm8953/APKBUILD
+++ b/device/community/soc-qcom-msm8953/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
 pkgver=13
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -57,6 +57,7 @@ modem_openrc() {
 	install_if="$pkgname-modem=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
+		openrc
 		q6voiced-openrc
 		rmtfs-openrc
 		tqftpserv-openrc
diff --git a/device/community/soc-qcom-sc7180/APKBUILD b/device/community/soc-qcom-sc7180/APKBUILD
index 956c1c9e7..8769f8536 100644
--- a/device/community/soc-qcom-sc7180/APKBUILD
+++ b/device/community/soc-qcom-sc7180/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sc7180
 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices"
 pkgver=2
-pkgrel=1
+pkgrel=3
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -30,9 +30,10 @@ nonfree_firmware() {
 }
 
 nonfree_firmware_openrc() {
-	depends="rmtfs-openrc"
+	depends="openrc rmtfs-openrc"
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
 	mkdir "$subpkgdir"
 }
 
@@ -48,6 +49,7 @@ nonfree_firmware_woa() {
 
 nonfree_firmware_woa_openrc() {
 	depends="
+		openrc
 		pd-mapper-openrc
 		tqftpserv-openrc
 	"
diff --git a/device/community/soc-qcom/APKBUILD b/device/community/soc-qcom/APKBUILD
index 86422eb9d..c56d72bdf 100644
--- a/device/community/soc-qcom/APKBUILD
+++ b/device/community/soc-qcom/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom
 pkgdesc="Common package for Qualcomm devices"
 pkgver=1
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -86,7 +86,7 @@ modem() {
 
 modem_openrc() {
 	install_if="$pkgname-modem=$pkgver-r$pkgrel openrc"
-	depends="q6voiced-openrc"
+	depends="q6voiced-openrc openrc"
 	replaces="soc-qcom-sdm845-modem-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
@@ -97,6 +97,7 @@ modem_openrc() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	depends="
+		openrc
 		pd-mapper-openrc
 		tqftpserv-openrc
 	"
@@ -115,6 +116,7 @@ qbootctl() {
 qbootctl_openrc() {
 	install_if="$pkgname-qbootctl=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir "$subpkgdir"
 }
@@ -139,6 +141,7 @@ pulseaudio_openrc() {
 	install_if="$pkgname-pulseaudio=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	replaces="soc-qcom-sdm845-pulseaudio-openrc"
+	depends="openrc"
 
 	# Call Audio idle suspend workaround init script
 	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.initd \
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD b/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD
index a56e42c0b..9fd76d259 100644
--- a/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD
+++ b/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-clockworkpi-uconsole-cm4
 pkgdesc="Clockwork Tech ClockworkPi uConsole CM4"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,6 +45,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-cutiepi-tablet/APKBUILD b/device/testing/device-cutiepi-tablet/APKBUILD
index b2116c5e3..9a29b862f 100644
--- a/device/testing/device-cutiepi-tablet/APKBUILD
+++ b/device/testing/device-cutiepi-tablet/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-cutiepi-tablet
 pkgdesc="CutiePi Tablet"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -52,6 +52,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index 5c40609eb..42e6ec826 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
 pkgver=7
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -64,7 +64,7 @@ package() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-jolla-sbj/APKBUILD b/device/testing/device-jolla-sbj/APKBUILD
index 44ea81803..9dfef70f8 100644
--- a/device/testing/device-jolla-sbj/APKBUILD
+++ b/device/testing/device-jolla-sbj/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-jolla-sbj
 pkgdesc="Jolla phone"
 pkgver=1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -61,6 +61,11 @@ package() {
 	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/msm8930-sitar \
 		"$srcdir"/msm8930-sitar.conf \
 		"$srcdir"/HiFi.conf
+
+	install -Dm755 "$srcdir"/load-wlan-module \
+		"$pkgdir"/etc/init.d/load-wlan-module
+	install -Dm644 "$srcdir"/wcnss-wlan \
+		"$pkgdir"/etc/conf.d/wcnss-wlan
 }
 
 nonfree_firmware() {
@@ -73,13 +78,9 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
-	mkdir -p "$subpkgdir"
-
-	install -Dm755 "$srcdir"/load-wlan-module \
-		"$pkgdir"/etc/init.d/load-wlan-module
-	install -Dm644 "$srcdir"/wcnss-wlan \
-		"$pkgdir"/etc/conf.d/wcnss-wlan
+	default_openrc
 }
 
 sha512sums="
diff --git a/device/testing/device-lenovo-q706f/APKBUILD b/device/testing/device-lenovo-q706f/APKBUILD
index 58985a159..98367cbf4 100644
--- a/device/testing/device-lenovo-q706f/APKBUILD
+++ b/device/testing/device-lenovo-q706f/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-lenovo-q706f
 pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
 pkgver=4
-pkgrel=2
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -81,6 +81,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir "$subpkgdir"
 }
@@ -88,7 +89,7 @@ nonfree_firmware_openrc() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-oneplus-oneplus3t/APKBUILD b/device/testing/device-oneplus-oneplus3t/APKBUILD
index ee0120817..e0457a803 100644
--- a/device/testing/device-oneplus-oneplus3t/APKBUILD
+++ b/device/testing/device-oneplus-oneplus3t/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-oneplus3t
 pkgdesc="OnePlus 3T"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -58,6 +58,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+	depends="openrc"
 
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD
index 73e5f5a3e..ccc6d09cc 100644
--- a/device/testing/device-raspberry-pi/APKBUILD
+++ b/device/testing/device-raspberry-pi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi
 pkgdesc="Raspberry Pi"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -46,6 +46,8 @@ kernel_rpi() {
 kernel_rpi_openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
+
 	mkdir -p "$subpkgdir"
 }
 
@@ -58,6 +60,8 @@ kernel_rpi2() {
 kernel_rpi2_openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi2 openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
+
 	mkdir -p "$subpkgdir"
 }
 
diff --git a/device/testing/device-raspberry-pi0/APKBUILD b/device/testing/device-raspberry-pi0/APKBUILD
index cb1d44e8b..3d3ae6595 100644
--- a/device/testing/device-raspberry-pi0/APKBUILD
+++ b/device/testing/device-raspberry-pi0/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi0
 pkgdesc="Raspberry Pi Zero"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -28,6 +28,7 @@ package() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD
index 981b95175..8b4c1fa4a 100644
--- a/device/testing/device-raspberry-pi3/APKBUILD
+++ b/device/testing/device-raspberry-pi3/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,6 +30,7 @@ package() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-raspberry-pi4/APKBUILD b/device/testing/device-raspberry-pi4/APKBUILD
index 03ff14efc..072b98599 100644
--- a/device/testing/device-raspberry-pi4/APKBUILD
+++ b/device/testing/device-raspberry-pi4/APKBUILD
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-raspberry-pi4
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Raspberry Pi 4"
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-raspberry-pi5/APKBUILD b/device/testing/device-raspberry-pi5/APKBUILD
index fb037c5c8..b2cac3ab3 100644
--- a/device/testing/device-raspberry-pi5/APKBUILD
+++ b/device/testing/device-raspberry-pi5/APKBUILD
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-raspberry-pi5
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Raspberry Pi 5"
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index 78ac648d6..002118657 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -60,6 +60,7 @@ nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
+		openrc
 		ta-service-openrc
 		"
 
diff --git a/device/testing/device-xiaomi-armani/APKBUILD b/device/testing/device-xiaomi-armani/APKBUILD
index 1f1052341..703b3c686 100644
--- a/device/testing/device-xiaomi-armani/APKBUILD
+++ b/device/testing/device-xiaomi-armani/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-armani
 pkgdesc="Redmi 1S"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -44,6 +44,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
+	depends="openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/device-xiaomi-miatoll/APKBUILD b/device/testing/device-xiaomi-miatoll/APKBUILD
index 12aa9d420..0290e54f3 100644
--- a/device/testing/device-xiaomi-miatoll/APKBUILD
+++ b/device/testing/device-xiaomi-miatoll/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-miatoll
 pkgdesc="Xiaomi Redmi Note 9 Pro / Redmi Note 9S"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -58,7 +58,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/device-xiaomi-raphael/APKBUILD b/device/testing/device-xiaomi-raphael/APKBUILD
index 765650523..f3b6835a3 100644
--- a/device/testing/device-xiaomi-raphael/APKBUILD
+++ b/device/testing/device-xiaomi-raphael/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-raphael
 pkgdesc="Xiaomi Mi 9T Pro / Redmi K20 Pro"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -59,6 +59,8 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+	depends="openrc"
+
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-xiaomi-vayu/APKBUILD b/device/testing/device-xiaomi-vayu/APKBUILD
index 0126b5048..48baf04e2 100644
--- a/device/testing/device-xiaomi-vayu/APKBUILD
+++ b/device/testing/device-xiaomi-vayu/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-vayu
 pkgdesc="Xiaomi POCO X3 Pro"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -54,6 +54,8 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+	depends="openrc"
+
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-fxtec-qx1050/APKBUILD b/device/testing/firmware-fxtec-qx1050/APKBUILD
index e21609be0..02f883b46 100644
--- a/device/testing/firmware-fxtec-qx1050/APKBUILD
+++ b/device/testing/firmware-fxtec-qx1050/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-fxtec-qx1050
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware for F(x)tec Pro1x (QX1050)"
 subpackages="
 	$pkgname-adreno
@@ -80,8 +80,9 @@ rproc_openrc() {
 	install_if="$pkgname-rproc openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
-	tqftpserv-openrc
-	pd-mapper-openrc
+		openrc
+		pd-mapper-openrc
+		tqftpserv-openrc
 	"
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/powkiddy-x55-mapper/APKBUILD b/device/testing/powkiddy-x55-mapper/APKBUILD
index 9a553a6aa..32a57e2b2 100644
--- a/device/testing/powkiddy-x55-mapper/APKBUILD
+++ b/device/testing/powkiddy-x55-mapper/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=powkiddy-x55-mapper
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Powkiddy X55 gamepad joiner/mapper"
 url="https://github.com/vognev/x55-mapper"
 arch="aarch64"
@@ -22,6 +22,7 @@ package() {
 
 openrc() {
 	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	depends="openrc"
 	default_openrc
 
 	install -Dm755 "$builddir"/contrib/postmarketos/powkiddy-x55-mapper.initd "$subpkgdir"/etc/init.d/powkiddy-x55-mapper
diff --git a/device/testing/soc-qcom-msm8998/APKBUILD b/device/testing/soc-qcom-msm8998/APKBUILD
index 7fc057d7f..95f9ec6eb 100644
--- a/device/testing/soc-qcom-msm8998/APKBUILD
+++ b/device/testing/soc-qcom-msm8998/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8998
 pkgdesc="Common package for Qualcomm MSM8998 devices"
 pkgver=1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -33,7 +33,7 @@ nonfree_firmware() {
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="qcom-diag-openrc"
+	depends="qcom-diag-openrc openrc"
 
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/soc-qcom-sc7280/APKBUILD b/device/testing/soc-qcom-sc7280/APKBUILD
index d9fc2e21b..1b895372f 100644
--- a/device/testing/soc-qcom-sc7280/APKBUILD
+++ b/device/testing/soc-qcom-sc7280/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sc7280
 pkgdesc="Common package for Qualcomm SC7280/SM7325/QCM6490 devices"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -31,6 +31,7 @@ openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
+		openrc
 		pd-mapper-openrc
 		tqftpserv-openrc
 		"
diff --git a/device/testing/soc-qcom-sc8180x/APKBUILD b/device/testing/soc-qcom-sc8180x/APKBUILD
index 4447730be..7faf93c51 100644
--- a/device/testing/soc-qcom-sc8180x/APKBUILD
+++ b/device/testing/soc-qcom-sc8180x/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sc8180x
 pkgdesc="Common package for Qualcomm 8cx devices"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -32,10 +32,11 @@ nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
+		openrc
 		pd-mapper-openrc
 		rmtfs-openrc
 		tqftpserv-openrc
-		"
+	"
 
 	mkdir "$subpkgdir"
 }