diff --git a/qcom/Makefile b/qcom/Makefile
index 91f4026b..2e344249 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -19,17 +19,19 @@ SUN_BASE_DTB += sun.dtb sun-v2.dtb
 SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb
 
 SUN_BOARDS += \
-		 sun-mtp-overlay.dtbo \
-		 sun-mtp-kiwi-overlay.dtbo \
-		 sun-mtp-nfc-overlay.dtbo \
-		 sun-mtp-v8-overlay.dtbo \
-		 sun-cdp-overlay.dtbo \
-		 sun-cdp-kiwi-overlay.dtbo \
-		 sun-cdp-nfc-overlay.dtbo \
-		 sun-cdp-v8-overlay.dtbo \
-		 sun-qrd-sku1-overlay.dtbo \
-		 sun-qrd-sku1-v8-overlay.dtbo \
-		 sun-qrd-sku2-overlay.dtbo
+		sun-mtp-kiwi-overlay.dtbo \
+		sun-mtp-kiwi-v8-overlay.dtbo \
+		sun-mtp-nfc-overlay.dtbo \
+		sun-mtp-overlay.dtbo \
+		sun-mtp-v8-overlay.dtbo \
+		sun-cdp-kiwi-overlay.dtbo \
+		sun-cdp-kiwi-v8-overlay.dtbo \
+		sun-cdp-nfc-overlay.dtbo \
+		sun-cdp-overlay.dtbo \
+		sun-cdp-v8-overlay.dtbo \
+		sun-qrd-sku1-overlay.dtbo \
+		sun-qrd-sku1-v8-overlay.dtbo \
+		sun-qrd-sku2-overlay.dtbo
 
 NOAPQ_SUN_BOARDS += \
 		 sun-rumi-overlay.dtbo
diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl
index d5d2cae3..442bef56 100644
--- a/qcom/platform_map.bzl
+++ b/qcom/platform_map.bzl
@@ -16,10 +16,12 @@ _platform_map = {
         "dtbo_list": [
             # keep sorted
             {"name": "sun-cdp-kiwi-overlay.dtbo"},
+            {"name": "sun-cdp-kiwi-v8-overlay.dtbo"},
             {"name": "sun-cdp-nfc-overlay.dtbo"},
             {"name": "sun-cdp-overlay.dtbo"},
             {"name": "sun-cdp-v8-overlay.dtbo"},
             {"name": "sun-mtp-kiwi-overlay.dtbo"},
+            {"name": "sun-mtp-kiwi-v8-overlay.dtbo"},
             {"name": "sun-mtp-nfc-overlay.dtbo"},
             {"name": "sun-mtp-overlay.dtbo"},
             {"name": "sun-mtp-v8-overlay.dtbo"},
diff --git a/qcom/sun-cdp-kiwi-v8-overlay.dts b/qcom/sun-cdp-kiwi-v8-overlay.dts
new file mode 100644
index 00000000..f9dd0262
--- /dev/null
+++ b/qcom/sun-cdp-kiwi-v8-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-cdp-kiwi-v8.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN V8 Power Grid";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp",
+			   "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x60001 0>;
+};
diff --git a/qcom/sun-cdp-kiwi-v8.dtsi b/qcom/sun-cdp-kiwi-v8.dtsi
new file mode 100644
index 00000000..9d222a52
--- /dev/null
+++ b/qcom/sun-cdp-kiwi-v8.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-cdp-kiwi.dtsi"
diff --git a/qcom/sun-mtp-kiwi-v8-overlay.dts b/qcom/sun-mtp-kiwi-v8-overlay.dts
new file mode 100644
index 00000000..cd0d10f3
--- /dev/null
+++ b/qcom/sun-mtp-kiwi-v8-overlay.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-mtp-kiwi-v8.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN V8 Power Grid";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
+			   "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x50008 0>;
+};
diff --git a/qcom/sun-mtp-kiwi-v8.dtsi b/qcom/sun-mtp-kiwi-v8.dtsi
new file mode 100644
index 00000000..2c2449e7
--- /dev/null
+++ b/qcom/sun-mtp-kiwi-v8.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-mtp-kiwi.dtsi"