diff --git a/powerhint-comet.json b/powerhint-comet.json
index bbbbf3d..bf28c03 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -274,6 +274,42 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -390,6 +426,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -399,6 +436,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -408,6 +446,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -1513,12 +1552,60 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+       "Node": "ReducePreferIdle",
+       "Duration": 3000,
+       "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "TAUClampBoost",
+      "Node": "TAPreferredIdleMaskHigh",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidValue",
       "Duration": 3000,
       "Value": "600"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 3000,
+      "Value": "119"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 3000,
+      "Value": "128"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferIdle",
+      "Duration": 3000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 96d623a..bbec9df 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -153,7 +153,7 @@
 
     <!-- Boolean indicating whether we should enable the STA current connected indoor channel
      for SAP, WFD GO, Wi-Fi Aware -->
-    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
+    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">false</bool>
 
     <!-- Boolean indicating whether we should enable the STA current connected DFS channel
          for SAP, WFD GO, Wi-Fi Aware -->