diff --git a/ucm2/Qualcomm/qcm6490/QCM6490-IDP/HiFi.conf b/ucm2/Qualcomm/qcm6490/QCM6490-IDP/HiFi.conf
new file mode 100644
index 00000000..0d6497ed
--- /dev/null
+++ b/ucm2/Qualcomm/qcm6490/QCM6490-IDP/HiFi.conf
@@ -0,0 +1,77 @@
+SectionVerb {
+	Value {
+		TQ "HiFi"
+	}
+	EnableSequence [
+		cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MULTIMEDIA0' 1"
+		cset "name='MULTIMEDIA1 Audio Mixer VA_CODEC_DMA_TX_0' 1"
+		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MULTIMEDIA2' 1"
+		cset "name='MULTIMEDIA3 Audio Mixer TX_CODEC_DMA_TX_3' 1"
+	]
+
+	Include.wsae.File "/codecs/wsa883x/DefaultEnableSeq.conf"
+}
+
+SectionDevice."Speaker" {
+	Comment "Speaker playback"
+
+	Include.wsamspke.File "/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf"
+	Include.wsamspkd.File "/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf"
+	Include.wsaspke.File "/codecs/wsa883x/SpeakerEnableSeq.conf"
+	Include.wsaspkd.File "/codecs/wsa883x/SpeakerDisableSeq.conf"
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},0"
+		PlaybackMixer "default:${CardId}"
+		PlaybackMixerElem "Speakers"
+	}
+}
+
+SectionDevice."Mic1" {
+	Comment "Internal Mic"
+
+	Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
+	Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"
+	Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf"
+	Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf"
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId},1"
+	}
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones playback"
+
+	Include.wcdhpe.File "/codecs/wcd937x/HeadphoneEnableSeq.conf"
+	Include.wcdhpd.File "/codecs/wcd937x/HeadphoneDisableSeq.conf"
+	Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
+	Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
+
+	Value {
+		PlaybackPriority 200
+		PlaybackPCM "hw:${CardId},2"
+		PlaybackMixerElem "HP"
+		JackControl "Headphone Jack"
+		JackHWMute "Speaker"
+	}
+}
+
+SectionDevice."Mic2" {
+	Comment "Headphone Microphone"
+
+	Include.wcdmice.File "/codecs/wcd937x/HeadphoneMicEnableSeq.conf"
+	Include.wcdmicd.File "/codecs/wcd937x/HeadphoneMicDisableSeq.conf"
+	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf"
+	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf"
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId},3"
+		CaptureMixerElem "ADC2"
+		JackControl "Mic Jack"
+		JackHWMute "DMic01"
+	}
+}
diff --git a/ucm2/Qualcomm/qcm6490/QCM6490-IDP/QCM6490-IDP.conf b/ucm2/Qualcomm/qcm6490/QCM6490-IDP/QCM6490-IDP.conf
new file mode 100644
index 00000000..34633b88
--- /dev/null
+++ b/ucm2/Qualcomm/qcm6490/QCM6490-IDP/QCM6490-IDP.conf
@@ -0,0 +1,19 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/qcm6490/QCM6490-IDP/HiFi.conf"
+	Comment "HiFi quality Music"
+}
+
+BootSequence [
+	cset "name='HPHL Volume' 20"
+	cset "name='HPHR Volume' 20"
+	cset "name='ADC2 Volume' 10"
+]
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.wcd-init.File "/codecs/wcd937x/init.conf"
+Include.wsa-init.File "/codecs/wsa883x/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/init.conf"
+Include.rxm-init.File "/codecs/qcom-lpass/rx-macro/init.conf"
diff --git a/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/HiFi.conf b/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/HiFi.conf
new file mode 100644
index 00000000..954dbfa0
--- /dev/null
+++ b/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/HiFi.conf
@@ -0,0 +1,41 @@
+SectionVerb {
+	Value {
+		TQ "HiFi"
+	}
+	EnableSequence [
+		cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MULTIMEDIA0' 1"
+		cset "name='MULTIMEDIA1 Audio Mixer VA_CODEC_DMA_TX_0' 1"
+	]
+
+	Include.wsae.File "/codecs/wsa883x/DefaultEnableSeq.conf"
+}
+
+SectionDevice."Speaker" {
+	Comment "Speaker playback"
+
+	Include.wsamspke.File "/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf"
+	Include.wsamspkd.File "/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf"
+	Include.wsaspke.File "/codecs/wsa883x/SpeakerEnableSeq.conf"
+	Include.wsaspkd.File "/codecs/wsa883x/SpeakerDisableSeq.conf"
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},0"
+		PlaybackMixer "default:${CardId}"
+		PlaybackMixerElem "Speakers"
+	}
+}
+
+SectionDevice."Mic1" {
+	Comment "internal Mic"
+
+	Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
+	Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"
+	Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf"
+	Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf"
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId},1"
+	}
+}
diff --git a/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/QCS6490-RB3Gen2.conf b/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/QCS6490-RB3Gen2.conf
new file mode 100644
index 00000000..ff9f3db1
--- /dev/null
+++ b/ucm2/Qualcomm/qcs6490/QCS6490-RB3Gen2/QCS6490-RB3Gen2.conf
@@ -0,0 +1,11 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/qcs6490/QCS6490-RB3Gen2/HiFi.conf"
+	Comment "HiFi quality Music"
+}
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.wsa-init.File "/codecs/wsa883x/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/init.conf"
diff --git a/ucm2/conf.d/qcm6490/QCM6490-IDP.conf b/ucm2/conf.d/qcm6490/QCM6490-IDP.conf
new file mode 100644
index 00000000..4fce437f
--- /dev/null
+++ b/ucm2/conf.d/qcm6490/QCM6490-IDP.conf
@@ -0,0 +1,6 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/qcm6490/QCM6490-IDP/HiFi.conf"
+	Comment "HiFi quality Music."
+}
diff --git a/ucm2/conf.d/qcs6490/QCS6490-RB3Gen2.conf b/ucm2/conf.d/qcs6490/QCS6490-RB3Gen2.conf
new file mode 100644
index 00000000..f3f299d6
--- /dev/null
+++ b/ucm2/conf.d/qcs6490/QCS6490-RB3Gen2.conf
@@ -0,0 +1,6 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/qcs6490/QCS6490-RB3Gen2/HiFi.conf"
+	Comment "HiFi quality Music."
+}