diff --git a/device/testing/device-xiaomi-surya/APKBUILD b/device/testing/device-xiaomi-surya/APKBUILD
index 43ada87ac..2cad7f5a6 100644
--- a/device/testing/device-xiaomi-surya/APKBUILD
+++ b/device/testing/device-xiaomi-surya/APKBUILD
@@ -1,11 +1,11 @@
-# Maintainer: David Wronek <w.david0@protonmail.com>
-# Co-Maintainer: Danila Tikhonov <JIaxyga@protonmail.com>
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <davidwronek@gmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
 
 pkgname=device-xiaomi-surya
 pkgdesc="Xiaomi POCO X3 NFC"
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -16,11 +16,12 @@ depends="
 	mkbootimg
 	postmarketos-base
 	postmarketos-update-kernel
+	soc-qcom-sm7150
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	phoc.ini
+	modules-initfs
 "
 
 subpackages="
@@ -40,29 +41,18 @@ nonfree_firmware() {
 	depends="
 		firmware-xiaomi-surya-adsp
 		firmware-xiaomi-surya-cdsp
+		firmware-xiaomi-surya-initramfs
 		firmware-xiaomi-surya-ipa
 		firmware-xiaomi-surya-modem
 		firmware-xiaomi-surya-touchscreen
 		firmware-xiaomi-surya-venus
 		firmware-xiaomi-surya-wlan
-		linux-firmware-ath10k
-		linux-firmware-qca
-		msm-modem
-		msm-modem-uim-selection
-		pd-mapper
-		tqftpserv
+		soc-qcom-sm7150-nonfree-firmware
 		"
-	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		-t "$subpkgdir"/etc/phosh
-}
-
 sha512sums="
-8fb0c1f3dbad1003b108bd7748a839f002c9c8caa3125148fb8818f5df540da81615428cbc5dfc28738d38460f3f1b4ec977c9f194447c0bc508bcd6a42f4276  deviceinfo
-9b306b47e8fcbf3bbc1401bb183fe0a1a1c59ac4afdabb2cf7f5c9e39f478841f74401a29df3572466efa5624a57809ee5e46d2342c5b0e42d86e2460b641d76  phoc.ini
+592930b6f0f1002cef77f88df36c7751362c188c3339167d8e28ed48bea9ed5a9e900fe52034db45ce7e11404f9baac02b171992a7b07b5c83fa2aed97b6c1e8  deviceinfo
+6d86b9211d4adf237ef2961f304655331287c186bba56b1af32185401b01b506949557ce6e70dc70e3c9997b4f5684c9f4cdfd11c79ccbc7a869147b6fb9bb53  modules-initfs
 "
diff --git a/device/testing/device-xiaomi-surya/device-xiaomi-surya-nonfree-firmware.post-install b/device/testing/device-xiaomi-surya/device-xiaomi-surya-nonfree-firmware.post-install
deleted file mode 100644
index 70b9e0efe..000000000
--- a/device/testing/device-xiaomi-surya/device-xiaomi-surya-nonfree-firmware.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/testing/device-xiaomi-surya/deviceinfo b/device/testing/device-xiaomi-surya/deviceinfo
index 59b8dbb69..06c1e3b99 100644
--- a/device/testing/device-xiaomi-surya/deviceinfo
+++ b/device/testing/device-xiaomi-surya/deviceinfo
@@ -22,7 +22,7 @@ deviceinfo_screen_height="2400"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
diff --git a/device/testing/device-xiaomi-surya/modules-initfs b/device/testing/device-xiaomi-surya/modules-initfs
new file mode 100644
index 000000000..3a52077dd
--- /dev/null
+++ b/device/testing/device-xiaomi-surya/modules-initfs
@@ -0,0 +1,2 @@
+gpi
+spi-geni-qcom
diff --git a/device/testing/device-xiaomi-surya/phoc.ini b/device/testing/device-xiaomi-surya/phoc.ini
deleted file mode 100644
index 5c8829980..000000000
--- a/device/testing/device-xiaomi-surya/phoc.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/phosh/phoc.ini
-# Overwrites defaults in /usr/share/phosh/phoc.ini
-
-[output:Unknown-1]
-scale = 2.75
diff --git a/device/testing/firmware-xiaomi-surya/30-touchscreen-firmware.files b/device/testing/firmware-xiaomi-surya/30-touchscreen-firmware.files
new file mode 100644
index 000000000..aa4c3d715
--- /dev/null
+++ b/device/testing/firmware-xiaomi-surya/30-touchscreen-firmware.files
@@ -0,0 +1,2 @@
+/lib/firmware/novatek_ts_huaxing_fw.bin
+/lib/firmware/novatek_ts_tianma_fw.bin
diff --git a/device/testing/firmware-xiaomi-surya/APKBUILD b/device/testing/firmware-xiaomi-surya/APKBUILD
index 487e267dd..f0d3f36e2 100644
--- a/device/testing/firmware-xiaomi-surya/APKBUILD
+++ b/device/testing/firmware-xiaomi-surya/APKBUILD
@@ -5,6 +5,7 @@ pkgdesc="Firmware for Xiaomi POCO X3 NFC"
 subpackages="
 	$pkgname-adsp
 	$pkgname-cdsp
+	$pkgname-initramfs
 	$pkgname-ipa
 	$pkgname-modem
 	$pkgname-touchscreen
@@ -15,7 +16,10 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 _commit="3d76e775502966ac4aa9d6e563a71d7442152f1b"
-source="$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz"
+source="
+	$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz
+	30-touchscreen-firmware.files
+"
 builddir="$srcdir/$pkgname-$_commit"
 
 package() {
@@ -37,6 +41,13 @@ cdsp() {
 		"$subpkgdir/lib/firmware/qcom/sm7150/surya"
 }
 
+initramfs() {
+	pkgdesc="Xiaomi POCO X3 NFC firmware to be included in the initramfs"
+
+	install -Dm644 "$srcdir/30-touchscreen-firmware.files" \
+		"$subpkgdir/usr/share/mkinitfs/files/30-touchscreen-firmware.files"
+}
+
 ipa() {
 	pkgdesc="Xiaomi POCO X3 NFC ipa firmware"
 
@@ -78,4 +89,5 @@ wlan() {
 
 sha512sums="
 769bcbabc12919f2fd8b9f6c4f23a236ba1835eb4cedef9072652321ee145995eff4f8b7b34a7875de9d26b9cdd9e7ccbcc1063cbc8eeb2b3ca3fbe3d0affad5  firmware-xiaomi-surya-3d76e775502966ac4aa9d6e563a71d7442152f1b.tar.gz
+da17c49b62a6320a868e34c5ebbbfdecbf80eed714e8a87daacfc5eb8a1d3dd171e13af0d1f7a8ccb6ebf0a6d859a1c3b8173bbe791ce78fadd7b6d1579ec472  30-touchscreen-firmware.files
 "