diff --git a/device/testing/firmware-xiaomi-tissot/30-gpu-firmware.files b/device/testing/firmware-xiaomi-tissot/30-gpu-firmware.files
new file mode 100644
index 000000000..3364b8f4c
--- /dev/null
+++ b/device/testing/firmware-xiaomi-tissot/30-gpu-firmware.files
@@ -0,0 +1,6 @@
+/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
diff --git a/device/testing/firmware-xiaomi-tissot/APKBUILD b/device/testing/firmware-xiaomi-tissot/APKBUILD
index 68a1b8e18..a997c49e0 100644
--- a/device/testing/firmware-xiaomi-tissot/APKBUILD
+++ b/device/testing/firmware-xiaomi-tissot/APKBUILD
@@ -1,39 +1,38 @@
+# Maintainer: Danila Tikhonov (JIaxyga) <JIaxyga@protonmail.com>
+
 pkgname=firmware-xiaomi-tissot
 pkgver=1
-pkgrel=1
-_commit="98cc201f4cef4372298206bc910a6599a95cd258"
+pkgrel=2
 pkgdesc="Firmware files for Xiaomi Mi A1"
-url="https://postmarketos.org"
+url="https://gitlab.com/jiaxyga/firmware-xiaomi-tissot"
 arch="aarch64"
+depends="linux-firmware-qcom firmware-xiaomi-tissot-initramfs"
 license="proprietary"
-depends="wcnss-wlan"
-source="$pkgname-$_commit.tar.gz::https://gitlab.com/IonAgorria/postmarketos-vendor-xiaomi-tissot/-/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
-builddir="$srcdir/postmarketos-vendor-xiaomi-tissot-$_commit"
 
-_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06
-	wcnss.b09 wcnss.b10 wcnss.b11 wcnss.b12 wcnss.mdt
-	adsp.b00 adsp.b01 adsp.b02 adsp.b03 adsp.b04
-	adsp.b05 adsp.b06 adsp.b07 adsp.b08 adsp.b09
-	adsp.b10 adsp.b11 adsp.b12 adsp.b13 adsp.mdt
-	qdsp6m.qdb
-	a506_zap.b00 a506_zap.b01 a506_zap.b02 a506_zap.mdt"
-_files_prima="WCNSS_wlan_dictionary.dat
-	WCNSS_qcom_cfg.ini
-	WCNSS_qcom_wlan_nv.bin"
+_commit="bf686895224cae33c2130932b4a5914fea415287"
+
+source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
+	firmware.files
+	30-gpu-firmware.files"
+subpackages="$pkgname-initramfs:firmware_initramfs"
 
 package() {
-	# /lib/firmware/postmarketos
-	for _i in $_files; do
-		install -D -m644 "$_i" \
-			"$pkgdir"/lib/firmware/postmarketos/"$_i"
-	done
-
-	# /lib/firmware/postmarketos/wlan/prima
-	for _i in $_files_prima; do
-		install -D -m644 wlan/prima/"$_i" \
-			"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
-	done
+	cd "$srcdir/$pkgname-$_commit/"
+	while IFS="" read -r _i || [ -n "$_i" ]; do
+		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
+		install -Dm644 $_i "$pkgdir/$_i"
+	done < "$srcdir/firmware.files"
 }
 
-sha512sums="c459d6bf893ff62e6b4b96f4e4cafc3dcf7ac08bab99b8df577ad637b4714fb7fbfddf6cb1ab657bd59bc3c18715239a2117659b099fbd92e14b585f1400b179  firmware-xiaomi-tissot-98cc201f4cef4372298206bc910a6599a95cd258.tar.gz"
+firmware_initramfs() {
+	mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/30-gpu-firmware.files -t \
+		"$subpkgdir"/etc/postmarketos-mkinitfs/files
+}
+
+sha512sums="
+e82c953fd1a1a665bcfcfc4eaab95fe8a017f1804e4bc66f6449cfeb21137f2ebcc0f8abab9ef9975c438d9836d68974b417bbe58c128b06cec605abecfad008  firmware-xiaomi-tissot.tar.gz
+d43fae933bb12e3879588e96f604be0534be5455bb9edbea3c9cf96bcffbce44abae27de3f40a118536254ca85faeb0fecf390f8f6ae60ca9d06887ac32a7462  firmware.files
+302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+"
diff --git a/device/testing/firmware-xiaomi-tissot/firmware.files b/device/testing/firmware-xiaomi-tissot/firmware.files
new file mode 100644
index 000000000..82ab2eac5
--- /dev/null
+++ b/device/testing/firmware-xiaomi-tissot/firmware.files
@@ -0,0 +1,60 @@
+./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