diff --git a/device-oriole.mk b/device-oriole.mk
index 8ff3a1b..d0da164 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -132,6 +132,9 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
 
+# Media Performance Class 12
+PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 5c3e7c9..8f79c35 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -882,7 +882,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -897,13 +897,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -913,7 +907,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -988,7 +982,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -1013,7 +1007,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index c60da21..fa7398d 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -555,7 +555,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -570,13 +570,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -586,7 +580,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -661,7 +655,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -686,7 +680,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 3050df4..fc23f6a 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -882,7 +882,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8500,
+                10500,
                 "NAN",
                 "NAN"
             ],
@@ -897,13 +897,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -913,7 +907,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -938,7 +932,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9000,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -988,7 +982,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7500,
+                8500,
                 "NAN",
                 "NAN"
             ],
@@ -1013,7 +1007,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8000,
+                9000,
                 "NAN",
                 "NAN"
             ],