diff --git a/audio/lynx/audio-tables.mk b/audio/lynx/audio-tables.mk
index 7185bde..9d3f5ed 100644
--- a/audio/lynx/audio-tables.mk
+++ b/audio/lynx/audio-tables.mk
@@ -22,7 +22,8 @@ PRODUCT_COPY_FILES += \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
+    frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
 
 # AudioEffectHAL Configuration
 PRODUCT_COPY_FILES += \
diff --git a/device-lynx.mk b/device-lynx.mk
index b02d345..ba8eca7 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -22,8 +22,8 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk)
 
-include device/google/gs201/device-shipping-common.mk
 include device/google/lynx/audio/lynx/audio-tables.mk
+include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 
 $(call soong_config_set,lyric,tuning_product,cloudripper)
diff --git a/init.insmod.lynx.cfg b/init.insmod.lynx.cfg
index 82d59cf..8e5d9ec 100644
--- a/init.insmod.lynx.cfg
+++ b/init.insmod.lynx.cfg
@@ -7,8 +7,7 @@
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
 modprobe|snd-soc-cs35l41-spi.ko
-modprobe|ftm5.ko
-modprobe|sec_touch.ko
+modprobe|goodix_brl_touch.ko
 modprobe|input-cs40l26-i2c.ko
 
 # All device specific modules loaded