diff --git a/device/testing/device-xiaomi-vayu/APKBUILD b/device/testing/device-xiaomi-vayu/APKBUILD
new file mode 100644
index 000000000..472163106
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/APKBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Arseniy Velikanov <adomerlee@gmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-xiaomi-vayu
+pkgdesc="Xiaomi POCO X3 Pro"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-qcom-sm8150
+	mkbootimg
+	postmarketos-base
+	make-dynpart-mappings
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	phoc.ini
+"
+
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="Firmware for GPU, Audio, Modem, WiFi, etc."
+	depends="
+		firmware-xiaomi-vayu-adreno
+		firmware-xiaomi-vayu-adsp
+		firmware-xiaomi-vayu-cdsp
+		firmware-xiaomi-vayu-touchscreen
+		firmware-xiaomi-vayu-wlan
+		firmware-xiaomi-vayu-modem
+		firmware-xiaomi-vayu-ath10k
+		msm-modem
+		pd-mapper
+		tqftpserv
+		"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
+}
+
+phosh() {
+	install_if="$pkgname=$pkgver-r$pkgrel phosh"
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
+}
+
+sha512sums="
+a1b8f23248a60a6435d40209342d8409fc348d6986e7322152944dfc1b4b6c363ef2d05d096f3be4b1548f53e9bf1f09ece81697ee02cbc6f90b937c823bcb0b  deviceinfo
+eef80842915acfa8d8bcbd9ac9fcb057ad912d582e4a78b8ddd9774ef688971d2878b83f4a54adaa1d613dce8645a85ffb25e8a98c55e32a91dfe73002e91fe0  phoc.ini
+"
diff --git a/device/testing/device-xiaomi-vayu/device-xiaomi-vayu-nonfree-firmware.post-install b/device/testing/device-xiaomi-vayu/device-xiaomi-vayu-nonfree-firmware.post-install
new file mode 100644
index 000000000..70b9e0efe
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/device-xiaomi-vayu-nonfree-firmware.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+rc-update add tqftpserv boot
+rc-update add pd-mapper boot
diff --git a/device/testing/device-xiaomi-vayu/deviceinfo b/device/testing/device-xiaomi-vayu/deviceinfo
new file mode 100644
index 000000000..ca459a42c
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/deviceinfo
@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+deviceinfo_format_version="0"
+deviceinfo_name="Xiaomi POCO X3 Pro"
+deviceinfo_manufacturer="Xiaomi"
+deviceinfo_codename="xiaomi-vayu"
+deviceinfo_year="2021"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2400"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="qcom/sm8150-xiaomi-vayu"
+deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_pagesize="4096"
+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_rootfs_image_sector_size="4096"
diff --git a/device/testing/device-xiaomi-vayu/phoc.ini b/device/testing/device-xiaomi-vayu/phoc.ini
new file mode 100644
index 000000000..02d3d286b
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/phoc.ini
@@ -0,0 +1,9 @@
+# /etc/phosh/phoc.ini
+# Overwrites defaults in /usr/share/phosh/phoc.ini
+
+# Remove when DSI panel is working
+[output:Unknown-1]
+scale = 2.75
+
+#[output:DSI-1]
+#scale = 2.75