diff --git a/src/mainboard/google/brya/variants/pujjocento/overridetree.cb b/src/mainboard/google/brya/variants/pujjocento/overridetree.cb
index 9c913d2ae4..e362c2ddaf 100644
--- a/src/mainboard/google/brya/variants/pujjocento/overridetree.cb
+++ b/src/mainboard/google/brya/variants/pujjocento/overridetree.cb
@@ -161,187 +161,156 @@ chip soc/intel/alderlake
 		device ref dtt on
 			chip drivers/intel/dptf
 				## sensor information
-				register "options.tsr[0].desc" = ""DDR""
-				register "options.tsr[1].desc" = ""charger""
-				register "options.tsr[2].desc" = ""ambient""
-
-				## Active Policy
-				register "policies.active" = "{
-					[0] = {
-						.target = DPTF_CPU,
-						.thresholds = {
-								TEMP_PCT(70, 100),
-								TEMP_PCT(60, 65),
-								TEMP_PCT(42, 60),
-								TEMP_PCT(39, 55),
-								TEMP_PCT(38, 50),
-								TEMP_PCT(35, 43),
-								TEMP_PCT(31, 30),
-						}
-					},
-					[1] = {
-						.target = DPTF_TEMP_SENSOR_0,
-						.thresholds = {
-								TEMP_PCT(60, 100),
-								TEMP_PCT(55, 65),
-								TEMP_PCT(52, 60),
-								TEMP_PCT(50, 55),
-								TEMP_PCT(48, 50),
-								TEMP_PCT(45, 43),
-								TEMP_PCT(41, 30),
-						}
-					}
-				}"
-
+				register "options.tsr[0].desc" = ""CPU_VR""
+				register "options.tsr[1].desc" = ""CPU""
+				register "options.tsr[2].desc" = ""Ambient""
+				register "options.tsr[3].desc" = ""Charger""
 				## Passive Policy
 				register "policies.passive" = "{
-					[0] = DPTF_PASSIVE(CPU,         CPU,           95, 5000),
-					[1] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_0, 70, 5000),
-					[2] = DPTF_PASSIVE(CHARGER,     TEMP_SENSOR_1, 70, 5000),
-					[3] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_2, 70, 5000),
+					[0] = DPTF_PASSIVE(CPU,         CPU,           85, 4000),
+					[1] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_0, 85, 4000),
+					[2] = DPTF_PASSIVE(CPU,     TEMP_SENSOR_1, 85, 4000),
+					[3] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_2, 85, 4000),
+					[4] = DPTF_PASSIVE(CHARGER,         TEMP_SENSOR_3, 85, 4000),
 				}"
 
 				## Critical Policy
 				register "policies.critical" = "{
-					[0] = DPTF_CRITICAL(CPU,               100, SHUTDOWN),
-					[1] = DPTF_CRITICAL(TEMP_SENSOR_0,     95, SHUTDOWN),
-					[2] = DPTF_CRITICAL(TEMP_SENSOR_1,     95, SHUTDOWN),
-					[3] = DPTF_CRITICAL(TEMP_SENSOR_2,     95, SHUTDOWN),
+					[0] = DPTF_CRITICAL(TEMP_SENSOR_1,     90, SHUTDOWN),
+					[1] = DPTF_CRITICAL(TEMP_SENSOR_2,     90, SHUTDOWN),
 				}"
 
 				register "controls.power_limits" = "{
 					.pl1 = {
-						.min_power = 5000,
-						.max_power = 6000,
+						.min_power = 6000,
+						.max_power = 13000,
 						.time_window_min = 28 * MSECS_PER_SEC,
-						.time_window_max = 28 * MSECS_PER_SEC,
-						.granularity = 500
+						.time_window_max = 32 * MSECS_PER_SEC,
+						.granularity = 200
 					},
 					.pl2 = {
 						.min_power = 25000,
 						.max_power = 25000,
-						.time_window_min = 32 * MSECS_PER_SEC,
+						.time_window_min = 28 * MSECS_PER_SEC,
 						.time_window_max = 32 * MSECS_PER_SEC,
-						.granularity = 500
+						.granularity = 1000
 					}
 				}"
 
 				## Charger Performance Control (Control, mA)
 				register "controls.charger_perf" = "{
-					[0] = { 255, 1700 },
-					[1] = {  24, 1500 },
+					[0] = { 255, 4700 },
+					[1] = {  40, 2500 },
 					[2] = {  16, 1000 },
 					[3] = {   8,  500 }
 				}"
 
-				## Fan Performance Control (Percent, Speed, Noise, Power)
-				register "controls.fan_perf" = "{
-					[0] = { 100, 6000, 220, 2200, },
-					[1] = {  92, 5500, 180, 1800, },
-					[2] = {  85, 5000, 145, 1450, },
-					[3] = {  70, 4400, 115, 1150, },
-					[4] = {  56, 3900,  90,  900, },
-					[5] = {  45, 3300,  55,  550, },
-					[6] = {  38, 3000,  30,  300, },
-					[7] = {  33, 2900,  15,  150, },
-					[8] = {  10,  800,  10,  100, },
-					[9] = {   0,    0,   0,   50, }
-				}"
-
-				## Fan options
-				register "options.fan.fine_grained_control" = "true"
-				register "options.fan.step_size" = "2"
-
 				device generic 0 on
 					probe THERMAL_SOLUTION THERMAL_SOLUTION_6W
 				end
 			end
 			chip drivers/intel/dptf
 				## sensor information
-				register "options.tsr[0].desc" = ""DDR""
-				register "options.tsr[1].desc" = ""charger""
-				register "options.tsr[2].desc" = ""ambient""
+				register "options.tsr[0].desc" = ""CPU_VR""
+				register "options.tsr[1].desc" = ""CPU""
+				register "options.tsr[2].desc" = ""Ambient""
+				register "options.tsr[3].desc" = ""Charger""
 
 				## Active Policy
 				register "policies.active" = "{
 					[0] = {
-						.target = DPTF_CPU,
+						.target = DPTF_TEMP_SENSOR_0,
 						.thresholds = {
-								TEMP_PCT(70, 100),
-								TEMP_PCT(60, 65),
-								TEMP_PCT(42, 58),
-								TEMP_PCT(39, 53),
-								TEMP_PCT(38, 47),
-								TEMP_PCT(35, 43),
-								TEMP_PCT(31, 30),
+								TEMP_PCT(85, 90),
+								TEMP_PCT(44, 61),
+								TEMP_PCT(42, 54),
+								TEMP_PCT(40, 45),
+								TEMP_PCT(38, 38),
+								TEMP_PCT(36, 25),
 						}
 					},
 					[1] = {
-						.target = DPTF_TEMP_SENSOR_0,
+						.target = DPTF_TEMP_SENSOR_1,
 						.thresholds = {
-								TEMP_PCT(60, 100),
-								TEMP_PCT(55, 65),
-								TEMP_PCT(52, 58),
-								TEMP_PCT(50, 53),
-								TEMP_PCT(48, 47),
-								TEMP_PCT(45, 43),
-								TEMP_PCT(41, 30),
+								TEMP_PCT(75, 90),
+								TEMP_PCT(70, 80),
+								TEMP_PCT(65, 70),
+								TEMP_PCT(60, 60),
+								TEMP_PCT(55, 50),
+								TEMP_PCT(50, 40),
+						}
+					},
+					[2] = {
+						.target = DPTF_TEMP_SENSOR_2,
+						.thresholds = {
+								TEMP_PCT(90, 90),
+								TEMP_PCT(85, 80),
+								TEMP_PCT(75, 70),
+								TEMP_PCT(70, 50),
+						}
+					},
+					[3] = {
+						.target = DPTF_TEMP_SENSOR_3,
+						.thresholds = {
+								TEMP_PCT(80, 90),
+								TEMP_PCT(75, 80),
+								TEMP_PCT(70, 70),
+								TEMP_PCT(65, 50),
 						}
 					}
 				}"
 
 				## Passive Policy
 				register "policies.passive" = "{
-					[0] = DPTF_PASSIVE(CPU,         CPU,           95, 5000),
-					[1] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_0, 70, 5000),
-					[2] = DPTF_PASSIVE(CHARGER,     TEMP_SENSOR_1, 70, 5000),
-					[3] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_2, 70, 5000),
+					[0] = DPTF_PASSIVE(CPU,         CPU,           85, 6000),
+					[1] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_0, 85, 6000),
+					[2] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_1, 85, 6000),
+					[3] = DPTF_PASSIVE(CPU,         TEMP_SENSOR_2, 85, 6000),
+					[4] = DPTF_PASSIVE(CHARGER,     TEMP_SENSOR_3, 85, 6000),
 				}"
 
 				## Critical Policy
 				register "policies.critical" = "{
-					[0] = DPTF_CRITICAL(CPU,               100, SHUTDOWN),
-					[1] = DPTF_CRITICAL(TEMP_SENSOR_0,     95, SHUTDOWN),
-					[2] = DPTF_CRITICAL(TEMP_SENSOR_1,     95, SHUTDOWN),
-					[3] = DPTF_CRITICAL(TEMP_SENSOR_2,     95, SHUTDOWN),
+					[0] = DPTF_CRITICAL(TEMP_SENSOR_1,     90, SHUTDOWN),
+					[1] = DPTF_CRITICAL(TEMP_SENSOR_2,     90, SHUTDOWN),
 				}"
 
 				register "controls.power_limits" = "{
 					.pl1 = {
-						.min_power = 14000,
-						.max_power = 15000,
+						.min_power = 15000,
+						.max_power = 22000,
 						.time_window_min = 28 * MSECS_PER_SEC,
-						.time_window_max = 28 * MSECS_PER_SEC,
-						.granularity = 500
+						.time_window_max = 32 * MSECS_PER_SEC,
+						.granularity = 200
 					},
 					.pl2 = {
 						.min_power = 35000,
 						.max_power = 35000,
-						.time_window_min = 32 * MSECS_PER_SEC,
+						.time_window_min = 28 * MSECS_PER_SEC,
 						.time_window_max = 32 * MSECS_PER_SEC,
-						.granularity = 500
+						.granularity = 1000
 					}
 				}"
 
 				## Charger Performance Control (Control, mA)
 				register "controls.charger_perf" = "{
-					[0] = { 255, 1700 },
-					[1] = {  24, 1500 },
+					[0] = { 255, 4700 },
+					[1] = {  40, 2500 },
 					[2] = {  16, 1000 },
 					[3] = {   8,  500 }
 				}"
 
 				## Fan Performance Control (Percent, Speed, Noise, Power)
 				register "controls.fan_perf" = "{
-					[0] = { 100, 6000, 220, 2200, },
-					[1] = {  92, 5500, 180, 1800, },
-					[2] = {  85, 5000, 145, 1450, },
-					[3] = {  70, 4400, 115, 1150, },
-					[4] = {  56, 3900,  90,  900, },
-					[5] = {  45, 3300,  55,  550, },
-					[6] = {  38, 3000,  30,  300, },
-					[7] = {  33, 2900,  15,  150, },
-					[8] = {  10,  800,  10,  100, },
+					[0] = { 100, 4400, 220, 1640, },
+					[1] = {  90, 4100, 220, 1640, },
+					[2] = {  80, 3800, 180, 1310, },
+					[3] = {  70, 3500, 145, 1030, },
+					[4] = {  60, 3100, 115,  765, },
+					[5] = {  50, 2800,  90,  545, },
+					[6] = {  40, 2400,  55,  365, },
+					[7] = {  30, 1900,  30,  220, },
+					[8] = {  20, 1400,  15,  120, },
 					[9] = {   0,    0,   0,   50, }
 				}"