diff --git a/device/testing/device-samsung-a6plte/30-gpu-firmware.files b/device/testing/device-samsung-a6plte/30-gpu-firmware.files
index 3364b8f4c..cb237ce13 100644
--- a/device/testing/device-samsung-a6plte/30-gpu-firmware.files
+++ b/device/testing/device-samsung-a6plte/30-gpu-firmware.files
@@ -1,6 +1,4 @@
-/lib/firmware/postmarketos/a506_zap.b00
-/lib/firmware/postmarketos/a506_zap.b01
-/lib/firmware/postmarketos/a506_zap.b02
-/lib/firmware/postmarketos/a506_zap.mdt
-/lib/firmware/postmarketos/a530_pfp.fw
-/lib/firmware/postmarketos/a530_pm4.fw
+/lib/firmware/msm-firmware-loader/mnt/apnhlos/image/a506_zap.b02
+/lib/firmware/msm-firmware-loader/mnt/apnhlos/image/a506_zap.mdt
+/lib/firmware/qcom/a530_pfp.fw
+/lib/firmware/qcom/a530_pm4.fw
diff --git a/device/testing/device-samsung-a6plte/APKBUILD b/device/testing/device-samsung-a6plte/APKBUILD
index a09acf347..7bf4dd6f9 100644
--- a/device/testing/device-samsung-a6plte/APKBUILD
+++ b/device/testing/device-samsung-a6plte/APKBUILD
@@ -2,8 +2,8 @@
 
 pkgname=device-samsung-a6plte
 pkgdesc="Samsung Galaxy A6+ (2018)"
-pkgver=1
-pkgrel=4
+pkgver=1.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,7 +38,10 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="WiFi, Bluetooth, ADSP, Venus and GPU Firmware"
-	depends="firmware-samsung-a6plte linux-firmware-qcom"
+	depends="
+		firmware-samsung-a6plte
+		linux-firmware-qcom
+		msm-firmware-loader"
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir/30-gpu-firmware.files" -t \
@@ -52,7 +55,7 @@ phosh() {
 }
 
 sha512sums="
-302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+d087fb8b9c1cec66bd6f88680402afed3a642e55014e86a525a8177274cbda768622683108670476cb742cacea7a82a97df94e0469a9126e85d163685aeba421  30-gpu-firmware.files
 0be6ff0e24d1184f316deb27cd3642d9f6dc74ae90ad7c0fcdfc32722471db0a72643bd59aae1b3a5e717f6c710898e44d87192b9268614328235de452ca952e  deviceinfo
 c23c2f882a78e8f3ddc1be9f04bed1977885ff403e4c7211255846208f3053373d5ac413bd9d0d3d5330de045a645c14c4bdb031714f2f6efe64495d6800a96d  modules-initfs
 bea40516cf51b4ad0609cc21ca56c19eb9cb2b1be45cddf486264d9c526469f1abad313a95a4f938ccbd0c023d08884aefe8d850746a97075999de11b4a2ff4c  gpu-nobin.sh
diff --git a/device/testing/firmware-samsung-a6plte/APKBUILD b/device/testing/firmware-samsung-a6plte/APKBUILD
index d9e9f8aa0..b8676d875 100644
--- a/device/testing/firmware-samsung-a6plte/APKBUILD
+++ b/device/testing/firmware-samsung-a6plte/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-samsung-a6plte
-pkgver=1
+pkgver=1.1
 pkgrel=0
 pkgdesc="Firmware files for Samsung Galaxy A6+ (2018)"
 url="https://gitlab.com/ungeskriptet/firmware-samsung-a6plte"
@@ -9,17 +9,14 @@ options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 
 # Source
 _commit="8b8be38058ed267ac31004358fcf0ac122e56389"
-builddir="$srcdir/firmware-samsung-a6plte-$_commit"
-source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	firmware.files"
+_path="lib/firmware/postmarketos/wlan/prima"
+source="$pkgname-WCNSS_qcom_wlan_nv.bin::$url/-/raw/$_commit/$_path/WCNSS_qcom_wlan_nv.bin"
 
 package() {
-	for i in $(cat "$srcdir"/firmware.files); do
-		install -Dm644 "$i" "$pkgdir/$i"
-	done
+	install -Dm644 "$srcdir"/$pkgname-WCNSS_qcom_wlan_nv.bin \
+		"$pkgdir"/$_path/WCNSS_qcom_wlan_nv.bin
 }
 
 sha512sums="
-ed169d1a68c4c5d94f9ae335a085aa603a1f2a9bdafc9a99ef79f47261982c576ed339d0cd37ed599a368b3a1029971ebc96b62c10d52fcb2d030f4d4b6db981  firmware-samsung-a6plte.tar.gz
-d43fae933bb12e3879588e96f604be0534be5455bb9edbea3c9cf96bcffbce44abae27de3f40a118536254ca85faeb0fecf390f8f6ae60ca9d06887ac32a7462  firmware.files
+a77f0ce1d7d4e44c9dcb3f639ec326cf56be9ee323abd5292344a4b0507dce2bd63d489d6b1f0902321cffbb6b270b5af87c0acb3f9ffbce25fa6c41ad9d80fe  firmware-samsung-a6plte-WCNSS_qcom_wlan_nv.bin
 "
diff --git a/device/testing/firmware-samsung-a6plte/firmware.files b/device/testing/firmware-samsung-a6plte/firmware.files
deleted file mode 100644
index 82ab2eac5..000000000
--- a/device/testing/firmware-samsung-a6plte/firmware.files
+++ /dev/null
@@ -1,60 +0,0 @@
-./lib/firmware/postmarketos/a506_zap.b00
-./lib/firmware/postmarketos/a506_zap.b01
-./lib/firmware/postmarketos/a506_zap.b02
-./lib/firmware/postmarketos/a506_zap.mdt
-./lib/firmware/postmarketos/a530_pfp.fw
-./lib/firmware/postmarketos/a530_pm4.fw
-./lib/firmware/postmarketos/adsp.b00
-./lib/firmware/postmarketos/adsp.b01
-./lib/firmware/postmarketos/adsp.b02
-./lib/firmware/postmarketos/adsp.b03
-./lib/firmware/postmarketos/adsp.b04
-./lib/firmware/postmarketos/adsp.b05
-./lib/firmware/postmarketos/adsp.b06
-./lib/firmware/postmarketos/adsp.b07
-./lib/firmware/postmarketos/adsp.b08
-./lib/firmware/postmarketos/adsp.b09
-./lib/firmware/postmarketos/adsp.b10
-./lib/firmware/postmarketos/adsp.b11
-./lib/firmware/postmarketos/adsp.b12
-./lib/firmware/postmarketos/adsp.b13
-./lib/firmware/postmarketos/adsp.b14
-./lib/firmware/postmarketos/adsp.mdt
-./lib/firmware/postmarketos/mba.mbn
-./lib/firmware/postmarketos/modem.b00
-./lib/firmware/postmarketos/modem.b01
-./lib/firmware/postmarketos/modem.b02
-./lib/firmware/postmarketos/modem.b04
-./lib/firmware/postmarketos/modem.b05
-./lib/firmware/postmarketos/modem.b06
-./lib/firmware/postmarketos/modem.b07
-./lib/firmware/postmarketos/modem.b08
-./lib/firmware/postmarketos/modem.b09
-./lib/firmware/postmarketos/modem.b10
-./lib/firmware/postmarketos/modem.b11
-./lib/firmware/postmarketos/modem.b12
-./lib/firmware/postmarketos/modem.b13
-./lib/firmware/postmarketos/modem.b16
-./lib/firmware/postmarketos/modem.b17
-./lib/firmware/postmarketos/modem.b18
-./lib/firmware/postmarketos/modem.b19
-./lib/firmware/postmarketos/modem.b20
-./lib/firmware/postmarketos/modem.mdt
-./lib/firmware/postmarketos/qdsp6m.qdb
-./lib/firmware/postmarketos/venus.b00
-./lib/firmware/postmarketos/venus.b01
-./lib/firmware/postmarketos/venus.b02
-./lib/firmware/postmarketos/venus.b03
-./lib/firmware/postmarketos/venus.b04
-./lib/firmware/postmarketos/venus.mdt
-./lib/firmware/postmarketos/wcnss.b00
-./lib/firmware/postmarketos/wcnss.b01
-./lib/firmware/postmarketos/wcnss.b02
-./lib/firmware/postmarketos/wcnss.b04
-./lib/firmware/postmarketos/wcnss.b06
-./lib/firmware/postmarketos/wcnss.b09
-./lib/firmware/postmarketos/wcnss.b10
-./lib/firmware/postmarketos/wcnss.b11
-./lib/firmware/postmarketos/wcnss.b12
-./lib/firmware/postmarketos/wcnss.mdt
-./lib/firmware/postmarketos/wlan/prima/WCNSS_qcom_wlan_nv.bin