diff --git a/qcom/lahaina-cdp.dts b/qcom/lahaina-cdp.dts
index de2f8fa85c2f..d9c84ed10d48 100644
--- a/qcom/lahaina-cdp.dts
+++ b/qcom/lahaina-cdp.dts
@@ -6,5 +6,5 @@
 / {
 	model = "Qualcomm Technologies, Inc. Lahaina CDP";
 	compatible = "qcom,lahaina-cdp", "qcom,lahaina", "qcom,cdp";
-	qcom,board-id = <1 0>;
+	qcom,board-id = <0x10001 0>;
 };
diff --git a/qcom/lahaina-mtp.dts b/qcom/lahaina-mtp.dts
index 16a39ee2d3f5..859d7cdc2610 100644
--- a/qcom/lahaina-mtp.dts
+++ b/qcom/lahaina-mtp.dts
@@ -6,5 +6,5 @@
 / {
 	model = "Qualcomm Technologies, Inc. Lahaina MTP";
 	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
-	qcom,board-id = <8 0>;
+	qcom,board-id = <0x10008 0>;
 };
diff --git a/qcom/lahaina-qrd.dts b/qcom/lahaina-qrd.dts
index c9ae5caf3dba..69ef17086ebb 100644
--- a/qcom/lahaina-qrd.dts
+++ b/qcom/lahaina-qrd.dts
@@ -6,5 +6,5 @@
 / {
 	model = "Qualcomm Technologies, Inc. Lahaina QRD";
 	compatible = "qcom,lahaina-qrd", "qcom,lahaina", "qcom,qrd";
-	qcom,board-id = <11 0>;
+	qcom,board-id = <0x1000B 0>;
 };
diff --git a/qcom/lahaina-rumi.dts b/qcom/lahaina-rumi.dts
index 3af2e76d52c5..81e6e470c004 100644
--- a/qcom/lahaina-rumi.dts
+++ b/qcom/lahaina-rumi.dts
@@ -7,5 +7,5 @@
 / {
 	model = "Qualcomm Technologies, Inc. Lahaina RUMI";
 	compatible = "qcom,lahaina-rumi", "qcom,lahaina", "qcom,rumi";
-	qcom,board-id = <15 0>;
+	qcom,board-id = <0x1000F 0>;
 };