diff --git a/device.mk b/device.mk
index ad45f13..f81384a 100644
--- a/device.mk
+++ b/device.mk
@@ -299,6 +299,10 @@ PRODUCT_PACKAGES += \
     com.quicinc.cne \
     services-ext
 
+# Healthd
+PRODUCT_PACKAGES += \
+    chargeonlymode
+
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index a9cefdb..ec2a46a 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -184,4 +184,13 @@ LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := init.goodix.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE          := chargeonlymode
+LOCAL_MODULE_OWNER    := xiaomi
+LOCAL_MODULE_PATH     := $(TARGET_ROOT_OUT_SBIN)
+LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
+LOCAL_SRC_FILES       := sbin/chargeonlymode
+LOCAL_MODULE_TAGS     := optional
+LOCAL_MODULE_CLASS    := EXECUTABLES
 include $(BUILD_PREBUILT)
diff --git a/rootdir/root/init.qcom.rc b/rootdir/root/init.qcom.rc
index 2c5cd6d..06afa8d 100644
--- a/rootdir/root/init.qcom.rc
+++ b/rootdir/root/init.qcom.rc
@@ -1038,10 +1038,10 @@ service profiler_daemon /system/bin/profiler_daemon
     group root
     disabled
 
-service charger /charger
+service charger /sbin/chargeonlymode
     class charger
     group system graphics
-    seclabel u:r:healthd:s0
+    seclabel u:r:charger:s0
 
 service ssr_diag /system/vendor/bin/ssr_diag
     class late_start
diff --git a/rootdir/root/init.target.rc b/rootdir/root/init.target.rc
index e6153d5..e78be1d 100644
--- a/rootdir/root/init.target.rc
+++ b/rootdir/root/init.target.rc
@@ -424,6 +424,7 @@ on charger
     start hvdcp_opti
     setprop sys.usb.configfs 1
     start power_off_alarm
+    start thermal-engine
 
 #
 #service nqs /system/bin/nqs
diff --git a/rootdir/sbin/chargeonlymode b/rootdir/sbin/chargeonlymode
new file mode 100755
index 0000000..e764100
Binary files /dev/null and b/rootdir/sbin/chargeonlymode differ