diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index 5e44e881a..1ecb71cc6 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
-pkgver=0.3
-pkgrel=2
+pkgver=0.4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -44,7 +44,15 @@ kernel_mainline() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi/GPU firmware"
-	depends="linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
+	depends="
+		firmware-sony-leo-adsp
+		firmware-sony-leo-modem
+		firmware-sony-leo-wifi
+		msm-modem
+		ta-service
+		ta-service-openrc
+		"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
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.post-install
new file mode 100644
index 000000000..5dd71463b
--- /dev/null
+++ b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+rc-update add ta-service boot
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
new file mode 120000
index 000000000..6238f5459
--- /dev/null
+++ b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware.post-upgrade
@@ -0,0 +1 @@
+device-sony-leo-nonfree-firmware.post-install
\ No newline at end of file