diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index b19c26e3f8cf5fd8872f19c800ae0cbed58e79c5..5c2a7db41745abf9aaf9725c5800af26d0c6e88d 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -104,7 +104,11 @@
                 </devicePort>
                 <devicePort tagName="Dock Headset" type="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_ALL_SCO" role="sink">
+                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
+                </devicePort>
+                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
                 </devicePort>
                 <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
@@ -143,6 +147,10 @@
                        sources="primary output,deep_buffer,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep_buffer,compressed_offload"/>
+                <route type="mix" sink="BT SCO Headset"
+                       sources="primary output,deep_buffer,compressed_offload"/>
+                <route type="mix" sink="BT SCO Car Kit"
+                       sources="primary output,deep_buffer,compressed_offload"/>
                 <route type="mix" sink="HDMI Out"
                        sources="primary output,deep_buffer,compressed_offload"/>
                 <route type="mix" sink="Telephony Tx"