diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index b6a5668..fa9b887 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -2,7 +2,7 @@
    <hal format="hidl">
       <name>android.hardware.audio</name>
       <transport>hwbinder</transport>
-      <fqname>@7.0::IDevicesFactory/default</fqname>
+      <fqname>@7.1::IDevicesFactory/default</fqname>
    </hal>
    <hal format="hidl">
       <name>android.hardware.audio.effect</name>
@@ -12,7 +12,7 @@
    <hal format="hidl">
       <name>android.hardware.bluetooth.audio</name>
       <transport>hwbinder</transport>
-      <fqname>@2.1::IBluetoothAudioProvidersFactory/default</fqname>
+      <fqname>@2.2::IBluetoothAudioProvidersFactory/default</fqname>
    </hal>
    <hal format="hidl">
       <name>android.hardware.bluetooth</name>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 1279f4a..5e811ed 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -17,7 +17,7 @@ PRODUCT_ENFORCE_RRO_TARGETS := framework-res SystemUI Bluetooth
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := # leave it empty
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@7.0-impl \
+    android.hardware.audio@7.1-impl \
     android.hardware.audio.service \
     android.hardware.audio.effect@7.0-impl \
     libtinycompress \
@@ -27,7 +27,7 @@ PRODUCT_PACKAGES += \
 
 # Audio (BT)
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth.audio@2.1-impl \
+    android.hardware.bluetooth.audio@2.2-impl \
     audio.bluetooth.default \
     audio.a2dp.default