diff --git a/device/testing/device-huawei-kiwi/APKBUILD b/device/testing/device-huawei-kiwi/APKBUILD
index 70076fe29..0db865d0c 100644
--- a/device/testing/device-huawei-kiwi/APKBUILD
+++ b/device/testing/device-huawei-kiwi/APKBUILD
@@ -10,6 +10,13 @@ options="!check !archcheck"
 depends="postmarketos-base linux-huawei-kiwi mkbootimg mesa-dri-gallium msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+nonfree_firmware() {
+	pkgdesc="Modem/GPU/WiFi/BT/Video firmware"
+	depends="linux-firmware-qcom firmware-huawei-kiwi wcnss-wlan"
+	mkdir "$subpkgdir"
+}
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,4 +26,4 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="357b58de0ecc26c95aff3eb52b662374a1459da2192c6421ff19c0323e9024a2a2619b91327b0c49a72f4273c27b75460b7053a8560e5b1d5f1211dbd1d5e2b1  deviceinfo"
+sha512sums="2d0ee66a7125f40b82be6ce748d37f791fc65b02c38af056756b6e6ddbdc21e3d5d9127521e0844fa2a305451dcf7b0d356c4c1118d7667f95b3d9967cedf758  deviceinfo"
diff --git a/device/testing/device-huawei-kiwi/deviceinfo b/device/testing/device-huawei-kiwi/deviceinfo
index 5402b3449..4629df93d 100644
--- a/device/testing/device-huawei-kiwi/deviceinfo
+++ b/device/testing/device-huawei-kiwi/deviceinfo
@@ -27,3 +27,4 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
diff --git a/device/testing/firmware-huawei-kiwi/APKBUILD b/device/testing/firmware-huawei-kiwi/APKBUILD
new file mode 100644
index 000000000..c392b2abc
--- /dev/null
+++ b/device/testing/firmware-huawei-kiwi/APKBUILD
@@ -0,0 +1,30 @@
+pkgname=firmware-huawei-kiwi
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Huawei Honor 5X"
+url="https://git.sr.ht/~bo41/firmware-huawei-kiwi"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck"
+# Sources
+_commit="2a4db2a026568abfaf342211e9f3d63ac044a9d9"
+source="$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz"
+
+_fwdir="/lib/firmware/postmarketos"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+
+	pkgdesc="Huawei Kiwi Modem/GPU/WiFi/BT/Video firmware"
+	install -Dm644 mba.mbn -t "$pkgdir/$_fwdir"
+	install -Dm644 modem.* -t "$pkgdir/$_fwdir"
+
+	install -Dm644 venus.* -t "$pkgdir/$_fwdir"/qcom/venus-1.8
+
+	install -Dm644 wcnss.* -t "$pkgdir/$_fwdir"
+	install -Dm644 WCNSS_* -t "$pkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="93a6734cffb8bae2683ceaf67318a9b3d8d848f654871fac1c0f06a4aada387dd250b23caa3a72fe0f3074c55119cd34b10eb92b7fd6d172a8b45d1afea4ba24  firmware-huawei-kiwi-2a4db2a026568abfaf342211e9f3d63ac044a9d9.tar.gz"