diff --git a/device/testing/device-xiaomi-vayu/APKBUILD b/device/testing/device-xiaomi-vayu/APKBUILD
index 6a585e720..b009f2768 100644
--- a/device/testing/device-xiaomi-vayu/APKBUILD
+++ b/device/testing/device-xiaomi-vayu/APKBUILD
@@ -2,13 +2,14 @@
 maintainer="Ali Nasrullayev <nesrullayev.ali@gmail.com>"
 pkgname=device-xiaomi-vayu
 pkgdesc="Xiaomi POCO X3 Pro"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	firmware-qcom-adreno-a640
 	firmware-xiaomi-vayu
 	linux-firmware-qca
@@ -27,6 +28,8 @@ subpackages="
 "
 source="
 	deviceinfo
+	HiFi.conf
+	vayu.conf
 "
 
 build() {
@@ -35,6 +38,12 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install	-Dm644 "$srcdir"/HiFi.conf -t \
+		"$pkgdir/usr/share/alsa/ucm2/Xiaomi/vayu/"
+
+	install	-Dm644 "$srcdir"/vayu.conf -c \
+		"$pkgdir/usr/share/alsa/ucm2/conf.d/sm8150/Xiaomi POCO X3 Pro.conf"
 }
 
 kernel_tianma() {
@@ -51,4 +60,6 @@ kernel_huaxing() {
 
 sha512sums="
 a199525d3edfaad447848a4042da89b8286ecd541d1fb89525598cdd6af3c0136e193a1f23c6411991ff00a31ed0399bd020b21a44605017f2d81f56d6ff2837  deviceinfo
+6965a2e744436a45f1655f1e925aac73236ed06e1a31c4f6f743409b0eb4ec5c38acca9bb742362fe0b3c8d7b3b2eae36914ff533b9a1c25874392ad09b11ac2  HiFi.conf
+2533bc96dca682b2b425ff208f8273a70c039abfb435267cffefce1b42be726f89005efb8cf266ce560185336532692de3d26a8d6c50877fa5ebc7818aba628d  vayu.conf
 "
diff --git a/device/testing/device-xiaomi-vayu/HiFi.conf b/device/testing/device-xiaomi-vayu/HiFi.conf
new file mode 100644
index 000000000..7027a8874
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/HiFi.conf
@@ -0,0 +1,73 @@
+# Use case configuration for Xiaomi POCO X3 Pro
+# Author: Ali Nasrullayev <nesrullayev.ali@gmail.com>
+#
+# Playback Devices
+#  - Earpiece            : TAS2564 driver : MultiMedia1 <-> QUAT_MI2S_RX
+#  - Internal Speakers   : TAS2562 driver : MultiMedia1 <-> QUAT_MI2S_RX
+# Capture Devices
+#  - Internal Bottom Mic : WCD934x driver : MultiMedia2 <-> SLIMBUS_0_TX (AIF1_CAP, ADC1, TX8)
+#  - Internal Top Mic   :  WCD934x driver : MultiMedia2 <-> SLIMBUS_0_TX (AIF2_CAP, ADC3, TX7)
+
+SectionVerb {
+    EnableSequence [
+        # Speaker + Earpiece Playback
+        cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
+        
+        # Internal Microphone Capture
+        cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 1"
+
+        cset "name='AIF1_CAP Mixer SLIM TX8' 1"
+        cset "name='CDC_IF TX8 MUX' DEC8"
+
+        cset "name='AIF1_CAP Mixer SLIM TX7' 1"
+        cset "name='CDC_IF TX7 MUX' DEC7"
+    ]
+
+    DisableSequence [
+        cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0"
+        cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 0"
+
+        cset "name='CDC_IF TX8 MUX' ZERO"
+        cset "name='CDC_IF TX7 MUX' ZERO"
+    ]
+
+    Value {
+        TQ "HiFi"
+    }
+}
+
+SectionDevice."Speaker" {
+    Comment "Primary Speaker Playback"
+
+    Value {
+        PlaybackPriority 200
+        PlaybackPCM "hw:${CardId},0"    # MultiMedia1
+        PlaybackChannels 2
+    }
+}
+
+SectionDevice."Mic" {
+    Comment "Internal Microphones"
+
+    EnableSequence [
+        cset "name='ADC MUX8' AMIC"
+        cset "name='AMIC MUX8' ADC1"
+
+        cset "name='ADC MUX7' AMIC"
+        cset "name='AMIC MUX7' ADC3"
+    ]
+
+    DisableSequence [
+        cset "name='ADC MUX8' ZERO"
+        cset "name='AMIC MUX8' ZERO"
+
+        cset "name='ADC MUX7' ZERO"
+        cset "name='AMIC MUX7' ZERO"
+    ]
+
+    Value {
+        CapturePriority 200
+        CapturePCM "hw:${CardId},1"    # MultiMedia2
+        CaptureChannels 2
+    }
+}
diff --git a/device/testing/device-xiaomi-vayu/vayu.conf b/device/testing/device-xiaomi-vayu/vayu.conf
new file mode 100644
index 000000000..069f3d7d4
--- /dev/null
+++ b/device/testing/device-xiaomi-vayu/vayu.conf
@@ -0,0 +1,9 @@
+# Use case configuration for Xiaomi POCO X3 Pro
+# Author: Ali Nasrullayev <nesrullayev.ali@gmail.com>
+
+Syntax 3
+
+SectionUseCase."HiFi" {
+    File "/Xiaomi/vayu/HiFi.conf"
+    Comment "HiFi quality Music."
+}