diff --git a/device/testing/firmware-xiaomi-sagit/APKBUILD b/device/testing/firmware-xiaomi-sagit/APKBUILD
index 8289c3748..ea0c417ff 100644
--- a/device/testing/firmware-xiaomi-sagit/APKBUILD
+++ b/device/testing/firmware-xiaomi-sagit/APKBUILD
@@ -2,14 +2,13 @@
 # Based on firmware-oneplus-msm8998 package
 pkgname=firmware-xiaomi-sagit
 pkgver=1
-pkgrel=1
+pkgrel=2
 _commit="d7e0c59ed28700a8662c6a364d99740c26ebf58a"
 pkgdesc="Firmware for Xiaomi Mi 6"
 url="https://github.com/dsankouski/firmware-mainline-xiaomi-mi6.git"
 replaces="linux-firmware-ath10k"
 arch="aarch64"
 depends="firmware-qcom-adreno-a530 linux-firmware-qca soc-qcom-msm8998-nonfree-firmware"
-install="$pkgname.post-install"
 license="proprietary"
 options="!check !archcheck !strip !tracedeps"
 source="
@@ -17,7 +16,10 @@ source="
 	30-gpu-firmware.files
 	firmware.files
 "
-subpackages="$pkgname-initramfs:firmware_initramfs"
+subpackages="
+	$pkgname-initramfs:firmware_initramfs
+	$pkgname-openrc
+	"
 builddir="$srcdir/firmware-mainline-xiaomi-mi6-$_commit"
 
 package() {
@@ -35,6 +37,13 @@ firmware_initramfs() {
 		"$subpkgdir"/usr/share/mkinitfs/files/30-gpu-firmware.files
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 a6576fd2d3849c139809d9cfe8987e16790f36443bb6f6c3427d883c6f9fc3ab5a5500d6d323a30b5d430bfa2aabcedb16ed9a99a6c609d07bce992ca52f1e64  firmware-xiaomi-sagit-d7e0c59ed28700a8662c6a364d99740c26ebf58a.tar.gz
 ede0bdec767249ac2f252fb6da7ad8b0c7a44f73c4482211f105ca5e08686598051e09b467bcf0641793d3ea3bcc64386ab628dac87227dc48e6054cc7ca558f  30-gpu-firmware.files
diff --git a/device/testing/firmware-xiaomi-sagit/firmware-xiaomi-sagit.post-install b/device/testing/firmware-xiaomi-sagit/firmware-xiaomi-sagit-openrc.post-install
similarity index 100%
rename from device/testing/firmware-xiaomi-sagit/firmware-xiaomi-sagit.post-install
rename to device/testing/firmware-xiaomi-sagit/firmware-xiaomi-sagit-openrc.post-install