diff --git a/Android.bp b/Android.bp
index 56f3398..c756fe7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6,6 +6,13 @@
 soong_namespace {
 }
 
+install_symlink {
+    name: "acdbdata_adsp_avs_config.bin_symlink",
+    device_specific: true,
+    installed_location: "etc/acdbdata/adsp_avs_config.acdb",
+    symlink_target: "/vendor/etc/acdbdata/adsp_avs_config.acdb",
+}
+
 install_symlink {
     name: "firmware_wlan_mac.bin_symlink",
     vendor: true,
diff --git a/Android.mk b/Android.mk
index fa558dc..47f76fd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,11 +30,4 @@ $(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
 
-ACDBDATA_SYMLINKS := $(TARGET_OUT_ODM)/etc/acdbdata
-$(ACDBDATA_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating acdbdata symlinks: $@"
-	@mkdir -p $@
-	$(hide) ln -sf /vendor/etc/acdbdata/adsp_avs_config.acdb $@/adsp_avs_config.acdb
-
-ALL_DEFAULT_INSTALLED_MODULES += $(ACDBDATA_SYMLINKS)
 endif
diff --git a/device.mk b/device.mk
index 590008e..65608f3 100644
--- a/device.mk
+++ b/device.mk
@@ -74,6 +74,7 @@ PRODUCT_PACKAGES += \
 
 # Audio
 PRODUCT_PACKAGES += \
+    acdbdata_adsp_avs_config.bin_symlink \
     android.hardware.audio@6.0-impl \
     android.hardware.audio.effect@6.0-impl \
     android.hardware.audio.service \