diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3633cbc..08fed70 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -39,6 +39,9 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a75
 
+# Audio
+$(call soong_config_set, android_hardware_audio, run_64bit, true)
+
 # Boot control
 $(call soong_config_set, ufsbsg, ufsframework, bsg)
 
diff --git a/common.mk b/common.mk
index b70122f..cc58d8b 100644
--- a/common.mk
+++ b/common.mk
@@ -55,7 +55,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.audio@7.0-impl \
     android.hardware.audio.effect@7.0-impl \
-    android.hardware.audio.service_64 \
+    android.hardware.audio.service \
     android.hardware.soundtrigger@2.3-impl
 
 PRODUCT_COPY_FILES += \