diff --git a/device.mk b/device.mk
index 7517263..97ecc0a 100644
--- a/device.mk
+++ b/device.mk
@@ -240,8 +240,7 @@ PRODUCT_COPY_FILES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 # HIDL
 PRODUCT_PACKAGES += \
diff --git a/init/init.qcom.rc b/init/init.qcom.rc
index 4636c69..18a8df9 100644
--- a/init/init.qcom.rc
+++ b/init/init.qcom.rc
@@ -752,13 +752,6 @@ service profiler_daemon /system/bin/profiler_daemon
     group root
     disabled
 
-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 service vendor.ssr_diag /system/vendor/bin/ssr_diag
     class late_start
     user system
@@ -837,7 +830,7 @@ service esepmdaemon /system/vendor/bin/esepmdaemon
     user system
     group nfc
 
-on charger
+on property:init.svc.vendor.charger=running
     setprop persist.sys.usb.config mass_storage
     start qcom-post-boot
 
diff --git a/init/init.target.rc b/init/init.target.rc
index 2263cfd..898cdf5 100644
--- a/init/init.target.rc
+++ b/init/init.target.rc
@@ -125,7 +125,7 @@ on property:vendor.display.lcd_density=640
 on boot && property:persist.vendor.usb.controller.default=*
     setprop vendor.usb.controller ${persist.vendor.usb.controller.default}
 
-on charger
+on property:init.svc.vendor.charger=running
     start vendor.power_off_alarm
     setprop sys.usb.controller 4e00000.dwc3
     setprop sys.usb.configfs 1
diff --git a/system_ext.prop b/system_ext.prop
index 964c383..3933c58 100644
--- a/system_ext.prop
+++ b/system_ext.prop
@@ -8,9 +8,6 @@ debug.sf.enable_hwc_vds=1
 # CNE
 persist.vendor.cne.feature=1
 
-# Charging
-ro.charger.enable_suspend=1
-
 # DPM
 persist.vendor.dpm.feature=11