diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index 5a1d2abb..c001ca7c 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -12,8 +12,9 @@ TARGET_KERNEL_SOURCE := kernel/google/msm-4.14
 TARGET_NEEDS_DTBOIMAGE := true
 
 # Lineage Health
-TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE := true
-TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE := false
+TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH := /sys/class/power_supply/sm7150_bms/charge_disable
+TARGET_HEALTH_CHARGING_CONTROL_CHARGING_ENABLED := 0
+TARGET_HEALTH_CHARGING_CONTROL_CHARGING_DISABLED := 1
 
 # Manifests
 DEVICE_MANIFEST_FILE += device/google/sunfish/lineage_manifest.xml
diff --git a/init.hardware.rc b/init.hardware.rc
index 559c2242..7001cc2f 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -366,9 +366,6 @@ on early-boot
     # FG cycle count read from dumpstate + backup restore from health HAL (and pixelstats)
     chown system system /sys/class/power_supply/maxfg/cycle_counts_bins
 
-    # Adaptive charge
-    chown system system /sys/class/power_supply/battery/charge_deadline
-
     # Battery Defender
     chown system system /sys/devices/platform/soc/soc:google,charger/charge_stop_level
     chown system system /sys/devices/platform/soc/soc:google,charger/charge_start_level
diff --git a/ueventd.rc b/ueventd.rc
index 58fb69fd..cecacc40 100644
--- a/ueventd.rc
+++ b/ueventd.rc
@@ -146,3 +146,7 @@ firmware_directories /vendor/firmware_mnt/image/
 
 # socinfo
 /sys/devices/soc0           serial_number            0000    root    root
+
+# Charger
+/sys/class/power_supply/sm7150_bms charge_disable 0660 system system
+/sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm6150@0:google,bms/power_supply/sm7150_bms charge_disable 0660 system system