diff --git a/device/testing/device-xiaomi-pipa/APKBUILD b/device/testing/device-xiaomi-pipa/APKBUILD
index 8641d2021..2b0f5311a 100644
--- a/device/testing/device-xiaomi-pipa/APKBUILD
+++ b/device/testing/device-xiaomi-pipa/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="bluebunny <kalorin.bok084@passinbox.com>"
 pkgname=device-xiaomi-pipa
 pkgdesc="Xiaomi Pad 6"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,19 +10,6 @@ arch="aarch64"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
-	hexagonrpcd
-	make-dynpart-mappings
-	mkbootimg
-	postmarketos-base
-	soc-qcom
-	soc-qcom-qbootctl
-"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-csot:kernel_csot
-	$pkgname-kernel-tianma:kernel_tianma
-"
-_pmb_recommends="
 	firmware-xiaomi-pipa-adreno
 	firmware-xiaomi-pipa-adsp
 	firmware-xiaomi-pipa-awinic
@@ -32,14 +19,23 @@ _pmb_recommends="
 	firmware-xiaomi-pipa-nuvolta
 	firmware-xiaomi-pipa-slpi
 	firmware-xiaomi-pipa-venus
+	hexagonrpcd
 	linux-firmware-qca
 	linux-firmware-qcom
+	postmarketos-base
+	soc-qcom
+	soc-qcom-qbootctl
+	systemd-boot
+"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-csot:kernel_csot
+	$pkgname-kernel-tianma:kernel_tianma
 "
 source="
 	81-libssc-xiaomi-pipa.rules
 	HiFi.conf
 	deviceinfo
-	hexagonrpcd-sdsp.conf
 	modules-initfs
 	pipa.conf
 "
@@ -54,9 +50,6 @@ package() {
 	install -Dm644 "$srcdir"/81-libssc-xiaomi-pipa.rules -t \
 		"$pkgdir/usr/lib/udev/rules.d/"
 
-	install -Dm644 "$srcdir"/hexagonrpcd-sdsp.conf -t \
-		"$pkgdir/usr/share/hexagonrpcd/"
-
 	install -Dm644 "$srcdir"/pipa.conf -t \
 		"$pkgdir/usr/share/alsa/ucm2/Xiaomi/pipa/"
 
@@ -83,8 +76,7 @@ kernel_tianma() {
 sha512sums="
 d0e8f2e378130130ac72703aed957f7638e2dd75acf4aa421e1b4592c6cb6d296b652db0d9c242be4e56326760ce18d28c1e36ae553d0b7a7f91e12ab0353f22  81-libssc-xiaomi-pipa.rules
 1c8cef1f2de5fd7e734796dfffc684255b047bdb07a0965676a4d8d512aee4963ce91aeabf8627ce3aea72aeade776a3529f205badd2ed27ba072cadc38f9918  HiFi.conf
-e3f770914b5bd73af1cf6e4cee8e3a217d180730fc2b219a72729ce84ecb0df5c96fbcb9697fc3b8483b012bed14b238382ac445e6a1ce327568574136dcfe1c  deviceinfo
-7f9d9760791639fdd5606070d6a3bd9a5e2d8fdadff0af380b847c7eaf28131000f4909b99e866eafb77272a4fe20ed0c35d5a4f64bb7d16e2dbf82612aa8b22  hexagonrpcd-sdsp.conf
-514de5c7686457c665e4e8218a196882e7d69b44287474494c3d17d5e60e14a29af5e992d966728bef2d46a771e07f34a892c9e372c651ba340b1b6bbae341f4  modules-initfs
+9ce5336d2815de6dfe8477daa326abf8c79640d3fe519ef1978b18b49e489d70371215d3c0bbfb55068afde4b01b166b0a2a1a8d57b81355e465f542a43e361f  deviceinfo
+a92842d4f9d92af8ca14f4e86c74ea7dec446abd8a2a2b7dccbf6771065d8a7eea7f4a41adbd68647b49f81787a43fdb5b5337df0032ff3fbcb8e88b17f5ebf1  modules-initfs
 007908c49db107dd8289a96049ed4d77a55c7846e21f76fa7f97306df953ccdec7d821cbc7732a3ff7c532285175ebf0d6a4e3f224740ac002b23f3608cbf76d  pipa.conf
 "
diff --git a/device/testing/device-xiaomi-pipa/deviceinfo b/device/testing/device-xiaomi-pipa/deviceinfo
index 13d8bded4..05e0dbb4a 100644
--- a/device/testing/device-xiaomi-pipa/deviceinfo
+++ b/device/testing/device-xiaomi-pipa/deviceinfo
@@ -16,22 +16,12 @@ deviceinfo_drm="true"
 # Kernel options
 deviceinfo_dtb_csot="qcom/sm8250-xiaomi-pipa-csot"
 deviceinfo_dtb_tianma="qcom/sm8250-xiaomi-pipa-tianma"
-deviceinfo_append_dtb="true"
-deviceinfo_flash_kernel_on_update="true"
 
 # Bootloader related
+deviceinfo_boot_filesystem="fat32"
 deviceinfo_flash_method="fastboot"
-deviceinfo_generate_bootimg="true"
-deviceinfo_flash_offset_base="0x00000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
-
-# Support super partition flashing
-deviceinfo_super_partitions="/dev/sda29 /dev/sda29"
diff --git a/device/testing/device-xiaomi-pipa/hexagonrpcd-sdsp.conf b/device/testing/device-xiaomi-pipa/hexagonrpcd-sdsp.conf
deleted file mode 100644
index a41f9eed3..000000000
--- a/device/testing/device-xiaomi-pipa/hexagonrpcd-sdsp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Xiaomi Pad 6 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sm8250/Xiaomi/pipa/"
-
diff --git a/device/testing/device-xiaomi-pipa/modules-initfs b/device/testing/device-xiaomi-pipa/modules-initfs
index 324d7f97d..ba1f62332 100644
--- a/device/testing/device-xiaomi-pipa/modules-initfs
+++ b/device/testing/device-xiaomi-pipa/modules-initfs
@@ -1,3 +1,4 @@
+ktz8866
 nt36523_ts
 panel_novatek_nt36532
 qcom_common
@@ -5,4 +6,3 @@ qcom_pil_info
 qcom_q6v5
 qcom_q6v5_pas
 spi_geni_qcom
-