diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
deleted file mode 100644
index 9c44fe0..0000000
--- a/bluetooth/bt_vendor_overlay.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is BTBCM HAL overlay configuration file.
-
-# Uart port name
-UartPort = /dev/ttySAC18
diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
deleted file mode 100644
index a0a4971..0000000
--- a/bluetooth/qti_default.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2021 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Bluetooth HAL and Pixel extension
-DEVICE_MANIFEST_FILE += \
-	device/google/tangorpro/bluetooth/manifest_bluetooth.xml
-
-BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/bluetooth
-
-BOARD_HAVE_BLUETOOTH_QCOM = true
-BOARD_USES_COMMON_BLUETOOTH_HAL = true
-QCOM_BLUETOOTH_USING_DIAG = false
-TARGET_BLUETOOTH_HCI_V1_1 = true
-TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18"
-UART_USE_TERMIOS_AFC = true
-TARGET_USE_QTI_BT_IBS = false
-TARGET_USE_QTI_BT_OBS = true
-TARGET_USE_QTI_BT_SAR = true
-TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true
-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
-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
-
-# Bluetooth 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 \
-	ro.vendor.bluetooth.emb_wp_mode=false \
-	ro.vendor.bluetooth.wipower=false
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.bluetooth.a2dp_offload.supported=true \
-    persist.bluetooth.a2dp_offload.disabled=true \
-    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
new file mode 100644
index 0000000..d2e9fcd
--- /dev/null
+++ b/bluetooth/syna_default.mk
@@ -0,0 +1,32 @@
+
+#
+# Copyright (C) 2022 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Bluetooth HAL and Pixel extension
+DEVICE_MANIFEST_FILE += \
+       device/google/tangorpro/bluetooth/manifest_bluetooth.xml
+BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/bluetooth
+PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux
+# Bluetooth SAR test tools
+PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test
+# default BDADDR for EVB only
+PRODUCT_PROPERTY_OVERRIDES += \
+       ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.bluetooth.a2dp_offload.supported=true \
+    persist.bluetooth.a2dp_offload.disabled=false \
+    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.uart.port="/dev/ttySAC18"
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index c7d97e9..a322990 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -96,7 +96,7 @@ PRODUCT_COPY_FILES += \
 	device/google/tangorpro/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 
 # Bluetooth HAL and Pixel extension
-include device/google/tangorpro/bluetooth/qti_default.mk
+include device/google/tangorpro/bluetooth/syna_default.mk
 
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service