diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index 348c43a..3a4814c 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -148,3 +148,10 @@ on post-fs-data
     setprop wifi.direct.interface p2p-dev-wlan0
     setprop wifi.aware.interface aware_nmi0
 
+# 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-felix.mk b/device-felix.mk
index c41084e..5b3d6ee 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -246,3 +246,7 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/felix/device_framework
 # 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 1600b97..23d4600 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -168,16 +168,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",
@@ -516,12 +506,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -540,12 +524,6 @@
       "Duration": 1000,
       "Value": "848000"
     },
-    {
-      "PowerHint": "LAUNCH_120FPS",
-      "Node": "SFUClampBoost",
-      "Duration": 1000,
-      "Value": "159"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
@@ -562,12 +540,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_GPU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",