diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index ae1e1264b..d83909177 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=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,7 +30,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 replaces="hexagonrpcd-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp5.rules
 	deviceinfo
@@ -48,8 +48,6 @@ package() {
 
 	install -Dm644 "$srcdir"/81-libssc-fairphone-fp5.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp5.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 
 	# ALSA Use Case Manager configuration
 	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/Fairphone/fp5 \
@@ -60,6 +58,14 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490/Fairphone\ 5.conf
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+}
+
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
 3062dc927b0521512782b34b0a12739aa455794bc49c25d423cf584b6f264f2cef8629bcc70b194d0e58712a21f64aa2c3b61336a904fe9173991f42b9c94f89  deviceinfo
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-install b/device/testing/device-fairphone-fp5/device-fairphone-fp5-openrc.post-install
similarity index 100%
rename from device/testing/device-fairphone-fp5/device-fairphone-fp5.post-install
rename to device/testing/device-fairphone-fp5/device-fairphone-fp5-openrc.post-install
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5-openrc.post-upgrade b/device/testing/device-fairphone-fp5/device-fairphone-fp5-openrc.post-upgrade
new file mode 120000
index 000000000..8f83dc192
--- /dev/null
+++ b/device/testing/device-fairphone-fp5/device-fairphone-fp5-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-fairphone-fp5-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade b/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade
deleted file mode 120000
index a37ee235a..000000000
--- a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-fairphone-fp5.post-install
\ No newline at end of file