diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index de8eac2..30dc75e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -150,7 +150,9 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 26268905472
 TARGET_FS_CONFIG_GEN := $(VENDOR_PATH)/config.fs
 
 # Fingerprint
-TARGET_SEC_FP_HAL_VARIANT := bauth
+TARGET_SEC_FP_CALL_NOTIFY_ON_CANCEL := true
+TARGET_SEC_FP_USES_PERCENTAGE_SAMPLES := true
+TARGET_SEC_FP_CALL_CANCEL_ON_ENROLL_COMPLETION := true
 
 # GPS
 USE_DEVICE_SPECIFIC_GPS := true
diff --git a/manifest.xml b/manifest.xml
index 049c1ab..3cc6381 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -26,6 +26,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.samsung.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>ISecBiometricsFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
diff --git a/msm8976.mk b/msm8976.mk
index ded1f82..6b120f7 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -138,8 +138,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service \
-    fingerprint.msm8952
+    android.hardware.biometrics.fingerprint@2.1-service.samsung
 
 # For android_filesystem_config.h
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index fb7f907..33a2cc4 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -19,6 +19,7 @@
 # Fingerprint
 /dev/vfsspi                                                     u:object_r:vfsspi_device:s0
 /data/biometrics(/.*)?                                          u:object_r:biometrics_data_file:s0
+/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.biometrics\.fingerprint@2\.1-service\.samsung u:object_r:hal_fingerprint_default_exec:s0
 
 # Graphics
 /sys/devices/virtual/lcd/panel(/.*)?                            u:object_r:sysfs_graphics:s0