diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi
index 732eb11c..4376bc8d 100644
--- a/qcom/kera.dtsi
+++ b/qcom/kera.dtsi
@@ -3218,3 +3218,4 @@
 		vdd-usb-cp-supply = <&L7B>;
 	};
 };
+#include "tuna-thermal-overlay.dtsi"
diff --git a/qcom/tuna-cdp.dtsi b/qcom/tuna-cdp.dtsi
index eb92e52c..c188cee7 100644
--- a/qcom/tuna-cdp.dtsi
+++ b/qcom/tuna-cdp.dtsi
@@ -4,7 +4,6 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
-#include "tuna-thermal-overlay.dtsi"
 
 &qupv3_se4_i2c {
 	#address-cells = <1>;
diff --git a/qcom/tuna-mtp.dtsi b/qcom/tuna-mtp.dtsi
index 20a874ec..c5878f76 100644
--- a/qcom/tuna-mtp.dtsi
+++ b/qcom/tuna-mtp.dtsi
@@ -5,7 +5,6 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/qcom,gcc-sun.h>
-#include "tuna-thermal-overlay.dtsi"
 
 &qupv3_se4_i2c {
 	#address-cells = <1>;
diff --git a/qcom/tuna-pm7550ba.dtsi b/qcom/tuna-pm7550ba.dtsi
index bb7acad2..f9ba9b63 100644
--- a/qcom/tuna-pm7550ba.dtsi
+++ b/qcom/tuna-pm7550ba.dtsi
@@ -315,6 +315,25 @@
 			};
 		};
 	};
+
+	socd {
+		cooling-maps {
+			socd_apc1 {
+				trip = <&socd_trip>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+
+			socd_cdsp1 {
+				trip = <&socd_trip>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
+
+			socd_gpu0 {
+				trip = <&socd_trip>;
+				cooling-device = <&msm_gpu 4 4>;
+			};
+		};
+	};
 };
 
 &pm7550ba_eusb2_repeater {
diff --git a/qcom/tuna-pmih010x.dtsi b/qcom/tuna-pmih010x.dtsi
index f2ac1b7d..d9a16fe6 100644
--- a/qcom/tuna-pmih010x.dtsi
+++ b/qcom/tuna-pmih010x.dtsi
@@ -298,6 +298,25 @@
 			};
 		};
 	};
+
+	socd {
+		cooling-maps {
+			socd_apc1 {
+				trip = <&socd_trip>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+
+			socd_cdsp1 {
+				trip = <&socd_trip>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
+
+			socd_gpu0 {
+				trip = <&socd_trip>;
+				cooling-device = <&msm_gpu 4 4>;
+			};
+		};
+	};
 };
 
 &pmih010x_eusb2_repeater {
diff --git a/qcom/tuna-pmiv0108.dtsi b/qcom/tuna-pmiv0108.dtsi
index 15c2767c..1cfe6696 100644
--- a/qcom/tuna-pmiv0108.dtsi
+++ b/qcom/tuna-pmiv0108.dtsi
@@ -240,6 +240,25 @@
 			};
 		};
 	};
+
+	socd {
+		cooling-maps {
+			socd_apc1 {
+				trip = <&socd_trip>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+
+			socd_cdsp1 {
+				trip = <&socd_trip>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
+
+			socd_gpu0 {
+				trip = <&socd_trip>;
+				cooling-device = <&msm_gpu 4 4>;
+			};
+		};
+	};
 };
 
 &pmiv010x_eusb2_repeater {
diff --git a/qcom/tuna-qrd.dtsi b/qcom/tuna-qrd.dtsi
index f5b69fc1..52f76c03 100644
--- a/qcom/tuna-qrd.dtsi
+++ b/qcom/tuna-qrd.dtsi
@@ -4,7 +4,6 @@
  */
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "tuna-thermal-overlay.dtsi"
 
 &qupv3_se4_spi {
 	#address-cells = <1>;
diff --git a/qcom/tuna-thermal-overlay.dtsi b/qcom/tuna-thermal-overlay.dtsi
index c0f874df..e0c1e053 100644
--- a/qcom/tuna-thermal-overlay.dtsi
+++ b/qcom/tuna-thermal-overlay.dtsi
@@ -6,25 +6,6 @@
 #include <dt-bindings/thermal/thermal_qti.h>
 
 &thermal_zones {
-	socd {
-		cooling-maps {
-			socd_apc1 {
-				trip = <&socd_trip>;
-				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
-			};
-
-			socd_cdsp1 {
-				trip = <&socd_trip>;
-				cooling-device = <&cdsp_sw 4 4>;
-			};
-
-			socd_gpu0 {
-				trip = <&socd_trip>;
-				cooling-device = <&msm_gpu 4 4>;
-			};
-		};
-	};
-
 	pmxr2230-bcl-lvl0 {
 		cooling-maps {
 			lbat_0_nr_scg {
diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index 985a044a..d8eb4671 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -3676,3 +3676,5 @@
 		vdd-usb-cp-supply = <&L7B>;
 	};
 };
+
+#include "tuna-thermal-overlay.dtsi"