diff --git a/device/testing/device-samsung-gt58/APKBUILD b/device/testing/device-samsung-gt58/APKBUILD
index 8b05fd3b8..a20b2db0e 100644
--- a/device/testing/device-samsung-gt58/APKBUILD
+++ b/device/testing/device-samsung-gt58/APKBUILD
@@ -2,14 +2,22 @@
 maintainer="Nikita Travkin <nikita@trvn.ru>"
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
+depends="
+	firmware-qcom-adreno-a300
+	firmware-samsung-gt58-wcnss-nv
+	linux-postmarketos-qcom-msm8916
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8916
+	soc-qcom-msm8916-rproc
+	"
 makedepends="devicepkg-dev dtbtool"
 source="
 	deviceinfo
@@ -17,10 +25,7 @@ source="
 	modules-initfs
 	phoc.ini
 "
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-"
+subpackages="$pkgname-phosh"
 
 # Backwards compatibility for old kernel variant subpackages
 replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem-lte"
@@ -34,12 +39,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-gt58-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	replaces="phosh"