diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc
index c55b27d..a8d0818 100644
--- a/conf/init.lynx.rc
+++ b/conf/init.lynx.rc
@@ -89,3 +89,11 @@ on property:vendor.device.modules.ready=1
     chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_base
     chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_diff
     chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_raw
+
+# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
+on property:sys.boot_completed=1
+    trigger override-sf-uclamp
+
+on override-sf-uclamp
+    write /proc/vendor_sched/rt_uclamp_min 0
+    write /proc/vendor_sched/sf_uclamp_min 0
diff --git a/device-lynx.mk b/device-lynx.mk
index ce5e8af..1b4c91b 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -212,3 +212,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Enable adpf cpu hint session for SurfaceFlinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_adpf_cpu_hint=true
diff --git a/powerhint.json b/powerhint.json
index ee82abe..a9c8223 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -169,16 +169,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SFUClampBoost",
-      "Path": "/proc/vendor_sched/sf_uclamp_min",
-      "Values": [
-        "159",
-        "85",
-        "39"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
@@ -497,12 +487,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -521,12 +505,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",