diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index f7ee8af..4c0888b 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -9,11 +9,6 @@
       <transport>hwbinder</transport>
       <fqname>@7.0::IEffectsFactory/default</fqname>
    </hal>
-   <hal format="hidl">
-      <name>android.hardware.bluetooth.audio</name>
-      <transport>hwbinder</transport>
-      <fqname>@2.1::IBluetoothAudioProvidersFactory/default</fqname>
-   </hal>
    <hal format="hidl">
       <name>android.hardware.bluetooth</name>
       <transport>hwbinder</transport>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 092af3b..669e8e9 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -26,7 +26,7 @@ PRODUCT_PACKAGES += \
 
 # Audio (BT)
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth.audio@2.1-impl \
+    android.hardware.bluetooth.audio-impl \
     audio.bluetooth.default
 
 # Audio Configs