diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index 630bccfe9..176902de8 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -11,7 +11,6 @@ makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 subpackages="$pkgname-weston $pkgname-phosh $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
 source="
-	brcmfmac4339-sdio.txt
 	deviceinfo
 	rootston.ini
 	weston.ini
@@ -25,8 +24,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/brcmfmac4339-sdio.txt \
-		"$pkgdir"/lib/firmware/brcm/brcmfmac4339-sdio.txt
 }
 
 x11() {
@@ -54,12 +51,11 @@ weston() {
 
 nonfree_firmware() {
 	pkgdesc="WiFi, GPU, Modem and ADSP firmware"
-	depends="linux-firmware-qcom linux-firmware-brcm linux-firmware-cypress firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem firmware-lg-hammerhead-bluetooth msm-modem-rpmsg"
+	depends="linux-firmware-qcom linux-firmware-brcm linux-firmware-cypress firmware-adreno firmware-lg-hammerhead firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem firmware-lg-hammerhead-bluetooth msm-modem-rpmsg"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="59baf815a45c632f3413dc8d9f48978f91d8f8ee165003689dcd54cc3b3d1af65bfc0c88f76579f840b83b303a28a1de2c2994a651d62cc6f6d8988c8716e345  brcmfmac4339-sdio.txt
-a850782da69c99b9d9b5e405ce0e206568015e840597780fb0a4d20fba14cb8f7ce96abf6255796b8613cf46f4a1d48eab4147477fbe3f00cc06f567a82cab94  deviceinfo
+sha512sums="a850782da69c99b9d9b5e405ce0e206568015e840597780fb0a4d20fba14cb8f7ce96abf6255796b8613cf46f4a1d48eab4147477fbe3f00cc06f567a82cab94  deviceinfo
 8ee9e4a5420aa6b00cef04848a94b7e9d7bfd98252ace23b181b757ee44d27d453a2fcd9dbbbe149f17cd8a596f3749d3425d4040167f9e303e5e66dc8cd9560  rootston.ini
 4c22070223f39c419260a6817e5cc2b7881c095deeba031363a5634842dd175dd67eecace980849f0553de79110ef4e43a66143d71433805cd916c37fe7248e9  weston.ini
 0a9da551fa9d48d8a663f6bc74e8a7d6e2d2a6e009bd163fa46cd302e75656ad7ae57402a0bd70614ec253e0f2445b4c6999df07104f4c657ed630305c7f40d4  xorg.conf"
diff --git a/device/testing/firmware-lg-hammerhead/APKBUILD b/device/testing/firmware-lg-hammerhead/APKBUILD
index 578a44f02..5a9482005 100644
--- a/device/testing/firmware-lg-hammerhead/APKBUILD
+++ b/device/testing/firmware-lg-hammerhead/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-lg-hammerhead
 pkgver=1
-pkgrel=3
+pkgrel=4
 _modem_commit="d0565ebb2033bbd267b8be698373f075c9a82cd5"
 pkgdesc="Firmware for LG hammerhead (Nexus 5)"
 subpackages="$pkgname-modem $pkgname-adsp $pkgname-bluetooth"
@@ -12,7 +12,9 @@ options="!check !strip !archcheck"
 # Sources
 source="https://gitlab.com/JuniorJPDJ/hammerhead-modem/-/archive/$_modem_commit/hammerhead-modem-$_modem_commit.tar.gz
 	https://dl.google.com/dl/android/aosp/qcom-hammerhead-m4b30z-d6c0fe26.tgz
-	https://dl.google.com/dl/android/aosp/broadcom-hammerhead-m4b30z-21cf8433.tgz"
+	https://dl.google.com/dl/android/aosp/broadcom-hammerhead-m4b30z-21cf8433.tgz
+	brcmfmac4339-sdio.txt
+"
 
 unpack() {
 	default_unpack
@@ -23,8 +25,11 @@ unpack() {
 }
 
 package() {
-	# parent package is empty
 	mkdir -p "$pkgdir"
+
+	# Wi-Fi firmware
+	install -D -m644 "$srcdir"/brcmfmac4339-sdio.txt \
+		"$pkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4339-sdio.txt
 }
 
 modem() {
@@ -53,4 +58,5 @@ bluetooth() {
 
 sha512sums="a63a0fad2c7e5920c8a30213e149c51a745cdb2b34c1b13772737d1da51cd712aa81d3e03de6f3397d0705e59d0130727979f2c1c6f529788e0fbc9bbcde6a8a  hammerhead-modem-d0565ebb2033bbd267b8be698373f075c9a82cd5.tar.gz
 a421b547c78b71f73faa017325e291259aa37250c68613230f30a6bad8b773eb89bf2f1cf194e1d0182874ce346996107544dde00f742cf56d23076e02435df2  qcom-hammerhead-m4b30z-d6c0fe26.tgz
-003502fff6f8e69dea91f0c24e75021f9b5099c1bb65e6167f388e26d3a820e7649eb618ae7925ebc9a2b97121759308c6e9ccf4d8b49b369918bdd7b59b1ed0  broadcom-hammerhead-m4b30z-21cf8433.tgz"
+003502fff6f8e69dea91f0c24e75021f9b5099c1bb65e6167f388e26d3a820e7649eb618ae7925ebc9a2b97121759308c6e9ccf4d8b49b369918bdd7b59b1ed0  broadcom-hammerhead-m4b30z-21cf8433.tgz
+59baf815a45c632f3413dc8d9f48978f91d8f8ee165003689dcd54cc3b3d1af65bfc0c88f76579f840b83b303a28a1de2c2994a651d62cc6f6d8988c8716e345  brcmfmac4339-sdio.txt"
diff --git a/device/testing/device-lg-hammerhead/brcmfmac4339-sdio.txt b/device/testing/firmware-lg-hammerhead/brcmfmac4339-sdio.txt
similarity index 100%
rename from device/testing/device-lg-hammerhead/brcmfmac4339-sdio.txt
rename to device/testing/firmware-lg-hammerhead/brcmfmac4339-sdio.txt