diff --git a/common.mk b/common.mk
index 1d29134..b537d26 100644
--- a/common.mk
+++ b/common.mk
@@ -204,6 +204,8 @@ PRODUCT_PACKAGES += \
 
 # Health
 PRODUCT_PACKAGES += \
+    android.hardware.health-service.qti \
+    android.hardware.health-service.qti_recovery \
     android.hardware.health@1.0.vendor \
     android.hardware.health@2.1.vendor
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 64db6fe..9b05c1f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -868,12 +868,6 @@ vendor/lib64/libllvm-qgl.so
 # Graphics (Vulkan)
 vendor/lib64/hw/vulkan.adreno.so
 
-# Health
-vendor/bin/hw/vendor.samsung.hardware.health-service
-vendor/etc/init/vendor.samsung.hardware.health-service.rc
-vendor/etc/vintf/manifest/vendor.samsung.hardware.health-service.xml
-vendor/lib64/vendor.samsung.hardware.health-V1-ndk.so
-
 # Hermes
 vendor/bin/hermesd
 vendor/etc/init/hermesd.rc
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index fdfaa07..597be16 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -78,7 +78,6 @@
 /(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.2-service                                      u:object_r:hal_nfc_default_exec:s0
 /(vendor|system/vendor)/bin/hw/sehradiomanager                                                               u:object_r:sehradiomanager_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.camera\.provider-service_64                        u:object_r:hal_camera_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.health-service                                     u:object_r:hal_health_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.hyper-service                                      u:object_r:hal_hyper_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.thermal@1\.0-service                               u:object_r:hal_thermal_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.vibrator-service                                   u:object_r:hal_vibrator_default_exec:s0
diff --git a/sepolicy/vendor/hal_health_default.te b/sepolicy/vendor/hal_health_default.te
index 4078dfc..0c5b4d2 100644
--- a/sepolicy/vendor/hal_health_default.te
+++ b/sepolicy/vendor/hal_health_default.te
@@ -1,14 +1,3 @@
-# Allow health HAL to read/write app_efs_file
-allow hal_health_default app_efs_file:dir rw_dir_perms;
-allow hal_health_default app_efs_file:file create_file_perms;
-
-# Allow health HAL to read/write battery_efs_file
-allow hal_health_default battery_efs_file:dir create_dir_perms;
-allow hal_health_default battery_efs_file:file create_file_perms;
-
-# Allow health HAL to search efs_file
-allow hal_health_default efs_file:dir search;
-
 # Allow health HAL to read/write vendor_sysfs_battery
 r_dir_file(hal_health_default, vendor_sysfs_battery)
 allow hal_health_default vendor_sysfs_battery:file w_file_perms;