diff --git a/qcom/yupik-qrd.dtsi b/qcom/yupik-qrd.dtsi
index 55329158acf7..20f36edecfff 100644
--- a/qcom/yupik-qrd.dtsi
+++ b/qcom/yupik-qrd.dtsi
@@ -273,20 +273,20 @@
 				(QMI_MODEM_INST_ID+QMI_PA)>;
 		trips {
 			sub6_pa1_trip0: sub6-pa1-trip0 {
-				temperature = <43000>;
+				temperature = <46000>;
 				hysteresis = <4000>;
 				type = "passive";
 			};
 
 			sub6_pa1_trip1: sub6-pa1-trip1 {
-				temperature = <45000>;
+				temperature = <47000>;
 				hysteresis = <4000>;
 				type = "passive";
 			};
 
 			sub6_pa1_trip2: sub6-pa1-trip2 {
-				temperature = <55000>;
-				hysteresis = <5000>;
+				temperature = <57000>;
+				hysteresis = <4000>;
 				type = "passive";
 			};
 		};
@@ -317,20 +317,20 @@
 				(QMI_MODEM_INST_ID+QMI_PA_1)>;
 		trips {
 			sub6_pa2_trip0: sub6-pa2-trip0 {
-				temperature = <42000>;
+				temperature = <46000>;
 				hysteresis = <4000>;
 				type = "passive";
 			};
 
 			sub6_pa2_trip1: sub6-pa2-trip1 {
-				temperature = <44000>;
+				temperature = <47000>;
 				hysteresis = <4000>;
 				type = "passive";
 			};
 
 			sub6_pa2_trip2: sub6-pa2-trip2 {
-				temperature = <55000>;
-				hysteresis = <5000>;
+				temperature = <57000>;
+				hysteresis = <4000>;
 				type = "passive";
 			};
 		};
@@ -360,30 +360,24 @@
 		thermal-sensors = <&pmk8350_adc_tm PM7325_ADC7_AMUX_THM1_100K_PU>;
 
 		trips {
-			quiet_skin_trip0: quiet-skin-trip0 {
-				temperature = <43000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
 			quiet_batt_trip0: quiet-batt-trip0 {
 				temperature = <44000>;
 				hysteresis = <2000>;
 				type = "passive";
 			};
 
-			quiet_skin_trip1: quiet-skin-trip1 {
-				temperature = <45000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
 			quiet_batt_trip1: quiet-batt-trip1 {
 				temperature = <46000>;
 				hysteresis = <2000>;
 				type = "passive";
 			};
 
+			quiet_skin_trip0: quiet-skin-trip0 {
+				temperature = <47000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
 			quiet_batt_trip2: quiet-batt-trip2 {
 				temperature = <48000>;
 				hysteresis = <2000>;
@@ -396,6 +390,12 @@
 				type = "passive";
 			};
 
+			quiet_skin_trip1: quiet-skin-trip1 {
+				temperature = <49000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
 			quiet_apc_trip: quiet-apc-trip {
 				temperature = <50000>;
 				hysteresis = <0>;
@@ -419,6 +419,12 @@
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			quiet_skin_trip2: quiet-skin-trip2 {
+				temperature = <57000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -464,7 +470,7 @@
 			};
 
 			skin-cdev2 {
-				trip = <&quiet_cx_trip>;
+				trip = <&quiet_skin_trip2>;
 				cooling-device = <&modem_skin 3 3>;
 			};
 
@@ -489,6 +495,138 @@
 			};
 		};
 	};
+
+	modem-mmw-pa1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_MMW_PA1)>;
+		trips {
+			mmw_pa1_trip0: mmw-pa1-trip0 {
+				temperature = <48000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa1_trip1: mmw-pa1-trip1 {
+				temperature = <51000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa1_trip2: mmw-pa1-trip2 {
+				temperature = <57000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			mmw_skin1_cdev0 {
+				trip = <&mmw_pa1_trip0>;
+				cooling-device = <&modem_mmw_skin1 1 1>;
+			};
+
+			mmw_skin1_cdev1 {
+				trip = <&mmw_pa1_trip1>;
+				cooling-device = <&modem_mmw_skin1 2 2>;
+			};
+
+			mmw_skin1_cdev2 {
+				trip = <&mmw_pa1_trip2>;
+				cooling-device = <&modem_mmw_skin1 3 3>;
+			};
+		};
+	};
+
+	modem-mmw-pa2-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_MMW_PA2)>;
+		trips {
+			mmw_pa2_trip0: mmw-pa2-trip0 {
+				temperature = <46000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa2_trip1: mmw-pa2-trip1 {
+				temperature = <48000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa2_trip2: mmw-pa2-trip2 {
+				temperature = <57000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			mmw_skin2_cdev0 {
+				trip = <&mmw_pa2_trip0>;
+				cooling-device = <&modem_mmw_skin2 1 1>;
+			};
+
+			mmw_skin2_cdev1 {
+				trip = <&mmw_pa2_trip1>;
+				cooling-device = <&modem_mmw_skin2 2 2>;
+			};
+
+			mmw_skin2_cdev2 {
+				trip = <&mmw_pa2_trip2>;
+				cooling-device = <&modem_mmw_skin2 3 3>;
+			};
+		};
+	};
+
+	modem-mmw-pa3-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_MMW_PA3)>;
+		trips {
+			mmw_pa3_trip0: mmw-pa3-trip0 {
+				temperature = <46000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa3_trip1: mmw-pa3-trip1 {
+				temperature = <48000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			mmw_pa3_trip2: mmw-pa3-trip2 {
+				temperature = <57000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			mmw_skin0_cdev0 {
+				trip = <&mmw_pa3_trip0>;
+				cooling-device = <&modem_mmw_skin0 1 1>;
+			};
+
+			mmw_skin0_cdev1 {
+				trip = <&mmw_pa3_trip1>;
+				cooling-device = <&modem_mmw_skin0 2 2>;
+			};
+
+			mmw_skin0_cdev2 {
+				trip = <&mmw_pa3_trip2>;
+				cooling-device = <&modem_mmw_skin0 3 3>;
+			};
+		};
+	};
 };
 
 &apps_rsc {