diff --git a/qcom/blair-rhodei-common-overlay.dtsi b/qcom/blair-rhodei-common-overlay.dtsi
index 8e577afe5d31..518e7caa60d8 100644
--- a/qcom/blair-rhodei-common-overlay.dtsi
+++ b/qcom/blair-rhodei-common-overlay.dtsi
@@ -24,6 +24,7 @@
 #include "camera/blair-camera-sensor-mot-rhodei-overlay.dtsi"
 #include "rhodei-wl2868c.dtsi"
 #include "discrete_charging_rhodei.dtsi"
+#include "moto_therm_sys_temp.dtsi"
 
 &wcd937x_codec {
 	cdc-vdd-rxtx-supply = <&L9A>;
@@ -362,39 +363,10 @@
 	xo-therm-usr {
 		status = "disabled";
 	};
-	chg_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>;
-		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
 
-	usb_conn_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>;
-		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
-
-	msm_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
+	cam_flash_therm {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO1_100K_PU>;
 		wake-capable-sensor;
@@ -407,10 +379,9 @@
 		};
 	};
 
-
-	rfc_camera_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
+	chg_therm {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm_iio ADC5_GPIO2_100K_PU>;
 		wake-capable-sensor;
@@ -423,24 +394,9 @@
 		};
 	};
 
-	cam_flash_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "user_space";
-		thermal-sensors = <&pm6125_adc_tm ADC5_GPIO3_100K_PU>;
-		wake-capable-sensor;
-		trips {
-			active-config0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-		};
-	};
-
-	pa_therm1 {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
+	pa_therm2 {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm ADC5_GPIO4_100K_PU>;
 		wake-capable-sensor;
@@ -453,9 +409,9 @@
 		};
 	};
 
-	pa_therm2 {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
+	pa_therm1 {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>;
 		wake-capable-sensor;
@@ -469,8 +425,8 @@
 	};
 
 	quiet_therm {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
 		thermal-governor = "user_space";
 		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;
 		wake-capable-sensor;
@@ -482,6 +438,52 @@
 			};
 		};
 	};
+
+	xo_therm {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	qtm_n_therm {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	qtm_e_therm {
+		polling-delay-passive = <5000>;
+		polling-delay = <20000>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM4_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
 };
 
 &soc {