diff --git a/qcom/Makefile b/qcom/Makefile
index 6f922104..25b4be94 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -73,12 +73,37 @@ sun-overlays-dtb-$(CONFIG_ARCH_TUNA) += $(NOAPQ_TUNA_BOARDS) $(TUNA_BASE_DTB)
 dtb-y += $(sun-dtb-y)
 
 KERA_BASE_DTB += kera.dtb
+KERA_APQ_BASE_DTB += kerap.dtb
+KERA_BOARDS += \
+		kera-atp-overlay.dtbo \
+		kera-mtp-overlay.dtbo \
+		kera-mtp-qca6750-overlay.dtbo \
+		kera-mtp-qca6750-qmp1000-overlay.dtbo \
+		kera-mtp-wcn7750-qmp1000-overlay.dtbo \
+		kera-mtp-wcn7750-ufs4-overlay.dtbo \
+		kera-mtp-wcn7750-ufs3-overlay.dtbo \
+		kera-cdp-overlay.dtbo \
+		kera-cdp-qca6750-ufs2-overlay.dtbo \
+		kera-cdp-qca6750-ufs3-overlay.dtbo \
+		kera-cdp-qca6750-ufs4-overlay.dtbo \
+		kera-qrd-overlay.dtbo \
+		kera-qrd-wcn7750-ufs2-overlay.dtbo \
+		kera-qrd-wcn7750-ufs3-overlay.dtbo \
+		kera-rcm-overlay.dtbo \
+		kera-rcm-qca6750-ufs2-overlay.dtbo \
+		kera-rcm-qca6750-ufs3-overlay.dtbo \
+		kera-rcm-wcn7750-ufs2-overlay.dtbo \
+		kera-rcm-wcn7750-ufs3-overlay.dtbo \
+		kera-rcm-wcn7750-ufs4-overlay.dtbo
+
 NOAPQ_KERA_BOARDS += \
-		 kera-rumi-overlay.dtbo
+		kera-rumi-overlay.dtbo
 
 sun-dtb-$(CONFIG_ARCH_KERA) +=  \
-        $(call add-overlays, $(NOAPQ_KERA_BOARDS),$(KERA_BASE_DTB))
-sun-overlays-dtb-$(CONFIG_ARCH_KERA) += $(NOAPQ_KERA_BOARDS) $(KERA_BASE_DTB)
+	$(call add-overlays, $(KERA_BOARDS) $(NOAPQ_KERA_BOARDS),$(KERA_BASE_DTB)) \
+	$(call add-overlays, $(KERA_BOARDS) $(APQ_KERA_BOARDS),$(KERA_APQ_BASE_DTB))
+sun-overlays-dtb-$(CONFIG_ARCH_KERA) += $(KERA_BOARDS) $(NOAPQ_KERA_BOARDS) $(KERA_BASE_DTB) $(KERA_APQ_BASE_DTB)
+
 dtb-y += $(sun-dtb-y)
 
 PINEAPPLE_BASE_DTB += pineapple.dtb pineapple-v2.dtb
diff --git a/qcom/kera-atp-overlay.dts b/qcom/kera-atp-overlay.dts
new file mode 100644
index 00000000..426d6250
--- /dev/null
+++ b/qcom/kera-atp-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-atp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera ATP";
+	compatible = "qcom,kera-atp", "qcom,kera", "qcom,kerap-atp", "qcom,kerap",
+			"qcom,atp";
+
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <33 0>;
+};
diff --git a/qcom/kera-atp.dtsi b/qcom/kera-atp.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-atp.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-cdp-overlay.dts b/qcom/kera-cdp-overlay.dts
new file mode 100644
index 00000000..eb4e14d5
--- /dev/null
+++ b/qcom/kera-cdp-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera CDP";
+	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
+			"qcom,cdp";
+
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/kera-cdp-qca6750-ufs2-overlay.dts b/qcom/kera-cdp-qca6750-ufs2-overlay.dts
new file mode 100644
index 00000000..4dfe8a64
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs2-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-cdp-qca6750-ufs2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS2.0";
+	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
+			"qcom,cdp";
+
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x30001 0>;
+};
diff --git a/qcom/kera-cdp-qca6750-ufs2.dtsi b/qcom/kera-cdp-qca6750-ufs2.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs2.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-cdp-qca6750-ufs3-overlay.dts b/qcom/kera-cdp-qca6750-ufs3-overlay.dts
new file mode 100644
index 00000000..1460a91b
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs3-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-cdp-qca6750-ufs3.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS3.0";
+	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
+			"qcom,cdp";
+
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x20001 0>;
+};
diff --git a/qcom/kera-cdp-qca6750-ufs3.dtsi b/qcom/kera-cdp-qca6750-ufs3.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs3.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-cdp-qca6750-ufs4-overlay.dts b/qcom/kera-cdp-qca6750-ufs4-overlay.dts
new file mode 100644
index 00000000..7980142c
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs4-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-cdp-qca6750-ufs4.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS4.0";
+	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
+			"qcom,cdp";
+
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x40001 0>;
+};
diff --git a/qcom/kera-cdp-qca6750-ufs4.dtsi b/qcom/kera-cdp-qca6750-ufs4.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-cdp-qca6750-ufs4.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-cdp.dtsi b/qcom/kera-cdp.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-cdp.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp-overlay.dts b/qcom/kera-mtp-overlay.dts
new file mode 100644
index 00000000..6db9415f
--- /dev/null
+++ b/qcom/kera-mtp-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			"qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/kera-mtp-qca6750-overlay.dts b/qcom/kera-mtp-qca6750-overlay.dts
new file mode 100644
index 00000000..d5158491
--- /dev/null
+++ b/qcom/kera-mtp-qca6750-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp-qca6750.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			"qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x20008 0>;
+};
diff --git a/qcom/kera-mtp-qca6750-qmp1000-overlay.dts b/qcom/kera-mtp-qca6750-qmp1000-overlay.dts
new file mode 100644
index 00000000..c3ab0046
--- /dev/null
+++ b/qcom/kera-mtp-qca6750-qmp1000-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp-qca6750-qmp1000.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750 + QMP1000";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			 "qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x30008 0>;
+};
diff --git a/qcom/kera-mtp-qca6750-qmp1000.dtsi b/qcom/kera-mtp-qca6750-qmp1000.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp-qca6750-qmp1000.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp-qca6750.dtsi b/qcom/kera-mtp-qca6750.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp-qca6750.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts b/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts
new file mode 100644
index 00000000..2720ee28
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp-wcn7750-qmp1000.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + QMP1000";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			"qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x30008 1>;
+};
diff --git a/qcom/kera-mtp-wcn7750-qmp1000.dtsi b/qcom/kera-mtp-wcn7750-qmp1000.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-qmp1000.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp-wcn7750-ufs3-overlay.dts b/qcom/kera-mtp-wcn7750-ufs3-overlay.dts
new file mode 100644
index 00000000..35ae76b2
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-ufs3-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp-wcn7750-ufs3.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS3.0";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			"qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x20008 1>;
+};
diff --git a/qcom/kera-mtp-wcn7750-ufs3.dtsi b/qcom/kera-mtp-wcn7750-ufs3.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-ufs3.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp-wcn7750-ufs4-overlay.dts b/qcom/kera-mtp-wcn7750-ufs4-overlay.dts
new file mode 100644
index 00000000..2045dc81
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-ufs4-overlay.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-mtp-wcn7750-ufs4.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS4.0";
+	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
+			"qcom,mtp";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x10008 1>;
+};
+
diff --git a/qcom/kera-mtp-wcn7750-ufs4.dtsi b/qcom/kera-mtp-wcn7750-ufs4.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp-wcn7750-ufs4.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-mtp.dtsi b/qcom/kera-mtp.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-mtp.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-qrd-overlay.dts b/qcom/kera-qrd-overlay.dts
new file mode 100644
index 00000000..3ec1f322
--- /dev/null
+++ b/qcom/kera-qrd-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera QRD";
+	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
+			"qcom,qrd";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/kera-qrd-wcn7750-ufs2-overlay.dts b/qcom/kera-qrd-wcn7750-ufs2-overlay.dts
new file mode 100644
index 00000000..9442ddc8
--- /dev/null
+++ b/qcom/kera-qrd-wcn7750-ufs2-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-qrd-wcn7750-ufs2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera QRD";
+	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
+			"qcom,qrd";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x3000B 0>;
+};
diff --git a/qcom/kera-qrd-wcn7750-ufs2.dtsi b/qcom/kera-qrd-wcn7750-ufs2.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-qrd-wcn7750-ufs2.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-qrd-wcn7750-ufs3-overlay.dts b/qcom/kera-qrd-wcn7750-ufs3-overlay.dts
new file mode 100644
index 00000000..0ab56d62
--- /dev/null
+++ b/qcom/kera-qrd-wcn7750-ufs3-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-qrd-wcn7750-ufs3.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS3.0";
+	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
+			"qcom,qrd";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x2000B 0>;
+};
diff --git a/qcom/kera-qrd-wcn7750-ufs3.dtsi b/qcom/kera-qrd-wcn7750-ufs3.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-qrd-wcn7750-ufs3.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-qrd.dtsi b/qcom/kera-qrd.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-qrd.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm-overlay.dts b/qcom/kera-rcm-overlay.dts
new file mode 100644
index 00000000..6b7224f0
--- /dev/null
+++ b/qcom/kera-rcm-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera RCM";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x10015 0>;
+};
diff --git a/qcom/kera-rcm-qca6750-ufs2-overlay.dts b/qcom/kera-rcm-qca6750-ufs2-overlay.dts
new file mode 100644
index 00000000..1d506023
--- /dev/null
+++ b/qcom/kera-rcm-qca6750-ufs2-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm-qca6750-ufs2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS2.0";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x30015 0>;
+};
diff --git a/qcom/kera-rcm-qca6750-ufs2.dtsi b/qcom/kera-rcm-qca6750-ufs2.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm-qca6750-ufs2.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm-qca6750-ufs3-overlay.dts b/qcom/kera-rcm-qca6750-ufs3-overlay.dts
new file mode 100644
index 00000000..dd7bf05f
--- /dev/null
+++ b/qcom/kera-rcm-qca6750-ufs3-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm-qca6750-ufs3.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS3.0";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x20015 0>;
+};
diff --git a/qcom/kera-rcm-qca6750-ufs3.dtsi b/qcom/kera-rcm-qca6750-ufs3.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm-qca6750-ufs3.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm-wcn7750-ufs2-overlay.dts b/qcom/kera-rcm-wcn7750-ufs2-overlay.dts
new file mode 100644
index 00000000..26338b7c
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs2-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm-wcn7750-ufs2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS2.0";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x30015 1>;
+};
diff --git a/qcom/kera-rcm-wcn7750-ufs2.dtsi b/qcom/kera-rcm-wcn7750-ufs2.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs2.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm-wcn7750-ufs3-overlay.dts b/qcom/kera-rcm-wcn7750-ufs3-overlay.dts
new file mode 100644
index 00000000..bd3afa7d
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs3-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm-wcn7750-ufs3.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KERA RCM + WCN7750 + UFS3.0";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x20015 1>;
+};
diff --git a/qcom/kera-rcm-wcn7750-ufs3.dtsi b/qcom/kera-rcm-wcn7750-ufs3.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs3.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm-wcn7750-ufs4-overlay.dts b/qcom/kera-rcm-wcn7750-ufs4-overlay.dts
new file mode 100644
index 00000000..de8e0e89
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs4-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "kera-rcm-wcn7750-ufs4.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS4.0";
+	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
+			"qcom,rcm";
+	qcom,msm-id = <686 0x10000>, <659 0x10000>;
+	qcom,board-id = <0x10015 1>;
+};
diff --git a/qcom/kera-rcm-wcn7750-ufs4.dtsi b/qcom/kera-rcm-wcn7750-ufs4.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm-wcn7750-ufs4.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kera-rcm.dtsi b/qcom/kera-rcm.dtsi
new file mode 100644
index 00000000..9df4770a
--- /dev/null
+++ b/qcom/kera-rcm.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
diff --git a/qcom/kerap.dts b/qcom/kerap.dts
new file mode 100644
index 00000000..07c84dca
--- /dev/null
+++ b/qcom/kerap.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "kerap.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KeraP SoC";
+	compatible = "qcom,kerap";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/kerap.dtsi b/qcom/kerap.dtsi
new file mode 100644
index 00000000..26a4c0b9
--- /dev/null
+++ b/qcom/kerap.dtsi
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "kera.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KeraP SoC";
+	compatible = "qcom,kerap";
+	qcom,msm-id = <686 0x10000>;
+};
diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl
index 95d31391..3421851b 100644
--- a/qcom/platform_map.bzl
+++ b/qcom/platform_map.bzl
@@ -98,12 +98,36 @@ _platform_map = {
     "kera": {
         "dtb_list": [
             {"name": "kera.dtb"},
+            {
+                "name": "kerap.dtb",
+                "apq": True,
+            },
         ],
         "dtbo_list": [
             {
                 "name": "kera-rumi-overlay.dtbo",
                 "apq": False,
             },
+            {"name": "kera-atp-overlay.dtbo"},
+            {"name": "kera-mtp-overlay.dtbo"},
+            {"name": "kera-mtp-qca6750-overlay.dtbo"},
+            {"name": "kera-mtp-qca6750-qmp1000-overlay.dtbo"},
+            {"name": "kera-mtp-wcn7750-qmp1000-overlay.dtbo"},
+            {"name": "kera-mtp-wcn7750-ufs3-overlay.dtbo"},
+            {"name": "kera-mtp-wcn7750-ufs4-overlay.dtbo"},
+            {"name": "kera-cdp-overlay.dtbo"},
+            {"name": "kera-cdp-qca6750-ufs2-overlay.dtbo"},
+            {"name": "kera-cdp-qca6750-ufs3-overlay.dtbo"},
+            {"name": "kera-cdp-qca6750-ufs4-overlay.dtbo"},
+            {"name": "kera-qrd-overlay.dtbo"},
+            {"name": "kera-qrd-wcn7750-ufs2-overlay.dtbo"},
+            {"name": "kera-qrd-wcn7750-ufs3-overlay.dtbo"},
+            {"name": "kera-rcm-overlay.dtbo"},
+            {"name": "kera-rcm-qca6750-ufs2-overlay.dtbo"},
+            {"name": "kera-rcm-qca6750-ufs3-overlay.dtbo"},
+            {"name": "kera-rcm-wcn7750-ufs2-overlay.dtbo"},
+            {"name": "kera-rcm-wcn7750-ufs3-overlay.dtbo"},
+            {"name": "kera-rcm-wcn7750-ufs4-overlay.dtbo"},
         ],
     },
     "parrot-tuivm": {