diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index d9ff4704e..219599d8c 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -20,6 +20,7 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	"
 source="deviceinfo"
 
@@ -51,10 +52,18 @@ nonfree_firmware() {
 		firmware-sony-leo-wifi
 		msm-modem
 		ta-service
+		"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
 		ta-service-openrc
 		"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	mkdir "$subpkgdir"
+
+	mkdir -p "$subpkgdir"
 }
 
 sha512sums="
diff --git a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-install b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-install
similarity index 100%
rename from device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-install
rename to device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-install
diff --git a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade
new file mode 120000
index 000000000..ed8988b84
--- /dev/null
+++ b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-sony-leo-nonfree-firmware-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-upgrade b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-upgrade
deleted file mode 120000
index 6238f5459..000000000
--- a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-sony-leo-nonfree-firmware.post-install
\ No newline at end of file