diff --git a/device.mk b/device.mk
index 37007e9..f89c5df 100644
--- a/device.mk
+++ b/device.mk
@@ -156,12 +156,12 @@
 
 # Audio
 PRODUCT_PACKAGES += \
-	android.hardware.audio@6.0 \
-	android.hardware.audio.common@6.0 \
-	android.hardware.audio.common@6.0-util \
-	android.hardware.audio@6.0-impl \
-	android.hardware.audio.effect@6.0 \
-	android.hardware.audio.effect@6.0-impl \
+	android.hardware.audio@7.0 \
+	android.hardware.audio.common@7.0 \
+	android.hardware.audio.common@7.0-util \
+	android.hardware.audio@7.0-impl \
+	android.hardware.audio.effect@7.0 \
+	android.hardware.audio.effect@7.0-impl \
 	android.hardware.audio.service \
 	android.hardware.soundtrigger@2.1-impl \
 	audio.a2dp.default \
@@ -207,9 +207,9 @@
 
 # Audio config files
 PRODUCT_COPY_FILES += \
-	frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+	frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \
 	frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-	frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
+	frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \
 	frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
 	frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
 	frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml