diff --git a/configs/hals.conf b/configs/hals.conf
new file mode 100644
index 0000000..20c8ca6
--- /dev/null
+++ b/configs/hals.conf
@@ -0,0 +1,3 @@
+sensors.qsh.so
+sensors.grip.so
+sensors.flicker.so
diff --git a/device.mk b/device.mk
index 4891cd7..ad5eca0 100644
--- a/device.mk
+++ b/device.mk
@@ -114,6 +114,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.opengles.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
     frameworks/native/data/etc/android.software.vulkan.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
 
+# Health
+PRODUCT_PACKAGES += \
+    android.hardware.health-service.qti \
+    android.hardware.health-service.qti_recovery
+
 # HIDL
 PRODUCT_PACKAGES += \
     libhidltransport.vendor \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index e22734d..cff0083 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <bool name="config_automatic_brightness_available">true</bool>
+    <bool name="config_unplugTurnsOnScreen">true</bool>
     <string-array name="networkAttributes" translatable="false">
         <item>wifi,1,1,1,-1,true</item>
         <item>mobile,0,0,0,-1,true</item>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 6f92468..45d190b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -587,12 +587,6 @@ vendor/lib64/libllvm-glnext.so
 vendor/lib64/libllvm-qcom.so
 vendor/lib64/libllvm-qgl.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/bin/hw/vendor.samsung.hardware.security.hermes-service
@@ -873,7 +867,6 @@ vendor/etc/sensors/config/sns_rotv.json
 vendor/etc/sensors/config/sns_tilt.json
 vendor/etc/sensors/config/sns_tilt_sw_disabled.json
 vendor/etc/sensors/config/sns_tilt_sw_enabled.json
-vendor/etc/sensors/hals.conf
 vendor/etc/sensors/sns_reg_config
 vendor/lib64/libnanopb.so
 vendor/lib64/libqsh.so
@@ -888,6 +881,9 @@ vendor/lib64/libsnsapi.so
 vendor/lib64/libsnsdiaglog.so
 vendor/lib64/libsnsutils.so
 vendor/lib64/libssc_default_listener.so
+vendor/lib64/sensors.flicker.so
+vendor/lib64/sensors.grip.so
+vendor/lib64/sensors.qsh.so
 
 # SSR
 vendor/bin/ssr_diag