diff --git a/device/community/firmware-xiaomi-beryllium/APKBUILD b/device/community/firmware-xiaomi-beryllium/APKBUILD
index 1d05f0a19..cb927ade6 100644
--- a/device/community/firmware-xiaomi-beryllium/APKBUILD
+++ b/device/community/firmware-xiaomi-beryllium/APKBUILD
@@ -1,6 +1,6 @@
 maintainer="Joel Selvaraj <foss@joelselvaraj.com>"
 pkgname=firmware-xiaomi-beryllium
-pkgver=9
+pkgver=10
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
@@ -9,9 +9,9 @@ depends="linux-firmware-qcom linux-firmware-qca linux-firmware-ath10k"
 license="proprietary"
 options="!strip !check !archcheck !tracedeps textrels pmb:cross-native"
 
-_commit="5a797a180ddee8edabd5e6c9d0d3566f257ec4c3"
+_commit="d396d32118803235a58aab0d0bc3643256634a05"
 
-source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
+source="$pkgname.tar.gz::https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium/-/archive/$_commit/firmware-xiaomi-beryllium-$_commit.tar.gz
 	firmware.files
 	sensor.files
 	mount-matrix.patch
@@ -40,8 +40,8 @@ firmware_sensors() {
 }
 
 sha512sums="
-babe3ec1abde42f21f1943357a28548cb89c3df4f860a1c3bdef22782e38b77ff6e1fcf6dce44de4ba771da4c61bfad97df25520ff2b466288a081fd7a13cf7e  firmware-xiaomi-beryllium.tar.gz
-d41eb4cfd7b1fa932a6471162e1edb15f637be9b3b66648827916d5f3a03ebcae24b158b574916070a6d8a22cd8c0ac1bbcbafab8de6aba3b4932fa6bfb23bb1  firmware.files
+a8d96aef0d6929800cc32703c973ff903037e9365c35d0421d29a10ccbac63e92bae36ea66790e80151a77b775b456c24d9577617342abac0daf12ad0475f4e0  firmware-xiaomi-beryllium.tar.gz
+2123278ea9e6e6deb014429d9320c8ad855f915a911815beea2fb0f2e6cc6c94c19ba4caa8052ba7d98b7a50be653af3d15d6597586463d3b041998c545f1268  firmware.files
 445600490c81091ec51b0ce50297e960f214d9848242e8dc35689ce40e5a7469e8d495d64b61e1a89d38aa6695cbd012f7f1cdd8c5e94cce0c1c64f2c833dba3  sensor.files
 9337e243aee9e56bb9f9e297dfe5084b3a97b87ac36bcaf66f6f4d07cbb39c7b73d024afe07fdadef254c569ba9f2d3067324478c35175592ff8abb2ff19e930  mount-matrix.patch
 "
diff --git a/device/community/firmware-xiaomi-beryllium/firmware.files b/device/community/firmware-xiaomi-beryllium/firmware.files
index 4916e2e10..bbd7cd9a7 100644
--- a/device/community/firmware-xiaomi-beryllium/firmware.files
+++ b/device/community/firmware-xiaomi-beryllium/firmware.files
@@ -1,15 +1,15 @@
 ./lib/firmware/tas2559_uCDSP.bin
-./lib/firmware/qcom/sdm845/beryllium/adsp.mbn
-./lib/firmware/qcom/sdm845/beryllium/a630_zap.mbn
-./lib/firmware/qcom/sdm845/beryllium/cdsp.mbn
-./lib/firmware/qcom/sdm845/beryllium/ipa_fws.mbn
-./lib/firmware/qcom/sdm845/beryllium/mba.mbn
-./lib/firmware/qcom/sdm845/beryllium/modem.mbn
-./lib/firmware/qcom/sdm845/beryllium/slpi.mbn
-./lib/firmware/qcom/sdm845/beryllium/venus.mbn
-./lib/firmware/qcom/sdm845/beryllium/wlanmdsp.mbn
-./lib/firmware/qcom/sdm845/beryllium/adspr.jsn
-./lib/firmware/qcom/sdm845/beryllium/adspua.jsn
-./lib/firmware/qcom/sdm845/beryllium/cdspr.jsn
-./lib/firmware/qcom/sdm845/beryllium/modemr.jsn
-./lib/firmware/qcom/sdm845/beryllium/modemuw.jsn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/adsp.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/a630_zap.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/cdsp.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/ipa_fws.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/mba.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/modem.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/slpi.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/venus.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/wlanmdsp.mbn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/adspr.jsn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/adspua.jsn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/cdspr.jsn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/modemr.jsn
+./lib/firmware/qcom/sdm845/Xiaomi/beryllium/modemuw.jsn