diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 6496ad0..bb3ab52 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
 include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk
 
 $(call soong_config_set,google3a_config,target_device,bluejay)
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 079bd7b..7c70b6e 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -309,5 +309,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Bluejay: 0x4108
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20488
+    bluetooth.device_id.product_id=16648