diff --git a/qcom/Makefile b/qcom/Makefile
index 17d0fefd..12d95ff9 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -36,10 +36,17 @@ dtb-$(CONFIG_ARCH_WAIPIO) += \
 	$(call add-overlays, $(WAIPIO_BOARDS) $(NOAPQ_WAIPIO_BOARDS),$(WAIPIO_BASE_DTB))\
 	$(call add-overlays, $(WAIPIO_BOARDS) $(APQ_WAIPIO_BOARDS),$(WAIPIO_APQ_BASE_DTB))
 
-dtb-$(CONFIG_ARCH_KALAMA) += kalama-rumi.dtb \
-	     kalama-mtp.dtb \
-	     kalama-cdp.dtb \
-	     kalama-qrd.dtb
+
+KALAMA_BASE_DTB += kalama.dtb
+
+KALAMA_BOARDS += \
+		 kalama-rumi-overlay.dtbo \
+		 kalama-mtp-overlay.dtbo \
+		 kalama-cdp-overlay.dtbo \
+		 kalama-qrd-overlay.dtbo
+
+dtb-$(CONFIG_ARCH_KALAMA) += \
+	$(call add-overlays, $(KALAMA_BOARDS),$(KALAMA_BASE_DTB))
 
 always-y        := $(dtb-y)
 subdir-y        := $(dts-dirs)
diff --git a/qcom/kalama-cdp.dts b/qcom/kalama-cdp-overlay.dts
similarity index 69%
rename from qcom/kalama-cdp.dts
rename to qcom/kalama-cdp-overlay.dts
index 660a5be8..e7d66a41 100644
--- a/qcom/kalama-cdp.dts
+++ b/qcom/kalama-cdp-overlay.dts
@@ -1,10 +1,11 @@
 /dts-v1/;
+/plugin/;
 
-#include "kalama.dtsi"
 #include "kalama-cdp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Kalama CDP";
 	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,board-id = <1 0>;
+	qcom,msm-id = <519 0x10000>;
+	qcom,board-id = <0x10001 0>;
 };
diff --git a/qcom/kalama-mtp.dts b/qcom/kalama-mtp-overlay.dts
similarity index 69%
rename from qcom/kalama-mtp.dts
rename to qcom/kalama-mtp-overlay.dts
index baaa6d1d..206704fc 100644
--- a/qcom/kalama-mtp.dts
+++ b/qcom/kalama-mtp-overlay.dts
@@ -1,10 +1,11 @@
 /dts-v1/;
+/plugin/;
 
-#include "kalama.dtsi"
 #include "kalama-mtp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Kalama MTP";
 	compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp";
-	qcom,board-id = <8 0>;
+	qcom,msm-id = <519 0x10000>;
+	qcom,board-id = <0x10008 0>;
 };
diff --git a/qcom/kalama-qrd-overlay.dts b/qcom/kalama-qrd-overlay.dts
new file mode 100644
index 00000000..bac338fd
--- /dev/null
+++ b/qcom/kalama-qrd-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "kalama-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kalama RUMI";
+	compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd";
+	qcom,msm-id = <519 0x10000>;
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/kalama-qrd.dts b/qcom/kalama-qrd.dts
deleted file mode 100644
index a61e6e10..00000000
--- a/qcom/kalama-qrd.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "kalama.dtsi"
-#include "kalama-qrd.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Kalama QRD";
-	compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd";
-	qcom,board-id = <11 0>;
-};
diff --git a/qcom/kalama-rumi.dts b/qcom/kalama-rumi-overlay.dts
similarity index 65%
rename from qcom/kalama-rumi.dts
rename to qcom/kalama-rumi-overlay.dts
index cfb56ad7..e1fa6221 100644
--- a/qcom/kalama-rumi.dts
+++ b/qcom/kalama-rumi-overlay.dts
@@ -1,11 +1,11 @@
 /dts-v1/;
-/memreserve/ 0xE3940000 0x00002000;
+/plugin/;
 
-#include "kalama.dtsi"
 #include "kalama-rumi.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Kalama RUMI";
 	compatible = "qcom,kalama-rumi", "qcom,kalama", "qcom,rumi";
-	qcom,board-id = <15 0>;
+	qcom,msm-id = <519 0x10000>;
+	qcom,board-id = <0x1000F 0>;
 };