diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 381a7a1..8223607 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -115,6 +115,7 @@
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" backend="speaker-and-bt-a2dp" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" interface="QUAT_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" interface="QUAT_MI2S_RX"/>
     </backend_names>
diff --git a/audio/mixer_paths_overlay_static.xml b/audio/mixer_paths_overlay_static.xml
index 06a44ad..213f221 100644
--- a/audio/mixer_paths_overlay_static.xml
+++ b/audio/mixer_paths_overlay_static.xml
@@ -14,10 +14,13 @@
     <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="0" />
     <ctl name="ADC3 Volume" value="12" />
     <ctl name="ADC4 Volume" value="12" />
-    <ctl name="Configuration" value="2" />
+    <ctl name="Configuration" value="10" />
     <ctl name="QUAT_MI2S_RX Channels" value="One" />
-    <ctl name="QUAT_MI2S_TX Channels" value="One" />
+    <ctl name="QUAT_MI2S_RX Format" value="S24_LE" />
     <ctl name="QUAT_MI2S_RX SampleRate" value="KHZ_48" />
+    <ctl name="QUAT_MI2S_TX Channels" value="One" />
+    <ctl name="QUAT_MI2S_TX Format" value="S24_LE" />
+    <ctl name="QUAT_MI2S_TX SampleRate" value="KHZ_48" />
     <ctl name="External AMIC2 Mux" value="Dual_ADC" />
     <ctl name="COMP1 Switch" value="0" />
     <ctl name="COMP2 Switch" value="0" />
@@ -401,7 +404,6 @@
         <ctl name="Ultrasound Enable" value="On"/>
         <ctl name="Ultrasound Mode" value="625"/>
     </path>
-
     <path name="ultrasound-output">
         <ctl name="Ultrasound Enable" value="On" />
         <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
@@ -410,7 +412,6 @@
         <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
         <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
     </path>
-
     <path name="ultrasound-input">
         <ctl name="AIF2_CAP Mixer SLIM TX4" value="1" />
         <ctl name="CDC_IF TX4 MUX" value="DEC4" />
@@ -418,9 +419,8 @@
         <ctl name="AMIC MUX4" value="ADC1" />
         <ctl name="ADC1 Volume" value="12" />
     </path>
-
     <path name="speaker">
-        <ctl name="Configuration" value="2" />
+        <ctl name="Configuration" value="10" />
     </path>
 
     <path name="speaker-protected">
@@ -428,10 +428,10 @@
     </path>
 
     <path name="voice-speaker">
-        <ctl name="Configuration" value="1" />
+        <ctl name="Configuration" value="9" />
     </path>
     <path name="voice-speaker-protected">
-        <ctl name="Configuration" value="1" />
+        <ctl name="Configuration" value="9" />
     </path>
 
     <path name="handset">
@@ -456,7 +456,6 @@
         <ctl name="ADC3 Volume" value="5" />
         <ctl name="ADC1 Volume" value="5" />
     </path>
-
     <path name="speaker-mic">
         <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
         <ctl name="SLIM_0_TX Channels" value="One" />
@@ -465,7 +464,6 @@
         <ctl name="AMIC MUX6" value="ADC1" />
         <ctl name="ADC1 Volume" value="5" />
     </path>
-
     <!-- Dual MIC devices -->
     <path name="handset-dmic-endfire">
         <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
@@ -494,13 +492,11 @@
 
     <path name="sidetone-headphones">
     </path>
-
     <path name="voice-headphones">
         <path name="headphones" />
         <ctl name="HPHL Volume" value="23" />
         <ctl name="HPHR Volume" value="23" />
     </path>
-
     <path name="camcorder-dmic">
         <path name="handset-dmic-dual-adc" />
     </path>
diff --git a/audio/sound_trigger_mixer_paths_wcd9340.xml b/audio/sound_trigger_mixer_paths_wcd9340.xml
index b368a3f..175d800 100644
--- a/audio/sound_trigger_mixer_paths_wcd9340.xml
+++ b/audio/sound_trigger_mixer_paths_wcd9340.xml
@@ -369,7 +369,7 @@
     <path name="echo-reference">
         <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX"/>
         <ctl name="EC Reference Channels" value="One"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
+        <ctl name="EC Reference Bit Format" value="S24_LE"/>
         <ctl name="EC Reference SampleRate" value="48000"/>
     </path>
 
diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
index 6e664a5..e54e8cd 100644
--- a/audio/sound_trigger_platform_info.xml
+++ b/audio/sound_trigger_platform_info.xml
@@ -101,7 +101,7 @@
         </arm_ss_usecase>
         <gcs_usecase>
             <param uid="0x1" />
-            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />
+            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE, DEVICE_HEADSET_MIC_CPE" />
             <!-- module_id, instance_id, param_id -->
             <param load_sound_model_ids="0x00012C0D, 0x2, 0x00012C14" />
             <param confidence_levels_ids="0x00012C0D, 0x2, 0x00012C28" />
@@ -176,7 +176,7 @@
         <param wdsp_fluence_type="NONE" />
         <gcs_usecase>
             <param uid="0x3" />
-            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />
+            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE" />
             <param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />
             <param confidence_levels_ids="0x18000001, 0x4, 0x00012C28" />
             <param detection_event_ids="0x18000001, 0x4, 0x00012C29" />