diff --git a/qcom/kera-atp.dtsi b/qcom/kera-atp.dtsi
index b9271a9e..ed1d67d3 100644
--- a/qcom/kera-atp.dtsi
+++ b/qcom/kera-atp.dtsi
@@ -31,15 +31,3 @@
 &pmic_glink_adc {
 	status = "disabled";
 };
-
-&pmxr2230_sys_therm_11{
-	status = "disabled";
-};
-
-&sys_therm_11 {
-	status = "disabled";
-};
-
-&pm8550ve_f_die_temp {
-	status = "disabled";
-};
diff --git a/qcom/kera-cdp.dtsi b/qcom/kera-cdp.dtsi
index 6c6bb054..f9d8f28b 100644
--- a/qcom/kera-cdp.dtsi
+++ b/qcom/kera-cdp.dtsi
@@ -64,15 +64,3 @@
 						&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
 	};
 };
-
-&pmxr2230_sys_therm_11{
-	status = "disabled";
-};
-
-&sys_therm_11 {
-	status = "disabled";
-};
-
-&pm8550ve_f_die_temp {
-	status = "disabled";
-};
diff --git a/qcom/kera-mtp.dtsi b/qcom/kera-mtp.dtsi
index 132d833f..fe3b8f24 100644
--- a/qcom/kera-mtp.dtsi
+++ b/qcom/kera-mtp.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/clock/qcom,gcc-kera.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
+#include "pmk8550.dtsi"
 
 &sdhc_2 {
 	vdd-supply = <&L13B>;
@@ -76,15 +77,3 @@
 						&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
 	};
 };
-
-&pmxr2230_sys_therm_11{
-	status = "disabled";
-};
-
-&sys_therm_11 {
-	status = "disabled";
-};
-
-&pm8550ve_f_die_temp {
-	status = "disabled";
-};
diff --git a/qcom/kera-pmic-overlay.dtsi b/qcom/kera-pmic-overlay.dtsi
index e0a3983c..7563e31f 100644
--- a/qcom/kera-pmic-overlay.dtsi
+++ b/qcom/kera-pmic-overlay.dtsi
@@ -24,3 +24,6 @@
 	};
 };
 
+&thermal_zones {
+	/delete-node/ sys-therm-11;
+};
diff --git a/qcom/kera-qrd.dtsi b/qcom/kera-qrd.dtsi
index aefa190a..bc809756 100644
--- a/qcom/kera-qrd.dtsi
+++ b/qcom/kera-qrd.dtsi
@@ -106,15 +106,3 @@
 		label = "smb1393_1_die_temp";
 	};
 };
-
-&pmxr2230_sys_therm_11{
-	status = "disabled";
-};
-
-&sys_therm_11 {
-	status = "disabled";
-};
-
-&pm8550ve_f_die_temp {
-	status = "disabled";
-};
diff --git a/qcom/kera-rcm.dtsi b/qcom/kera-rcm.dtsi
index cf695ccf..fccccc16 100644
--- a/qcom/kera-rcm.dtsi
+++ b/qcom/kera-rcm.dtsi
@@ -23,15 +23,3 @@
 
 	status = "ok";
 };
-
-&pmxr2230_sys_therm_11{
-	status = "disabled";
-};
-
-&sys_therm_11 {
-	status = "disabled";
-};
-
-&pm8550ve_f_die_temp {
-	status = "disabled";
-};
diff --git a/qcom/tuna-pmic-overlay.dtsi b/qcom/tuna-pmic-overlay.dtsi
index 6fcf9bd3..f81e83c8 100644
--- a/qcom/tuna-pmic-overlay.dtsi
+++ b/qcom/tuna-pmic-overlay.dtsi
@@ -279,7 +279,7 @@
 		};
 	};
 
-	sys_therm_11: sys-therm-11 {
+	sys-therm-11 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&pmk8550_vadc PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>;
@@ -387,7 +387,7 @@
 		qcom,adc-tm-type = <1>;
 	};
 
-	pmxr2230_sys_therm_11: pmxr2230_sys_therm_11 {
+	pmxr2230_sys_therm_11 {
 		reg = <PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>;
 		label = "pmxr2230_sys_therm_11";
 		qcom,ratiometric;
@@ -408,7 +408,7 @@
 		qcom,pre-scaling = <1 1>;
 	};
 
-	pm8550ve_f_die_temp: pm8550ve_f_die_temp {
+	pm8550ve_f_die_temp {
 		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
 		label = "pm8550ve_f_die_temp";
 		qcom,pre-scaling = <1 1>;