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))