diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD
index e4b894e4b..a65ae39a1 100644
--- a/device/community/device-oneplus-enchilada/APKBUILD
+++ b/device/community/device-oneplus-enchilada/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=14
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -26,7 +26,11 @@ source="
 	q6voiced.conf
 	81-libssc-oneplus-enchilada.rules
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-pmtest"
+subpackages="
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-pmtest
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -47,12 +51,16 @@ nonfree_firmware() {
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
+
+	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
+}
+
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel"
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-install b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-install
similarity index 100%
rename from device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-install
rename to device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-install
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade
new file mode 120000
index 000000000..27b06753d
--- /dev/null
+++ b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade
@@ -0,0 +1 @@
+device-oneplus-enchilada-nonfree-firmware-openrc.post-install
\ No newline at end of file
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-upgrade b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-upgrade
deleted file mode 120000
index 95e4e3d57..000000000
--- a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-oneplus-enchilada-nonfree-firmware.post-install
\ No newline at end of file