diff --git a/qcom/lahaina-thermal.dtsi b/qcom/lahaina-thermal.dtsi
index 44007fbc7d8e..061a91350676 100644
--- a/qcom/lahaina-thermal.dtsi
+++ b/qcom/lahaina-thermal.dtsi
@@ -52,6 +52,14 @@
 		isens_vref_1p8-supply = <&pm8350c_l1_ao>;
 		isens-vref-1p8-settings = <1800000 1800000 20000>;
 	};
+
+	qcom,cpu-voltage-cdev {
+		compatible = "qcom,cc-cooling-devices";
+		apc1_cluster: qcom,apc1-cluster {
+			qcom,cpus = <&CPU4 &CPU7>;
+			#cooling-cells = <2>;
+		};
+	};
 };
 
 &msm_gpu {
@@ -653,17 +661,10 @@
 		};
 
 		cooling-maps {
-			pop_cdev4 {
+			pop_cdev {
 				trip = <&pop_trip>;
 				cooling-device =
-					<&CPU4 THERMAL_NO_LIMIT
-						THERMAL_NO_LIMIT>;
-			};
-
-			pop_cdev7 {
-				trip = <&pop_trip>;
-				cooling-device =
-					<&CPU7 THERMAL_NO_LIMIT
+					<&apc1_cluster THERMAL_NO_LIMIT
 						THERMAL_NO_LIMIT>;
 			};
 		};