diff --git a/device-oriole.mk b/device-oriole.mk
index 10048c9..95cc084 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -345,8 +345,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Oriole: 0x4106
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20486
+    bluetooth.device_id.product_id=16646
 
 # ETM
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
diff --git a/device-raven.mk b/device-raven.mk
index 8b790d9..4ceb39e 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -355,8 +355,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Raven: 0x4107
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20487
+    bluetooth.device_id.product_id=16647
 
 # ETM
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 00a9a28..d77c0ef 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101-sepolicy/oriole-sepolicy.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/oriole/proprietary/BoardConfigVendor.mk
 
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 783511a..3d474b6 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101-sepolicy/raven-sepolicy.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/raven/proprietary/BoardConfigVendor.mk
 
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 82425d2..2224d56 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 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
diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk
index 5b5a07a..27f7c98 100644
--- a/whitefin/BoardConfig.mk
+++ b/whitefin/BoardConfig.mk
@@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 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