diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index d1515871..9e17ac10 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -228,7 +228,7 @@
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2",
                     "VIRTUAL-SKIN-SUB-3"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -254,7 +254,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -270,7 +270,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -322,7 +322,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -393,7 +393,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -484,7 +484,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -527,6 +527,48 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -576,7 +618,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
             "Coefficient":[1, 1],
-            "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "SendCallback":true
@@ -656,7 +698,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
             "Coefficient":[1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -732,6 +774,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -788,31 +835,31 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-2",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json
index 94e8390a..3072359c 100644
--- a/thermal/thermal_info_config_caiman_proto.json
+++ b/thermal/thermal_info_config_caiman_proto.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -228,7 +228,7 @@
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2",
                     "VIRTUAL-SKIN-SUB-3"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -254,7 +254,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -270,7 +270,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -322,7 +322,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -393,7 +393,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -484,7 +484,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -527,6 +527,48 @@
                     "BindedPowerRail": "S2M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -576,7 +618,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
             "Coefficient":[1, 1],
-            "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "SendCallback":true
@@ -656,7 +698,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
             "Coefficient":[1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -732,6 +774,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -788,31 +835,31 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-2",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index 101aa476..1de469f2 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -250,7 +250,7 @@
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2",
                     "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -276,7 +276,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -292,7 +292,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -344,7 +344,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -415,7 +415,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -506,7 +506,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -549,6 +549,48 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -723,7 +765,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
             "Coefficient":[1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -799,6 +841,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -855,39 +902,39 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-2",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-4",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-5",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json
index c86c4975..95f60ca9 100644
--- a/thermal/thermal_info_config_komodo_proto.json
+++ b/thermal/thermal_info_config_komodo_proto.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -250,7 +250,7 @@
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2",
                     "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -276,7 +276,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -292,7 +292,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -344,7 +344,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -415,7 +415,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -506,7 +506,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -549,6 +549,48 @@
                     "BindedPowerRail": "S2M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -723,7 +765,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
             "Coefficient":[1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -799,6 +841,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -855,39 +902,39 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-2",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-4",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-5",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index 7835365c..33d117ca 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -205,7 +205,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -231,7 +231,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -247,7 +247,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -299,7 +299,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -370,7 +370,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -461,7 +461,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -504,6 +504,48 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -553,7 +595,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
             "Coefficient":[1, 1],
-            "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "SendCallback":true
@@ -690,7 +732,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -766,6 +808,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -822,23 +869,23 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },
diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json
index ffc8ae4a..3493a589 100644
--- a/thermal/thermal_info_config_tokay_proto.json
+++ b/thermal/thermal_info_config_tokay_proto.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"rfpa_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charging_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,7 +59,7 @@
         {
             "Name":"btmspkr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -79,7 +79,7 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -205,7 +205,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -231,7 +231,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -247,7 +247,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -299,7 +299,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -370,7 +370,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -461,7 +461,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -504,6 +504,48 @@
                     "BindedPowerRail": "S2M_VDD_CPUCL2",
                     "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S2S_VDD_G3D",
+                    "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-GPU",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[1.0],
+            "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "PIDInfo": {
+                "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+            },
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
                 }
             ]
         },
@@ -553,7 +595,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
             "Coefficient":[1, 1],
-            "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "SendCallback":true
@@ -690,7 +732,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0],
+            "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -766,6 +808,11 @@
             "Type":"CPU",
             "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
+        {
+            "Name":"thermal-gpufreq-0",
+            "Type":"GPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+        },
         {
             "Name":"chg_mdis",
             "Type":"BATTERY"
@@ -822,23 +869,23 @@
             "RecordWithThreshold": [
                 {
                     "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-0",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
                 {
                     "Name": "VIRTUAL-SKIN-SUB-1",
-                    "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 }
             ]
         },