diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD
index 7f60e1c2af37f95ef8307077c395b5b58f002dbb..981b95175369dac77b3bb759ddd4e104e3de0034 100644
--- a/device/testing/device-raspberry-pi3/APKBUILD
+++ b/device/testing/device-raspberry-pi3/APKBUILD
@@ -3,14 +3,14 @@
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="deviceinfo modules-initfs usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf"
 
 build() {
@@ -27,6 +27,13 @@ package() {
 		"$pkgdir"/etc/NetworkManager/conf.d/10-rpi3.conf
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 069270d1813875e5d71c1823850cc6bee14002be399529353112d1a46a051bf66ec28737333f34f98b3a8d653cef5473e8ce85a83bf5206e5172998068557cf7  deviceinfo
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
diff --git a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install b/device/testing/device-raspberry-pi3/device-raspberry-pi3-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
rename to device/testing/device-raspberry-pi3/device-raspberry-pi3-openrc.post-install
diff --git a/device/testing/device-raspberry-pi3/device-raspberry-pi3-openrc.post-upgrade b/device/testing/device-raspberry-pi3/device-raspberry-pi3-openrc.post-upgrade
new file mode 120000
index 0000000000000000000000000000000000000000..9ddd5ff6809a2bfcf40dd87e431276393d383b8a
--- /dev/null
+++ b/device/testing/device-raspberry-pi3/device-raspberry-pi3-openrc.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi3-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade
deleted file mode 120000
index 68426b3f2eb0e4b4fc5cbcf23a554d3e411b76e8..0000000000000000000000000000000000000000
--- a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-raspberry-pi3.post-install
\ No newline at end of file