diff --git a/BoardConfig.mk b/BoardConfig.mk
index e66b022..6443d07 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -51,6 +51,9 @@ AUDIO_FEATURE_ENABLED_HDMI_SPK := true
 AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 
+BOARD_SUPPORTS_SOUND_TRIGGER := true
+BOARD_USES_ALSA_AUDIO := true
+
 USE_CUSTOM_AUDIO_POLICY := 1
 USE_XML_AUDIO_POLICY_CONF := 1
 
diff --git a/device.mk b/device.mk
index c39218a..fadba6e 100644
--- a/device.mk
+++ b/device.mk
@@ -43,13 +43,19 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     audio.a2dp.default \
     audio.bluetooth.default \
+    audio.primary.sm6150 \
     audio.usb.default \
     audio.r_submix.default
 
 PRODUCT_PACKAGES += \
+    liba2dpoffload \
+    libhdmiedid \
+    libhfp \
     libqcompostprocbundle \
     libqcomvisualizer \
     libqcomvoiceprocessing \
+    libsndmonitor \
+    libspkrprot \
     libvolumelistener
 
 PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3ff48b5..25d58fd 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -50,34 +50,18 @@ vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
 vendor/lib64/com.qualcomm.qti.ant@1.0.so
 
 # Audio libraries
-vendor/lib/liba2dpoffload.so
 vendor/lib/libacdb-fts.so
 vendor/lib/libacdbloader.so
 vendor/lib/libacdbrtac.so
 vendor/lib/libadiertac.so
 vendor/lib/libadm.so
-vendor/lib/libadpcmdec.so
-vendor/lib/libarbitrarybytes.so
 vendor/lib/libaudcal.so
 vendor/lib/libaudioconfigstore.so
-vendor/lib/libaudio_log_utils.so
-vendor/lib/libaudioparsers.so
-vendor/lib/libaudioroute_ext.so
-vendor/lib/libbatterylistener.so
-vendor/lib/libcomprcapture.so
-vendor/lib/libdrc.so
-vendor/lib/libexthwplugin.so
 vendor/lib/libgcs-calwrapper.so
 vendor/lib/libgcs-ipc.so
 vendor/lib/libgcs-osal.so
 vendor/lib/libgcs.so
-vendor/lib/libhdmiedid.so
-vendor/lib/libhdmipassthru.so
-vendor/lib/libhfp.so
 vendor/lib/libqtigef.so
-vendor/lib/libsndmonitor.so
-vendor/lib/libspkrprot.so
-vendor/lib/libsurround_3mic_proc.so
 vendor/lib/soundfx/libasphere.so
 
 # Audio ACDB
@@ -95,9 +79,6 @@ vendor/etc/acdbdata/Forte/Forte_workspaceFile.qwsp
 # Audio firmware
 vendor/firmware/tfa98xx.cnt
 
-# Audio HAL
-vendor/lib/hw/audio.primary.sm6150.so
-
 # Bluetooth
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
diff --git a/vendor.prop b/vendor.prop
index e2f9cf6..a88091a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -39,7 +39,7 @@ vendor.audio.feature.ext_hw_plugin.enable=false
 vendor.audio.feature.fluence.enable=true
 vendor.audio.feature.fm.enable=true
 vendor.audio.feature.hdmi_edid.enable=true
-vendor.audio.feature.hdmi_passthrough.enable=true
+vendor.audio.feature.hdmi_passthrough.enable=false
 vendor.audio.feature.hfp.enable=true
 vendor.audio.feature.hifi_audio.enable=false
 vendor.audio.feature.hwdep_cal.enable=false
@@ -53,7 +53,7 @@ vendor.audio.feature.record_play_concurency.enable=false
 vendor.audio.feature.snd_mon.enable=true
 vendor.audio.feature.spkr_prot.enable=true
 vendor.audio.feature.src_trkn.enable=true
-vendor.audio.feature.ssrec.enable=true
+vendor.audio.feature.ssrec.enable=false
 vendor.audio.feature.usb_offload_burst_mode.enable=true
 vendor.audio.feature.usb_offload.enable=true
 vendor.audio.feature.usb_offload_sidetone_volume.enable=false