diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index bbd88cf40..50a1706da 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -1,16 +1,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-lg-hammerhead
-pkgver=16
+pkgver=17
 pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 depends="
+	firmware-lg-hammerhead
+	firmware-lg-hammerhead-adsp
+	firmware-lg-hammerhead-bluetooth
+	firmware-lg-hammerhead-modem
+	firmware-qcom-adreno-a330
+	linux-firmware-brcm
+	linux-firmware-cypress
 	linux-postmarketos-qcom-msm8974
 	lk2nd-msm8974-lg-hammerhead
 	mkbootimg
+	msm-modem
 	postmarketos-base
 	soc-qcom-msm8974
 	unl0kr-fbforcerefresh
@@ -19,7 +27,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-phosh
 	$pkgname-x11
-	$pkgname-nonfree-firmware:nonfree_firmware"
+"
 source="
 	bt-module-deps.conf
 	deviceinfo
@@ -36,6 +44,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/bt-module-deps.conf \
+		-t "$pkgdir"/usr/lib/modprobe.d/
 }
 
 x11() {
@@ -57,24 +68,6 @@ phosh() {
 		"$subpkgdir"/usr/share/phosh/phoc.ini
 }
 
-nonfree_firmware() {
-	pkgdesc="WiFi, GPU, Modem and ADSP firmware"
-	depends="
-		firmware-qcom-adreno-a330
-		firmware-lg-hammerhead
-		firmware-lg-hammerhead-adsp
-		firmware-lg-hammerhead-modem
-		firmware-lg-hammerhead-bluetooth
-		linux-firmware-brcm
-		linux-firmware-cypress
-		msm-modem
-	"
-	mkdir "$subpkgdir"
-	# This config makes sense only if non-free firmware is installed
-	install -Dm644 "$srcdir"/bt-module-deps.conf \
-		"$subpkgdir"/usr/lib/modprobe.d/bt-module-deps.conf
-}
-
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
 1bfc6a5588e43a890aa6aaa0e48f9bcfd4b96a5dff87d8ada0f6abea8351a3f7f0d7ac93f9a50a352dc7152c0b2445221b759a4e146a2e296bcc93e22350f91e  deviceinfo