diff --git a/BoardConfig.mk b/BoardConfig.mk
index f402aa1..cd3301a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -10,9 +10,6 @@ TARGET_KERNEL_CONFIG += a20.config
 # Display
 TARGET_SCREEN_DENSITY := 280
 
-# Fingerprint
-TARGET_SEC_FP_HAS_FINGERPRINT_GESTURES := true
-
 # Partitions
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528 # 55MB
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4303355904
diff --git a/device.mk b/device.mk
index 5c8d689..4cad3e5 100644
--- a/device.mk
+++ b/device.mk
@@ -20,7 +20,7 @@ TARGET_SCREEN_WIDTH := 720
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.3-service.samsung
+    android.hardware.biometrics.fingerprint-service.samsung
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f31f59b..609b47e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -29,9 +29,6 @@
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-
    <!-- The bounding path of the cutout region of the main built-in display.
          Must either be empty if there is no cutout region, or a string that is parsable by
          {@link android.util.PathParser}.
@@ -49,12 +46,4 @@
          -->
    <string name="config_mainBuiltInDisplayCutout">M 0,0 H -22.42857142857143 V 30.85714285714286 H 22.42857142857143 V 0 H 0 Z @dp</string>
    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
-
-    <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
-         when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
-         where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
-         and Strength as defined in Authenticators.java -->
-    <string-array name="config_biometric_sensors" translatable="false" >
-        <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
-    </string-array>
 </resources>
diff --git a/vendor.prop b/vendor.prop
index 1742bd4..fcec9b6 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,2 +1,6 @@
 # Bluetooth
 bluetooth.device.default_name=Galaxy A20
+
+# Fingerprint
+ro.vendor.fingerprint.type=rear
+ro.vendor.fingerprint.supports_gestures=true