diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c
index 55ae2b39ac..f10cfed870 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		105
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -31,15 +34,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(70);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devtree.c b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
index 0f40aaf1b1..5bbf8a3b40 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		110
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -35,15 +38,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 15;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 10;
+		cfg->tcc_offset				= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c b/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
index a4cc362853..1197f14cc6 100644
--- a/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		105
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -30,15 +33,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(70);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 15;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 10;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/cml/devtree.c b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
index b28c9f6cdc..85b5174392 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		100
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -29,15 +32,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale		-= 50;
-		cfg->tcc_offset			= 20;
+		cfg->tcc_offset			= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale		-= 25;
-		cfg->tcc_offset			= 15;
+		cfg->tcc_offset			= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset			= 10;
+		cfg->tcc_offset			= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/kbl/devtree.c b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
index 2599db86f8..4c7394515f 100644
--- a/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		100
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -29,15 +32,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale		-= 50;
-		cfg->tcc_offset			= 20;
+		cfg->tcc_offset			= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale		-= 25;
-		cfg->tcc_offset			= 15;
+		cfg->tcc_offset			= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset			= 10;
+		cfg->tcc_offset			= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/devtree.c b/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
index 1d0176d514..c329bacffa 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		110
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -30,15 +33,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devtree.c b/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
index 5c2fc238dd..76031d0f1f 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		110
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -37,15 +40,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devtree.c b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
index 6b7d4233a0..8f6e39b066 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		100
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -38,15 +41,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
index 2bea4e81b3..7a4111dddb 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		110
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -38,15 +41,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(100);
 		break;
 	}
 
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
index 6805e32d05..08359ee7b1 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
@@ -9,6 +9,9 @@
 #include <types.h>
 #include <variants.h>
 
+#define TJ_MAX		105
+#define TCC(temp)	(TJ_MAX - temp)
+
 void devtree_update(void)
 {
 	config_t *cfg = config_of_soc();
@@ -33,15 +36,15 @@ void devtree_update(void)
 	switch (get_power_profile(PP_POWER_SAVER)) {
 	case PP_POWER_SAVER:
 		performance_scale			-= 50;
-		cfg->tcc_offset				= 30;
+		cfg->tcc_offset				= TCC(70);
 		break;
 	case PP_BALANCED:
 		performance_scale			-= 25;
-		cfg->tcc_offset				= 25;
+		cfg->tcc_offset				= TCC(80);
 		break;
 	case PP_PERFORMANCE:
 		/* Use the Intel defaults */
-		cfg->tcc_offset				= 20;
+		cfg->tcc_offset				= TCC(90);
 		break;
 	}