diff --git a/device.mk b/device.mk
index 79d0e9d..b92b33a 100644
--- a/device.mk
+++ b/device.mk
@@ -228,9 +228,9 @@ PRODUCT_PACKAGES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-impl.recovery \
-    android.hardware.health@2.1-service
+    android.hardware.health@2.1.vendor \
+    android.hardware.health-service.qti \
+    android.hardware.health-service.qti_recovery
 
 # HIDL
 PRODUCT_PACKAGES += \
diff --git a/properties/system.prop b/properties/system.prop
index ceb5b3f..2d34681 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -6,9 +6,6 @@ persist.audio.fluence.voicerec=true
 persist.audio.fluence.speaker=true
 persist.audio.fluence.voicecomm=true
 
-# Charger
-ro.charger.enable_suspend=true
-
 # CNE
 persist.vendor.cne.feature=1
 
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index a5c3453..f283a0e 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1348,13 +1348,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
@@ -1424,7 +1417,7 @@ service vendor.LKCore-rel /vendor/bin/LKCore
     user system
     group system log diag
 
-on charger
+on property:init.svc.vendor.charger=running
     setprop persist.sys.usb.config mass_storage
     start qcom-post-boot
 
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 990acaa..b4a668e 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -172,7 +172,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
     mount_all /vendor/etc/charger_fstab.qti --early
     write /sys/kernel/boot_adsp/boot 1
     #restart charger after ADSP is out of reset