diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index 31ff159..1437c49 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -66,3 +66,11 @@ on property:persist.vendor.se.ese2.mode=ctsmode
 on property:sys.retaildemo.enabled=1
     setprop persist.vendor.charge.stop.level 35
     setprop persist.vendor.charge.start.level 30
+
+# 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-oriole.mk b/device-oriole.mk
index 0c28cc1..0fccfe3 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -259,3 +259,7 @@ PRODUCT_COPY_FILES := \
     $(PRODUCT_COPY_FILES)
 
 PRODUCT_RESTRICT_VENDOR_FILES := false
+
+# Enable adpf cpu hint session for SurfaceFlinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_adpf_cpu_hint=true
diff --git a/device-raven.mk b/device-raven.mk
index 40a8dc6..466e07a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -272,3 +272,7 @@ PRODUCT_COPY_FILES := \
     $(PRODUCT_COPY_FILES)
 
 PRODUCT_RESTRICT_VENDOR_FILES := false
+
+# Enable adpf cpu hint session for SurfaceFlinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    debug.sf.enable_adpf_cpu_hint=true
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index b3da82b..3df86a4 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -157,16 +157,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SFUClampBoost",
-      "Path": "/proc/vendor_sched/sf_uclamp_min",
-      "Values": [
-        "161",
-        "85",
-        "39"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
@@ -484,12 +474,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -508,12 +492,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index ab0fc4e..d3bd49c 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -156,16 +156,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "SFUClampBoost",
-      "Path": "/proc/vendor_sched/sf_uclamp_min",
-      "Values": [
-        "161",
-        "85",
-        "39"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
@@ -483,12 +473,6 @@
     }
   ],
   "Actions": [
-    {
-      "PowerHint": "INTERACTION",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "UClampThreshold",
@@ -501,12 +485,6 @@
       "Duration": 5000,
       "Value": "0"
     },
-    {
-      "PowerHint": "LAUNCH_120FPS",
-      "Node": "SFUClampBoost",
-      "Duration": 1000,
-      "Value": "161"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
@@ -518,12 +496,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_120FPS"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "SFUClampBoost",
-      "Duration": 5000,
-      "Value": "85"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",