diff --git a/qcom/pm7250b.dtsi b/qcom/pm7250b.dtsi
index 33407576b4ac..32d662ff76df 100644
--- a/qcom/pm7250b.dtsi
+++ b/qcom/pm7250b.dtsi
@@ -424,7 +424,7 @@
 };
 
 &thermal_zones {
-	pm7250b_tz {
+	pm7250b_temp_alarm: pm7250b_tz {
 		polling-delay-passive = <100>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
@@ -440,13 +440,13 @@
 			pm7250b_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 
-			trip2 {
+			pm7250b_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 	};
@@ -535,7 +535,7 @@
 		trips {
 			socd_trip:socd-trip {
 				temperature = <90>;
-				hysteresis = <1>;
+				hysteresis = <0>;
 				type = "passive";
 			};
 		};
diff --git a/qcom/yupik-pm7250b-thermal-overlay.dtsi b/qcom/yupik-pm7250b-thermal-overlay.dtsi
index 057d99d8fbcd..b8096d2db3e9 100644
--- a/qcom/yupik-pm7250b-thermal-overlay.dtsi
+++ b/qcom/yupik-pm7250b-thermal-overlay.dtsi
@@ -33,6 +33,75 @@
 		};
 	};
 
+	pm7250b-bcl-lvl0 {
+		cooling-maps {
+			vbat_cpu4 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cpu4_isolate 1 1>;
+			};
+
+			vbat_cpu5 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cpu5_isolate 1 1>;
+			};
+
+			vbat_cpu6 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cpu6_isolate 1 1>;
+			};
+
+			vbat_cpu7 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cpu7_isolate 1 1>;
+			};
+
+			vbat_cdsp0 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cdsp_sw 2 2>;
+			};
+
+			vbat_modem0 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&modem_pa 2 2>;
+			};
+
+			vbat_modem1 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&modem_tj 1 1>;
+			};
+		};
+	};
+
+	pm7250b-bcl-lvl1 {
+		cooling-maps {
+			vbat_gpu {
+				trip = <&b_bcl_lvl1>;
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+
+			vbat_cdsp1 {
+				trip = <&b_bcl_lvl1>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
+
+			vbat_modem2 {
+				trip = <&b_bcl_lvl1>;
+				cooling-device = <&modem_tj 3 3>;
+			};
+		};
+	};
+
+	pm7250b-bcl-lvl2 {
+		cooling-maps {
+			vbat_cdsp2 {
+				trip = <&b_bcl_lvl2>;
+				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+		};
+	};
+
 	pm8350c-bcl-lvl0 {
 		disable-thermal-zone;
 		cooling-maps {
@@ -46,9 +115,14 @@
 				cooling-device = <&cpu5_isolate 1 1>;
 			};
 
-			vph_gpu0 {
+			vph_cpu6 {
 				trip = <&c_bcl_lvl0>;
-				cooling-device = <&msm_gpu 2 2>;
+				cooling-device = <&cpu6_isolate 1 1>;
+			};
+
+			vph_cpu7 {
+				trip = <&c_bcl_lvl0>;
+				cooling-device = <&cpu7_isolate 1 1>;
 			};
 
 			vph_cdsp0 {
@@ -56,12 +130,12 @@
 				cooling-device = <&cdsp_sw 2 2>;
 			};
 
-			vbat_modem0 {
+			vph_modem0 {
 				trip = <&c_bcl_lvl0>;
 				cooling-device = <&modem_pa 2 2>;
 			};
 
-			vbat_modem1 {
+			vph_modem1 {
 				trip = <&c_bcl_lvl0>;
 				cooling-device = <&modem_tj 1 1>;
 			};
@@ -71,19 +145,10 @@
 	pm8350c-bcl-lvl1 {
 		disable-thermal-zone;
 		cooling-maps {
-			vph_cpu6 {
+			vph_gpu {
 				trip = <&c_bcl_lvl1>;
-				cooling-device = <&cpu6_isolate 1 1>;
-			};
-
-			vph_cpu7 {
-				trip = <&c_bcl_lvl1>;
-				cooling-device = <&cpu7_isolate 1 1>;
-			};
-
-			vph_gpu1 {
-				trip = <&c_bcl_lvl1>;
-				cooling-device = <&msm_gpu 4 4>;
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
 			};
 
 			vph_cdsp1 {
@@ -91,7 +156,7 @@
 				cooling-device = <&cdsp_sw 4 4>;
 			};
 
-			vbat_modem0 {
+			vph_modem2 {
 				trip = <&c_bcl_lvl1>;
 				cooling-device = <&modem_tj 3 3>;
 			};
@@ -101,12 +166,6 @@
 	pm8350c-bcl-lvl2 {
 		disable-thermal-zone;
 		cooling-maps {
-			vph_gpu2 {
-				trip = <&c_bcl_lvl2>;
-				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
 			vph_cdsp2 {
 				trip = <&c_bcl_lvl2>;
 				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
@@ -115,6 +174,17 @@
 		};
 	};
 
+	pm7250b_tz {
+		cooling-maps {
+			battery_cdev {
+				trip = <&pm7250b_trip0>;
+				cooling-device = <&battery_charger
+							THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+		};
+	};
+
 	pm7325_tz {
 		cooling-maps {
 			pm7325_gpu {
@@ -123,21 +193,6 @@
 							THERMAL_MAX_LIMIT>;
 			};
 
-			pm7325_cpu1 {
-				trip = <&pm7325_trip0>;
-				cooling-device = <&cpu1_isolate 1 1>;
-			};
-
-			pm7325_cpu2 {
-				trip = <&pm7325_trip0>;
-				cooling-device = <&cpu2_isolate 1 1>;
-			};
-
-			pm7325_cpu3 {
-				trip = <&pm7325_trip0>;
-				cooling-device = <&cpu3_isolate 1 1>;
-			};
-
 			pm7325_cpu4 {
 				trip = <&pm7325_trip0>;
 				cooling-device = <&cpu4_isolate 1 1>;