diff --git a/common.mk b/common.mk
index 3a0ed1af..9eb86194 100644
--- a/common.mk
+++ b/common.mk
@@ -188,8 +188,7 @@ PRODUCT_COPY_FILES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl-qti:64 \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 # Init
 PRODUCT_PACKAGES += \
diff --git a/init/etc/init.oneplus.usb.rc b/init/etc/init.oneplus.usb.rc
index 306014ce..f84d05b6 100644
--- a/init/etc/init.oneplus.usb.rc
+++ b/init/etc/init.oneplus.usb.rc
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-on charger
+on property:init.svc.vendor.charger=running
     mkdir /dev/usb-ffs 0770 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mkdir /config/usb_gadget/g1 0770 shell shell
diff --git a/init/etc/init.qcom.rc b/init/etc/init.qcom.rc
index e4440e27..512773a5 100644
--- a/init/etc/init.qcom.rc
+++ b/init/etc/init.qcom.rc
@@ -818,13 +818,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
@@ -903,7 +896,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/etc/init.target.rc b/init/etc/init.target.rc
index 753a21bd..b6e6b58b 100644
--- a/init/etc/init.target.rc
+++ b/init/etc/init.target.rc
@@ -210,7 +210,7 @@ on property:init.svc.vendor.per_mgr=running
 on property:sys.shutdown.requested=*
     stop vendor.per_proxy
 
-on charger
+on property:init.svc.vendor.charger=running
     start vendor.power_off_alarm
     setprop sys.usb.controller a600000.dwc3
     setprop sys.usb.configfs 1