diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index b079af88d..90f397c69 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -9,6 +9,15 @@ license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-fairphone-fp5-adreno
+	firmware-fairphone-fp5-adsp
+	firmware-fairphone-fp5-bluetooth
+	firmware-fairphone-fp5-cdsp
+	firmware-fairphone-fp5-ipa
+	firmware-fairphone-fp5-modem
+	firmware-fairphone-fp5-venus
+	firmware-fairphone-fp5-wpss
+	firmware-qcom-adreno-a660
 	linux-postmarketos-qcom-sc7280
 	make-dynpart-mappings
 	mkbootimg
@@ -23,10 +32,6 @@ source="
 	ucm/HiFi.conf
 	ucm/fp5.conf
 	"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	"
-
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -43,22 +48,6 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/sm8250/Fairphone\ 5.conf
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for Modem, WiFi, etc."
-	depends="
-		firmware-fairphone-fp5-adreno
-		firmware-fairphone-fp5-adsp
-		firmware-fairphone-fp5-bluetooth
-		firmware-fairphone-fp5-cdsp
-		firmware-fairphone-fp5-ipa
-		firmware-fairphone-fp5-modem
-		firmware-fairphone-fp5-venus
-		firmware-fairphone-fp5-wpss
-		firmware-qcom-adreno-a660
-		"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 63cbf700191cb22f699dd9bedb3f349bb03d4fe8eaac782689936bf8cfff8b5ef33e94072ca110e707470a4dcb4b863720997b1b8b668843334758fd08698da7  deviceinfo
 165ae7e1dbb5fb709e2f7b457dafa5df5b755c1199ea0f011b7e519ab49bc676ddeff92a3152629125e66d3dbbe5a70384364191000a1fdf860977e2ed43de54  modules-initfs