diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 55fb3a6..896bb4e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -47,7 +47,6 @@ MALLOC_SVELTE_FOR_LIBC32 := true
 BOARD_BATTERY_DEVICE_NAME := "battery"
 BOARD_CHARGING_CMDLINE_NAME := "androidboot.bootchg"
 BOARD_CHARGING_CMDLINE_VALUE := "true"
-WITH_LINEAGE_CHARGER := false
 
 # Dexpreopt
 ifeq ($(HOST_OS),linux)
diff --git a/msm8974.mk b/msm8974.mk
index 3c3d940..3713c53 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -89,6 +89,10 @@ PRODUCT_PACKAGES += \
     libxml2 \
     Snap
 
+# Charger
+PRODUCT_PACKAGES += \
+    charger_res_images_vendor
+
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
@@ -116,8 +120,8 @@ PRODUCT_COPY_FILES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.samsung \
+    android.hardware.health-service.samsung-recovery
 
 # HIDL
 PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
diff --git a/sepolicy/common/charger_vendor.te b/sepolicy/common/charger_vendor.te
new file mode 100644
index 0000000..e797b37
--- /dev/null
+++ b/sepolicy/common/charger_vendor.te
@@ -0,0 +1,3 @@
+allow charger_vendor device:dir r_file_perms;
+allow charger_vendor sysfs_battery:file r_file_perms;
+allow charger_vendor sysfs_battery_writable:file r_file_perms;
\ No newline at end of file
diff --git a/sepolicy/common/file.te b/sepolicy/common/file.te
index 9691ce6..9252311 100644
--- a/sepolicy/common/file.te
+++ b/sepolicy/common/file.te
@@ -3,6 +3,8 @@ type alarm_device, dev_type, mlstrustedobject;
 type proc_bt_sleep, fs_type, proc_type;
 type proc_last_kmsg, fs_type, proc_type;
 
+type sysfs_battery, sysfs_type, fs_type;
+type sysfs_battery_writable, sysfs_type, fs_type;
 type sysfs_camera, fs_type, sysfs_type;
 type sysfs_hal_pwr, fs_type, sysfs_type;
 type sysfs_iio, fs_type, sysfs_type;