diff --git a/device/testing/device-lenovo-q706f/APKBUILD b/device/testing/device-lenovo-q706f/APKBUILD
index 056200323..1649106ea 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=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,7 +21,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 replaces="hexagonrpcd-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	81-libssc-lenovo-q706f.rules
 	alsa-ucm-conf/q706f.conf
@@ -33,6 +32,8 @@ source="
 
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-openrc
 "
 
 build() {
@@ -55,8 +56,6 @@ package() {
 
 	install -Dm644 "$srcdir"/81-libssc-lenovo-q706f.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-lenovo-q706f.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 nonfree_firmware() {
@@ -74,10 +73,24 @@ nonfree_firmware() {
 		pd-mapper
 		tqftpserv
 		"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir "$subpkgdir"
+}
+
+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-sdsp
+}
+
 sha512sums="
 1e0f02d47ea87d467c6e9d824d3b021c97ff29af8fcdf67ac1b75baa2b835f1dcdfc0c9f308a0bdeb3cdf07a8c1e26d66bff8d1337c9cfab1df94c26e9ccfb81  81-libssc-lenovo-q706f.rules
 7c97ffb7ae3e1fa2e62bdb3c504275db2c830cc1e5b57dd409ae14d020a1ff5f5cb922223c5dd776569cff52415afd26cba83b6acd76aef22a79ffdaf18dcfbd  q706f.conf
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware.post-install b/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install
similarity index 100%
rename from device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware.post-install
rename to device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-upgrade b/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-upgrade
new file mode 120000
index 000000000..09199bb4d
--- /dev/null
+++ b/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-lenovo-q706f-nonfree-firmware-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware.post-upgrade b/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware.post-upgrade
deleted file mode 100644
index 6975f6acd..000000000
--- a/device/testing/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-lenovo-q706f-nonfree-firmware.post-install
\ No newline at end of file
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f.post-install b/device/testing/device-lenovo-q706f/device-lenovo-q706f-openrc.post-install
similarity index 100%
rename from device/testing/device-lenovo-q706f/device-lenovo-q706f.post-install
rename to device/testing/device-lenovo-q706f/device-lenovo-q706f-openrc.post-install
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f-openrc.post-upgrade b/device/testing/device-lenovo-q706f/device-lenovo-q706f-openrc.post-upgrade
new file mode 120000
index 000000000..babd913b6
--- /dev/null
+++ b/device/testing/device-lenovo-q706f/device-lenovo-q706f-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-lenovo-q706f-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-lenovo-q706f/device-lenovo-q706f.post-upgrade b/device/testing/device-lenovo-q706f/device-lenovo-q706f.post-upgrade
deleted file mode 100644
index 14f1a65a8..000000000
--- a/device/testing/device-lenovo-q706f/device-lenovo-q706f.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-lenovo-q706f.post-install
\ No newline at end of file