diff --git a/device-cheetah.mk b/device-cheetah.mk
index b9c4ebc..fba3e1a 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
 include device/google/pantah/audio/cheetah/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),)
@@ -145,7 +145,6 @@ DEVICE_MANIFEST_FILE += \
 PRODUCT_SOONG_NAMESPACES += \
         vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
-	android.hardware.bluetooth@1.1-service.bcmbtlinux \
 	bt_vendor.conf
 PRODUCT_COPY_FILES += \
 	device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index d90c4af..6eeaddd 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/cloudripper/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,cloudripper)
@@ -99,7 +99,6 @@ DEVICE_MANIFEST_FILE += \
 PRODUCT_SOONG_NAMESPACES += \
         vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
-	android.hardware.bluetooth@1.1-service.bcmbtlinux \
 	bt_vendor.conf
 PRODUCT_COPY_FILES += \
 	device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
diff --git a/device-panther.mk b/device-panther.mk
index 027d843..5684383 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
 include device/google/pantah/audio/panther/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,panther)
@@ -128,7 +128,6 @@ DEVICE_MANIFEST_FILE += \
 PRODUCT_SOONG_NAMESPACES += \
         vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
-	android.hardware.bluetooth@1.1-service.bcmbtlinux \
 	bt_vendor.conf
 PRODUCT_COPY_FILES += \
 	device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 27a1cdd..3b63de3 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/ravenclaw/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
-include device/google/gs101/bluetooth/bluetooth.mk
+include device/google/gs-common/bcmbt/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),)
@@ -97,7 +97,6 @@ DEVICE_MANIFEST_FILE += \
 PRODUCT_SOONG_NAMESPACES += \
         vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
-	android.hardware.bluetooth@1.1-service.bcmbtlinux \
 	bt_vendor.conf
 PRODUCT_COPY_FILES += \
 	device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 0373e04..8c69eff 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -145,7 +145,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
-[HAL]minimum_system_offset_uwbtime0=500
+[HAL]minimum_system_offset_uwbtime0=120
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
diff --git a/uwb/UWB-calibration_ce.conf b/uwb/UWB-calibration_ce.conf
index d1c1ef5..81a487c 100644
--- a/uwb/UWB-calibration_ce.conf
+++ b/uwb/UWB-calibration_ce.conf
@@ -145,7 +145,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
-[HAL]minimum_system_offset_uwbtime0=500
+[HAL]minimum_system_offset_uwbtime0=120
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
diff --git a/uwb/UWB-calibration_fcc.conf b/uwb/UWB-calibration_fcc.conf
index 695e076..3211ced 100644
--- a/uwb/UWB-calibration_fcc.conf
+++ b/uwb/UWB-calibration_fcc.conf
@@ -145,7 +145,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
-[HAL]minimum_system_offset_uwbtime0=500
+[HAL]minimum_system_offset_uwbtime0=120
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500