diff --git a/device/testing/device-lenovo-21bx/APKBUILD b/device/testing/device-lenovo-21bx/APKBUILD
index df7d5762f..96671983f 100644
--- a/device/testing/device-lenovo-21bx/APKBUILD
+++ b/device/testing/device-lenovo-21bx/APKBUILD
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -37,6 +37,7 @@ nonfree_firmware() {
 	pkgdesc="Firmware for Bluetooth, Modem, WiFi, etc."
 	depends="
 		bootmac
+		firmware-lenovo-21bx
 		linux-firmware-ath11k
 		linux-firmware-qca
 		linux-firmware-qcom
@@ -58,5 +59,5 @@ vulkan() {
 sha512sums="
 8c8e03e6061e72305442b27f3f6e0d096d4d7257ee3e2a9edbf1d87e0baf43a70417784465cad480d7bb557b00f012293e1a748c436937587ba5c007834274dc  deviceinfo
 84767961200e6c04928c34365d9c1daa7da90214690666f87e844f4a42d8f2abc551a4f353196babbabe6b3b4c0e754a2175e7a79d92d842804d6a31ef09410c  modules-initfs
-38da7bcdd603335feed1de8b477a289c5f9765ca8ce566b4ee144b49c4763ce41050cf29696ad38f4254b0190a48948f16f936857693d2b30196341e81b0233f  firmware.files
+82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
 "
diff --git a/device/testing/device-lenovo-21bx/firmware.files b/device/testing/device-lenovo-21bx/firmware.files
index 8b4091088..e882189d8 100644
--- a/device/testing/device-lenovo-21bx/firmware.files
+++ b/device/testing/device-lenovo-21bx/firmware.files
@@ -4,17 +4,16 @@
 
 # Bluetooth
 /lib/firmware/qca/hpbtfw21.tlv
-/lib/firmware/qca/hpnv21.bin
-# TODO: not available yet in linux-firmware:
-#/lib/firmware/qca/hpnv21.8c
+# TODO: replace this if/when the fixed fw makes its way into linux-firmware-qca
+#/lib/firmware/qca/hpnv21.bin
+/lib/firmware/postmarketos/qca/hpnv21.bin
 
 # GPU
 /lib/firmware/qcom/a660_gmu.bin
 /lib/firmware/qcom/a660_sqe.fw
 
 # HW Video Decoding
-# TODO: not available yet in linux-firmware:
-#/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
+/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
 
 # remoteproc
 /lib/firmware/qcom/sc8280xp/LENOVO/21BX/adspr.jsn