diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
new file mode 100644
index 0000000..e139279
--- /dev/null
+++ b/bluetooth/qti_default.mk
@@ -0,0 +1,45 @@
+#
+# 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/lynx/bluetooth/manifest_bluetooth.xml
+
+BOARD_HAVE_BLUETOOTH_QCOM = true
+BOARD_USES_COMMON_BLUETOOTH_HAL = true
+QCOM_BLUETOOTH_USING_DIAG = false
+TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18"
+UART_USE_TERMIOS_AFC = true
+TARGET_USE_QTI_BT_OBS = true
+TARGET_USE_QTI_BT_SAR = true
+TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true
+PRODUCT_PACKAGES += \
+	android.hardware.bluetooth@1.0-service-qti \
+	android.hardware.bluetooth@1.0-impl-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
+
diff --git a/device-lynx.mk b/device-lynx.mk
index 59812b6..ee41f52 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -81,16 +81,8 @@ DEVICE_MANIFEST_FILE += \
 PRODUCT_COPY_FILES += \
 	device/google/lynx/thermal_info_config_lynx.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
-# Bluetooth HAL
-DEVICE_MANIFEST_FILE += \
-	device/google/lynx/bluetooth/manifest_bluetooth.xml
-PRODUCT_SOONG_NAMESPACES += \
-        vendor/broadcom/bluetooth
-PRODUCT_PACKAGES += \
-	android.hardware.bluetooth@1.1-service.bcmbtlinux \
-	bt_vendor.conf
-PRODUCT_COPY_FILES += \
-	device/google/lynx/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
+# Bluetooth HAL and Pixel extension
+include device/google/lynx/bluetooth/qti_default.mk
 
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@@ -122,10 +114,6 @@ PRODUCT_COPY_FILES += \
 # 	ro.hardware.keystore=software \
 # 	ro.hardware.gatekeeper=software
 
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 include device/google/gs101/fingerprint/udfps_common.mk