diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index d41e086..a599a3f 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -28,23 +28,31 @@ TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18"
 UART_USE_TERMIOS_AFC = true
 TARGET_USE_QTI_BT_IBS = false
 TARGET_USE_QTI_BT_OBS = false
-TARGET_USE_QTI_BT_SAR = true
+TARGET_USE_QTI_BT_SAR_V1_1 = true
 TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true
+
+# IBluetoothHci @1.1 / @1.0
 ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true)
    PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-impl-qti
 else
    PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-impl-qti
 endif
+# IBluetoothSar @1.1 / @1.0
+ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1),true)
+   PRODUCT_PACKAGES += hardware.google.bluetooth.sar@1.1-impl
+else ifeq ($(TARGET_USE_QTI_BT_SAR),true)
+   PRODUCT_PACKAGES += hardware.google.bluetooth.sar@1.0-impl
+endif
 PRODUCT_PACKAGES += \
 	android.hardware.bluetooth@1.0-service-qti \
-	hardware.google.bluetooth.sar@1.0-impl \
 	hardware.google.bluetooth.bt_channel_avoidance@1.0-impl
 
 # Bluetooth SAR test tools
-PRODUCT_PACKAGES_DEBUG += \
-	bluetooth_sar_test
+ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1)$(TARGET_USE_QTI_BT_SAR),true)
+   PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test
+endif
 
-# Bluetooth SoC, BDA in device tree, and WiPower
+# Bluetooth (Vendor) SoC, BDA in device tree, and WiPower
 PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.qcom.bluetooth.soc=hastings \
 	ro.vendor.bt.bdaddr_path=/proc/device-tree/chosen/config/bt_addr \
diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc
index ffaec61..ac7632a 100644
--- a/conf/init.lynx.rc
+++ b/conf/init.lynx.rc
@@ -38,6 +38,11 @@ on post-fs-data
     chown system system /dev/goodix_fp
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app
 
+# Allow secure_element group to read / write ST33 SPI state
+on post-fs-data
+    chown secure_element secure_element  /sys/class/st33spi/st33spi/st33spi_state
+    chmod 0660  /sys/class/st33spi/st33spi/st33spi_state
+
 # Wifi
 on property:sys.boot_completed=1
     write /sys/bus/platform/drivers/cnss2/qcom,cnss-qca6490/fs_ready 1
diff --git a/device-lynx.mk b/device-lynx.mk
index 4a0d2ae..5e7a3c6 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -186,5 +186,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
-	ro.bluetooth.leaudio_switcher.supported=true
-
+	ro.bluetooth.leaudio_switcher.supported=true \
+	bluetooth.profile.bap.broadcast.source.enabled=true \
+	bluetooth.profile.bap.broadcast.assist.enabled=true \
+	bluetooth.profile.bap.unicast.client.enabled=true \
+	bluetooth.profile.csip.set_coordinator.enabled=true \
+	bluetooth.profile.hap.client.enabled=true \
+	bluetooth.profile.mcp.server.enabled=true \
+	bluetooth.profile.ccp.server.enabled=true \
+	bluetooth.profile.vcp.controller.enabled=true