diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD
index bd021ebdb..38677dc20 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=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -11,7 +11,9 @@ depends="postmarketos-base raspberrypi-bootloader"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-rpi:kernel_rpi
+	$pkgname-kernel-rpi-openrc:kernel_rpi_openrc
 	$pkgname-kernel-rpi2:kernel_rpi2
+	$pkgname-kernel-rpi2-openrc:kernel_rpi2_openrc
 	$pkgname-sway
 	$pkgname-phosh
 "
@@ -38,17 +40,27 @@ package() {
 kernel_rpi() {
 	pkgdesc="Kernel for the Raspberry Pi 1 (from Alpine, depends on non free firmware!)"
 	depends="$pkgname linux-rpi"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
+kernel_rpi_openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir -p "$subpkgdir"
+}
+
 kernel_rpi2() {
 	pkgdesc="Kernel for the Raspberry Pi 2 (from Alpine, depends on non free firmware!)"
-	depends="$pkgname linux-rpi"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="$pkgname linux-rpi2"
 	mkdir "$subpkgdir"
 }
 
+kernel_rpi2_openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi2 openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir -p "$subpkgdir"
+}
+
 sway() {
 	install_if="$pkgname postmarketos-ui-sway"
 	depends="$pkgname"
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install
rename to device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-install
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade
new file mode 120000
index 000000000..fe067f4a0
--- /dev/null
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi-openrc.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade
deleted file mode 120000
index 6761fa3e4..000000000
--- a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-raspberry-pi-kernel-rpi.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install
rename to device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-install
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade
new file mode 120000
index 000000000..bd4416e18
--- /dev/null
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2-openrc.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi2-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade
deleted file mode 120000
index c2c74682c..000000000
--- a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-raspberry-pi-kernel-rpi2.post-install
\ No newline at end of file