diff --git a/device/testing/soc-qcom-sm8350/APKBUILD b/device/testing/soc-qcom-sm8350/APKBUILD
index 57bcb99f0..74c6894f4 100644
--- a/device/testing/soc-qcom-sm8350/APKBUILD
+++ b/device/testing/soc-qcom-sm8350/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=soc-qcom-sm8350
 pkgdesc="Common package for Qualcomm sm8350 devices"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 "
 
 package() {
@@ -21,7 +22,13 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi, and GPU Firmware"
-	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem"
-	install="$subpkgname.post-install"
-	mkdir "$subpkgdir"
+	depends="pd-mapper tqftpserv msm-modem"
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="pd-mapper-openrc tqftpserv-openrc"
+	mkdir -p "$subpkgdir"
 }
diff --git a/device/testing/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware.post-install b/device/testing/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install
similarity index 100%
rename from device/testing/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware.post-install
rename to device/testing/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install