diff --git a/BoardConfig.mk b/BoardConfig.mk
index bea7fa2..a068149 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,7 +73,8 @@ BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
 
 # Kernel
 BOARD_KERNEL_CMDLINE := \
-    # ignore_loglevel \
+    printk.devkmsg=on \
+    ignore_loglevel \
     debug \
     androidboot.hardware=qcom \
     androidboot.memcg=1 \
diff --git a/device.mk b/device.mk
index 3f3035f..23af2eb 100644
--- a/device.mk
+++ b/device.mk
@@ -45,24 +45,18 @@ PRODUCT_PACKAGES += \
     tinyplay
 
 PRODUCT_PACKAGES += \
-    libsoundtrigger \
-    vendor.qti.hardware.pal@1.0-impl \
     android.hardware.audio@7.1-impl.samsung-sm8650 \
     android.hardware.audio.effect@7.0-impl \
     android.hardware.audio.service \
-    android.hardware.audio.service_64 \
-    pm-proxy \
-    secaudiohalaidl \
     android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.3-impl \
     audio.bluetooth.default \
     audio.r_submix.default \
     audio.usb.default \
-    libagmmixer \
+    audioadsprpcd \
     libagm_compress_plugin \
     libagm_mixer_plugin \
     libagm_pcm_plugin \
-    libaudiochargerlistener \
     libbatterylistener \
     libfmpal \
     libhfp_pal \
@@ -70,10 +64,8 @@ PRODUCT_PACKAGES += \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libsndcardparser \
-    libtinycompress \
     libvolumelistener \
-    sound_trigger.primary.pineapple \
-    vendor.qti.hardware.AGMIPC@1.0-impl
+    sound_trigger.primary.pineapple
 
 AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal
 AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal
@@ -96,6 +88,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
 
 # Bluetooth
+PRODUCT_PACKAGES += \
+    lib_bt_aptx \
+    lib_bt_ble \
+    lib_bt_bundle
+
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
@@ -110,6 +107,9 @@ PRODUCT_PACKAGES += \
 TARGET_SCREEN_HEIGHT := 3120
 TARGET_SCREEN_WIDTH := 1440
 
+# Bootloader
+TARGET_BOOTLOADER_BOARD_NAME := pineapple
+
 # Camera
 PRODUCT_PACKAGES += \
     android.hardware.graphics.common-V4-ndk.vendor \
@@ -144,7 +144,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.display.composer-service \
     vendor.qti.hardware.display.composer-service.rc \
     vendor.qti.hardware.display.composer-service.xml \
-    vendor.qti.hardware.display.config-V2-ndk.vendor \
     vendor.qti.hardware.display.demura-service
 
 PRODUCT_COPY_FILES += \
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 6eaedf7..43899aa 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -156,7 +156,7 @@ on early-boot
     verity_update_state
 
 on boot
-    write /dev/cpuset/audio-app/cpus 0-1
+    write /dev/cpuset/audio-app/cpus 1-2
     # Add a cpuset for the camera daemon
     # We want all cores for camera
     mkdir /dev/cpuset/camera-daemon
@@ -214,6 +214,19 @@ on charger
 #   group system wakelock
 #   capabilities BLOCK_SUSPEND
 
+service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service
+    override
+    class hal
+    user audioserver
+    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
+    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct oem_2901 wakelock oem_2912
+    capabilities BLOCK_SUSPEND SYS_NICE
+    # setting RLIMIT_RTPRIO allows binder RT priority inheritance
+    rlimit rtprio 10 10
+    ioprio rt 4
+    task_profiles ProcessCapacityHigh HighPerformance
+    onrestart restart audioserver
+
 #pd-mapper
 service vendor.pd_mapper /vendor/bin/pd-mapper
     class core