diff --git a/qcom/lahaina-thermal-overlay.dtsi b/qcom/lahaina-thermal-overlay.dtsi
index ce48bd0436ae..441b337bedcb 100644
--- a/qcom/lahaina-thermal-overlay.dtsi
+++ b/qcom/lahaina-thermal-overlay.dtsi
@@ -36,6 +36,16 @@
 
 	pm8350b-bcl-lvl0 {
 		cooling-maps {
+			vbat_modem_l3 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&modem_tj 3 3>;
+			};
+
+			vbat_gpu0 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&msm_gpu 2 2>;
+			};
+
 			vbat_cpu4 {
 				trip = <&b_bcl_lvl0>;
 				cooling-device = <&cpu4_isolate 1 1>;
@@ -46,11 +56,6 @@
 				cooling-device = <&cpu5_isolate 1 1>;
 			};
 
-			vbat_gpu0 {
-				trip = <&b_bcl_lvl0>;
-				cooling-device = <&msm_gpu 2 2>;
-			};
-
 			vbat_cdsp0 {
 				trip = <&b_bcl_lvl0>;
 				cooling-device = <&cdsp_sw 2 2>;
@@ -60,6 +65,11 @@
 
 	pm8350b-bcl-lvl1 {
 		cooling-maps {
+			vbat_gpu1 {
+				trip = <&b_bcl_lvl1>;
+				cooling-device = <&msm_gpu 4 4>;
+			};
+
 			vbat_cpu6 {
 				trip = <&b_bcl_lvl1>;
 				cooling-device = <&cpu6_isolate 1 1>;
@@ -70,11 +80,6 @@
 				cooling-device = <&cpu7_isolate 1 1>;
 			};
 
-			vbat_gpu1 {
-				trip = <&b_bcl_lvl1>;
-				cooling-device = <&msm_gpu 4 4>;
-			};
-
 			vbat_cdsp1 {
 				trip = <&b_bcl_lvl1>;
 				cooling-device = <&cdsp_sw 4 4>;
@@ -101,6 +106,16 @@
 	pm8350c-bcl-lvl0 {
 		disable-thermal-zone;
 		cooling-maps {
+			vph_modem_l3 {
+				trip = <&c_bcl_lvl0>;
+				cooling-device = <&modem_tj 3 3>;
+			};
+
+			vph_gpu0 {
+				trip = <&c_bcl_lvl0>;
+				cooling-device = <&msm_gpu 2 2>;
+			};
+
 			vph_cpu4 {
 				trip = <&c_bcl_lvl0>;
 				cooling-device = <&cpu4_isolate 1 1>;
@@ -111,11 +126,6 @@
 				cooling-device = <&cpu5_isolate 1 1>;
 			};
 
-			vph_gpu0 {
-				trip = <&c_bcl_lvl0>;
-				cooling-device = <&msm_gpu 2 2>;
-			};
-
 			vph_cdsp0 {
 				trip = <&c_bcl_lvl0>;
 				cooling-device = <&cdsp_sw 2 2>;
@@ -126,6 +136,11 @@
 	pm8350c-bcl-lvl1 {
 		disable-thermal-zone;
 		cooling-maps {
+			vph_gpu1 {
+				trip = <&c_bcl_lvl1>;
+				cooling-device = <&msm_gpu 4 4>;
+			};
+
 			vph_cpu6 {
 				trip = <&c_bcl_lvl1>;
 				cooling-device = <&cpu6_isolate 1 1>;
@@ -136,11 +151,6 @@
 				cooling-device = <&cpu7_isolate 1 1>;
 			};
 
-			vph_gpu1 {
-				trip = <&c_bcl_lvl1>;
-				cooling-device = <&msm_gpu 4 4>;
-			};
-
 			vph_cdsp1 {
 				trip = <&c_bcl_lvl1>;
 				cooling-device = <&cdsp_sw 4 4>;
diff --git a/qcom/pm8350b.dtsi b/qcom/pm8350b.dtsi
index f92738d71ad5..84578c7d4384 100644
--- a/qcom/pm8350b.dtsi
+++ b/qcom/pm8350b.dtsi
@@ -279,7 +279,7 @@
 	};
 
 	pm8350b-bcl-lvl0 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <500>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8350b_bcl 5>;
@@ -294,7 +294,7 @@
 	};
 
 	pm8350b-bcl-lvl1 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <500>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8350b_bcl 6>;
@@ -309,7 +309,7 @@
 	};
 
 	pm8350b-bcl-lvl2 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <500>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8350b_bcl 7>;