diff --git a/configs/vintf/framework_compatibility_matrix.xml b/configs/vintf/framework_compatibility_matrix.xml
index a1a4aff..9d66ca4 100644
--- a/configs/vintf/framework_compatibility_matrix.xml
+++ b/configs/vintf/framework_compatibility_matrix.xml
@@ -55,6 +55,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.sensors</name>
+        <version>1</version>
+        <interface>
+            <name>ISensors</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.vibrator</name>
         <version>2</version>
diff --git a/device.mk b/device.mk
index d6b5b1d..83bcafd 100644
--- a/device.mk
+++ b/device.mk
@@ -369,11 +369,12 @@ PRODUCT_COPY_FILES += \
     $(call find-copy-subdir-files,*,$(LOCAL_PATH)/configs/seccomp_policy,$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy)
 
 # Sensors
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-service.samsung-multihal
+
 PRODUCT_PACKAGES += \
     android.frameworks.sensorservice@1.0.vendor \
-    android.hardware.sensors@1.0.vendor \
-    android.hardware.sensors@2.0-ScopedWakelock.vendor \
-    android.hardware.sensors@2.1.vendor
+    android.hardware.sensors@1.0.vendor
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
@@ -386,7 +387,8 @@ PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
     hardware/google/interfaces \
     hardware/google/pixel \
-    hardware/mediatek
+    hardware/mediatek \
+    hardware/samsung_ext
 
 # Thermal
 PRODUCT_PACKAGES += \
diff --git a/extract-files.sh b/extract-files.sh
index 37ede6f..a88ae1c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -58,10 +58,6 @@ function blob_fixup {
         vendor/bin/hw/android.hardware.media.c2@1.2-mediatek|vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b)
             "${PATCHELF}" --add-needed "libstagefright_foundation-v33.so" "${2}"
             ;;
-        vendor/bin/hw/android.hardware.sensors@2.0-service.multihal)
-            "$PATCHELF" --replace-needed libhidlbase.so libhidlbase-v31.so "${2}"
-            "$PATCHELF" --replace-needed libutils.so libutils-v32.so "$2"
-            ;;
         vendor/bin/hw/android.hardware.wifi@1.0-service-lazy)
             "$PATCHELF" --replace-needed "libwifi-hal.so" "libwifi-hal-mtk.so" "${2}"
             ;;
@@ -73,6 +69,9 @@ function blob_fixup {
         vendor/bin/hw/vendor.samsung.hardware.hyper-service)
             "$PATCHELF" --replace-needed liblog.so liblog-v31.so "${2}"
             ;;
+        vendor/lib*/sensors.inputvirtual.so|vendor/lib*/sensors.sensorhub.so)
+            "$PATCHELF" --replace-needed libutils.so libutils-v31.so "$2"
+            ;;
         vendor/lib64/libwifi-hal-mtk.so)
             "$PATCHELF" --set-soname libwifi-hal-mtk.so "${2}"
             ;;
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7ad2ac7..0ccc969 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1473,8 +1473,6 @@ vendor/lib64/libfloatingfeature.so
 vendor/lib64/libsecnativefeature.so
 
 # Sensors
-vendor/bin/hw/android.hardware.sensors@2.0-service.multihal
-vendor/etc/init/android.hardware.sensors@2.0-service-multihal.rc
 vendor/lib/librgbwlightsensor.so
 vendor/lib/libsensorndkbridge.so
 vendor/lib/sensors.grip.so
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 494b92f..b258b28 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -69,6 +69,7 @@
 # Sensors
 /dev/shub_data_injection                                            u:object_r:shub_device:s0
 /dev/shub_sensorhub                                                 u:object_r:shub_device:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.sensors-service\.samsung-multihal         u:object_r:hal_sensors_default_exec:s0
 
 # Snap
 /(vendor|system/vendor)/bin/snap_utility_64					        u:object_r:snap_utility_exec:s0
diff --git a/sepolicy/vendor/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te
index 6999044..8e1dab2 100644
--- a/sepolicy/vendor/hal_sensors_default.te
+++ b/sepolicy/vendor/hal_sensors_default.te
@@ -11,6 +11,7 @@ allow hal_sensors_default iio_device:chr_file r_file_perms;
 allow hal_sensors_default sysfs_ss_writable:dir r_dir_perms;
 allow hal_sensors_default sysfs_ss_writable:file rw_file_perms;
 allow hal_sensors_default sysfs_ski_display_writable:file r_file_perms;
+allow hal_sensors_default system_server:binder call;
 
 r_dir_file(hal_sensors_default, sysfs_iio_devices)