diff --git a/device-caiman.mk b/device-caiman.mk
index 9def00d9..6894fd6b 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -485,8 +485,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Caiman: 0x4110
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20496
+    bluetooth.device_id.product_id=16656
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 4496f6e0..20ff82be 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -486,8 +486,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Komodo: 0x4111
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20497
+    bluetooth.device_id.product_id=16657
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index fbc142b1..a5969528 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -451,8 +451,9 @@ PRODUCT_PACKAGES += \
 endif
 
 # Bluetooth device id
+# Tokay: 0x4112
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20498
+    bluetooth.device_id.product_id=16658
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \