diff --git a/manifest.xml b/manifest.xml
index 945b4e7..17394e1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,22 +2,20 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>5.0</version>
+        <version>6.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@5.0::IDevicesFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>5.0</version>
+        <version>6.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@5.0::IEffectsFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.biometrics.face</name>
diff --git a/platform/product_packages.mk b/platform/product_packages.mk
index e628fe7..16071d1 100644
--- a/platform/product_packages.mk
+++ b/platform/product_packages.mk
@@ -1,7 +1,6 @@
 ### AUDIO
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl \
-    android.hardware.audio@5.0-impl \
+    android.hardware.audio@6.0-impl \
     android.hardware.audio@2.0-service
 
 PRODUCT_PACKAGES += \
@@ -15,8 +14,7 @@
     audio.usb.default
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio.effect@2.0-impl \
-    android.hardware.audio.effect@5.0-impl
+    android.hardware.audio.effect@6.0-impl
 
 ### BLUETOOTH
 PRODUCT_PACKAGES += \