diff --git a/configs/component-overrides_qti.xml b/configs/component-overrides_qti.xml
index c684db5..545a0f1 100644
--- a/configs/component-overrides_qti.xml
+++ b/configs/component-overrides_qti.xml
@@ -15,7 +15,12 @@
 -->
 <config>
     <component-override package="com.android.bluetooth" >
+        <component class=".a2dpsink.A2dpSinkService" enabled="true" />
+        <component class=".avrcp.AvrcpTargetService" enabled="false" />
         <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
+        <component class=".ba.BATService" enabled="true" />
+        <component class=".hfpclient.HeadsetClientService" enabled="false" />
         <component class=".hid.HidDeviceService" enabled="true" />
+        <component class=".hid.HidHostService" enabled="true" />
     </component-override>
 </config>