diff --git a/qcom/Makefile b/qcom/Makefile
index b8448edb..3312f0f0 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -34,10 +34,22 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahainap-qrd.dtb
 endif
 
+ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+dtbo-$(CONFIG_ARCH_WAIPIO) += waipio-rumi-overlay.dtbo \
+	waipio-mtp-overlay.dtbo \
+	waipio-cdp-overlay.dtbo \
+	waipio-qrd-overlay.dtbo
+
+waipio-rumi-overlay.dtbo-base := waipio.dtb
+waipio-mtp-overlay.dtbo-base := waipio.dtb
+waipio-cdp-overlay.dtbo-base := waipio.dtb
+waipio-qrd-overlay.dtbo-base := waipio.dtb
+else
 dtb-$(CONFIG_ARCH_WAIPIO) += waipio-rumi.dtb \
 	waipio-mtp.dtb \
 	waipio-cdp.dtb \
 	waipio-qrd.dtb
+endif
 
 dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
diff --git a/qcom/waipio-cdp-overlay.dts b/qcom/waipio-cdp-overlay.dts
new file mode 100644
index 00000000..95505fa0
--- /dev/null
+++ b/qcom/waipio-cdp-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio CDP";
+	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/waipio-mtp-overlay.dts b/qcom/waipio-mtp-overlay.dts
new file mode 100644
index 00000000..ad4855b9
--- /dev/null
+++ b/qcom/waipio-mtp-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio MTP";
+	compatible = "qcom,waipio-mtp", "qcom,waipio", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/waipio-qrd-overlay.dts b/qcom/waipio-qrd-overlay.dts
new file mode 100644
index 00000000..3d6246f1
--- /dev/null
+++ b/qcom/waipio-qrd-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio QRD";
+	compatible = "qcom,waipio-qrd", "qcom,waipio", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/waipio-rumi-overlay.dts b/qcom/waipio-rumi-overlay.dts
new file mode 100644
index 00000000..c192682f
--- /dev/null
+++ b/qcom/waipio-rumi-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-rumi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio RUMI";
+	compatible = "qcom,waipio-rumi", "qcom,waipio", "qcom,rumi";
+	qcom,board-id = <0x1000F 0>;
+};
diff --git a/qcom/waipio.dts b/qcom/waipio.dts
new file mode 100644
index 00000000..6e7ae5fa
--- /dev/null
+++ b/qcom/waipio.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "waipio.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio SoC";
+	compatible = "qcom,waipio";
+	qcom,board-id = <0 0>;
+};