diff --git a/device/testing/device-cutiepi-tablet/APKBUILD b/device/testing/device-cutiepi-tablet/APKBUILD
index 02eb4ef57..b2116c5e3 100644
--- a/device/testing/device-cutiepi-tablet/APKBUILD
+++ b/device/testing/device-cutiepi-tablet/APKBUILD
@@ -3,15 +3,17 @@
 pkgname=device-cutiepi-tablet
 pkgdesc="CutiePi Tablet"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi4"
 makedepends="devicepkg-dev dtc"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+	"
 source="
 	deviceinfo
 	modules-initfs
@@ -47,6 +49,12 @@ nonfree_firmware() {
 	mkdir -p "$subpkgdir"
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
 
 sha512sums="
 2ee0abff944ef734b18f919f6285e468b5a8171399ed55cad1c5f5b436a59f89b4e25e1e6a5f8cef3f9ca44832e23f66f8273756808078e791f28ab02abaa95e  deviceinfo
diff --git a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet.post-install b/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install
similarity index 100%
rename from device/testing/device-cutiepi-tablet/device-cutiepi-tablet.post-install
rename to device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install
diff --git a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade b/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade
new file mode 120000
index 000000000..6c289b27e
--- /dev/null
+++ b/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-cutiepi-tablet-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet.post-upgrade b/device/testing/device-cutiepi-tablet/device-cutiepi-tablet.post-upgrade
deleted file mode 120000
index 635b9578f..000000000
--- a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-cutiepi-tablet.post-install
\ No newline at end of file