diff --git a/qcom/Makefile b/qcom/Makefile
index 878f5d458502..d7c8060780c0 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -1,8 +1,20 @@
+ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \
+	lahaina-mtp-overlay.dtbo \
+	lahaina-cdp-overlay.dtbo \
+	lahaina-qrd-overlay.dtbo
+
+lahaina-rumi-overlay.dtbo-base := lahaina.dtb
+lahaina-mtp-overlay.dtbo-base := lahaina.dtb
+lahaina-cdp-overlay.dtbo-base := lahaina.dtb
+lahaina-qrd-overlay.dtbo-base := lahaina.dtb
+else
 dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahaina-mtp.dtb \
 	lahaina-cdp.dtb \
 	lahaina-qrd.dtb
+endif
 
 always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)
-clean-files	:= *.dtb
+clean-files	:= *.dtb *.dtbo
diff --git a/qcom/lahaina-mtp-overlay.dts b/qcom/lahaina-mtp-overlay.dts
new file mode 100644
index 000000000000..09c89052f853
--- /dev/null
+++ b/qcom/lahaina-mtp-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "lahaina-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina MTP";
+	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahaina-qrd-overlay.dts b/qcom/lahaina-qrd-overlay.dts
new file mode 100644
index 000000000000..aeea7961d9bb
--- /dev/null
+++ b/qcom/lahaina-qrd-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "lahaina-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina QRD";
+	compatible = "qcom,lahaina-qrd", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahaina-rumi-overlay.dts b/qcom/lahaina-rumi-overlay.dts
new file mode 100644
index 000000000000..cf2c0bccaf40
--- /dev/null
+++ b/qcom/lahaina-rumi-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "lahaina-rumi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina RUMI";
+	compatible = "qcom,lahaina-rumi", "qcom,lahaina", "qcom,rumi";
+	qcom,board-id = <0x1000F 0>;
+};
diff --git a/qcom/lahaina-rumi.dtsi b/qcom/lahaina-rumi.dtsi
index 25f5de69b125..a033d6bc3207 100644
--- a/qcom/lahaina-rumi.dtsi
+++ b/qcom/lahaina-rumi.dtsi
@@ -1,4 +1,3 @@
-#include "lahaina.dtsi"
 #include "lahaina-pmic-overlay.dtsi"
 
 &spmi_debug_bus {
diff --git a/qcom/lahaina.dts b/qcom/lahaina.dts
new file mode 100644
index 000000000000..52c0fb45ed3d
--- /dev/null
+++ b/qcom/lahaina.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "lahaina.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. lahaina v1 SoC";
+	compatible = "qcom,lahaina";
+	qcom,board-id = <0 0>;
+};