diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts
index 8848ff2a..8f8d5e5c 100644
--- a/canoe-kiwi-cnss.dts
+++ b/canoe-kiwi-cnss.dts
@@ -15,5 +15,5 @@
 	qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
 			<0x1000294 0x10000>, <0x1000294 0x20000>,
 			<0x1000295 0x10000>, <0x1000295 0x20000>;
-	qcom,board-id = <0x1000001 0>, <0x1000008 0>, <0x1000015 0>;
+	qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>;
 };
diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts
index be41a1ac..37059bc1 100644
--- a/canoe-peach-cnss.dts
+++ b/canoe-peach-cnss.dts
@@ -15,5 +15,7 @@
 	qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
 		      <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>,
 		      <0x1000295 0x20000>;
-	qcom,board-id = <1 0>, <8 0>, <0x10021 0>, <11 0>, <0x15 0>, <0x208 0>, <0x108 0>;
+	qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>,
+			<0x50008 0>, <0x60008 0>, <0x70008 0>, <0x21 0>, <11 0>,
+			<0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>;
 };