diff --git a/qcom/katmai-cpu.dtsi b/qcom/katmai-cpu.dtsi
index 32e9e8289b22..86771b11ca9f 100644
--- a/qcom/katmai-cpu.dtsi
+++ b/qcom/katmai-cpu.dtsi
@@ -281,13 +281,13 @@
 		};
 	};
 
-
 	qcom,cpu-voltage-cdev {
-		apc1_cluster: qcom,apc1-cluster {
-			/delete-property/ qcom,cpus;
-			qcom,cpus = <&CPU4>;
+		apc1_cluster: thermal-cluster-4-7 {
+			/delete-property/ qcom,cluster0;
+			/delete-property/ qcom,cluster1;
 		};
 	};
+
 };
 
 &funnel_apss {
@@ -298,9 +298,34 @@
 };
 
 &thermal_zones {
+	cpu-1-0-step {
+		cooling-maps {
+			/delete-node/ cpu10_cdev1;
+		};
+	};
+
+	cpu-1-1-step {
+		cooling-maps {
+			/delete-node/ cpu11_cdev1;
+		};
+	};
+
+	cpu-1-2-step {
+		cooling-maps {
+			/delete-node/ cpu12_cdev1;
+		};
+	};
+
+	cpu-1-3-step {
+		cooling-maps {
+			/delete-node/ cpu13_cdev1;
+		};
+	};
+
 	cpu-1-4-step {
 		cooling-maps {
 			/delete-node/ cpu14_cdev;
+			/delete-node/ cpu14_cdev1;
 			/delete-node/ cpu14_cdev2;
 		};
 	};
@@ -308,6 +333,7 @@
 	cpu-1-5-step {
 		cooling-maps {
 			/delete-node/ cpu15_cdev;
+			/delete-node/ cpu15_cdev1;
 			/delete-node/ cpu15_cdev2;
 		};
 	};
diff --git a/qcom/lahaina-thermal.dtsi b/qcom/lahaina-thermal.dtsi
index 4fadb7a87f45..62c72c32cfa0 100644
--- a/qcom/lahaina-thermal.dtsi
+++ b/qcom/lahaina-thermal.dtsi
@@ -171,8 +171,9 @@
 
 	qcom,cpu-voltage-cdev {
 		compatible = "qcom,cc-cooling-devices";
-		apc1_cluster: qcom,apc1-cluster {
-			qcom,cpus = <&CPU4 &CPU7>;
+		apc1_cluster: thermal-cluster-4-7 {
+			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;
+			qcom,cluster1 = <&CPU7>;
 			#cooling-cells = <2>;
 		};
 	};
diff --git a/qcom/shima-thermal.dtsi b/qcom/shima-thermal.dtsi
index a5b819e44a9c..bf631203e352 100644
--- a/qcom/shima-thermal.dtsi
+++ b/qcom/shima-thermal.dtsi
@@ -199,8 +199,9 @@
 
 	qcom,cpu-voltage-cdev {
 		compatible = "qcom,cc-cooling-devices";
-		apc1_cluster: qcom,apc1-cluster {
-			qcom,cpus = <&CPU4 &CPU7>;
+		apc1_cluster: thermal-cluster-4-7 {
+			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;
+			qcom,cluster1 = <&CPU7>;
 			#cooling-cells = <2>;
 		};
 	};
diff --git a/qcom/yupik-thermal.dtsi b/qcom/yupik-thermal.dtsi
index a9d549cfe7b1..db04e7b9de33 100644
--- a/qcom/yupik-thermal.dtsi
+++ b/qcom/yupik-thermal.dtsi
@@ -231,8 +231,9 @@
 
 	qcom,cpu-voltage-cdev {
 		compatible = "qcom,cc-cooling-devices";
-		apc1_cluster: qcom,apc1-cluster {
-			qcom,cpus = <&CPU4 &CPU7>;
+		apc1_cluster: thermal-cluster-4-7 {
+			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;
+			qcom,cluster1 = <&CPU7>;
 			#cooling-cells = <2>;
 		};
 	};