diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index 8e0ec843..4cc53ba3 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -200,8 +200,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001
         },
@@ -956,35 +956,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL1",
diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json
index 1a29829b..55df6211 100644
--- a/thermal/thermal_info_config_caiman_proto.json
+++ b/thermal/thermal_info_config_caiman_proto.json
@@ -188,8 +188,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001
         },
@@ -978,35 +978,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL2",
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index a8ae0d80..92245e4f 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -189,8 +189,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001,
             "Offset": 500
@@ -933,35 +933,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL1",
diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json
index b68a2ff4..4168688f 100644
--- a/thermal/thermal_info_config_komodo_proto.json
+++ b/thermal/thermal_info_config_komodo_proto.json
@@ -221,8 +221,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001,
             "Offset": 500
@@ -1067,35 +1067,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL2",
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index bce8c545..6ebd76bf 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -179,8 +179,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001
         },
@@ -909,35 +909,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL1",
diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json
index a1d87fda..ec6f759f 100644
--- a/thermal/thermal_info_config_tokay_proto.json
+++ b/thermal/thermal_info_config_tokay_proto.json
@@ -167,8 +167,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
-            "CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
+            "Combination": ["VSYS_PWR_CAMERA", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "CombinationType":["ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
             "Coefficient": [1.0],
             "Multiplier": 0.001
         },
@@ -975,35 +975,10 @@
         }
     ],
     "PowerRails":[
-        {
-            "Name":"VSYS_PWR_MMWAVE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_MODEM",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_WLAN_BT",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
         {
             "Name":"VSYS_PWR_CAMERA",
             "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_DISPLAY",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
-        },
-        {
-            "Name":"VSYS_PWR_RFFE",
-            "PowerSampleDelay":7000,
-            "PowerSampleCount":1
+            "PowerSampleCount":15
         },
         {
             "Name":"S2M_VDD_CPUCL2",
diff --git a/thermal/vt_estimation_model_caiman.tflite b/thermal/vt_estimation_model_caiman.tflite
index 4a8e9e5a..0a7f7fbd 100644
Binary files a/thermal/vt_estimation_model_caiman.tflite and b/thermal/vt_estimation_model_caiman.tflite differ
diff --git a/thermal/vt_estimation_model_komodo.tflite b/thermal/vt_estimation_model_komodo.tflite
index 27e8be98..970a2b65 100644
Binary files a/thermal/vt_estimation_model_komodo.tflite and b/thermal/vt_estimation_model_komodo.tflite differ
diff --git a/thermal/vt_estimation_model_tokay.tflite b/thermal/vt_estimation_model_tokay.tflite
index 8ff47161..6ad2f95a 100644
Binary files a/thermal/vt_estimation_model_tokay.tflite and b/thermal/vt_estimation_model_tokay.tflite differ