diff --git a/device/testing/device-xiaomi-gemini/APKBUILD b/device/testing/device-xiaomi-gemini/APKBUILD
index b71a5d75b..f689f9769 100644
--- a/device/testing/device-xiaomi-gemini/APKBUILD
+++ b/device/testing/device-xiaomi-gemini/APKBUILD
@@ -2,21 +2,26 @@
 maintainer="Raffaele Tranquillini (cunidev) <raffaele.tranquillini@gmail.com>"
 pkgname=device-xiaomi-gemini
 pkgdesc="Xiaomi Mi 5"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-xiaomi-gemini
+	linux-firmware-ath10k
+	linux-firmware-qca
+	linux-firmware-qcom
 	linux-postmarketos-qcom-msm8996
 	mkbootimg
+	msm-modem
 	postmarketos-base
 	soc-qcom-msm8996
 	soc-qcom-msm8996-ucm
 	"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
+subpackages="$pkgname-phosh"
 
 source="
 	deviceinfo
@@ -36,17 +41,6 @@ package() {
 		"$pkgdir"/etc/pointercal
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/Modem/Venus/ADSP/SLPI/WiFi/Bluetooth Firmware"
-	depends="
-		firmware-xiaomi-gemini
-		linux-firmware-ath10k
-		linux-firmware-qca
-		soc-qcom-msm8996-nonfree-firmware
-		"
-	mkdir "$subpkgdir"
-}
-
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	replaces="phosh"