diff --git a/a10/overlay/frameworks/base/core/res/res/values/config.xml b/a10/overlay/frameworks/base/core/res/res/values/config.xml
index 533568e..d419772 100644
--- a/a10/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a10/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,27 +35,4 @@
          -->
    <string translatable="false" name="config_mainBuiltInDisplayCutout">M62,0l-3.8,0l-3.9,0.2l-3.9,0.4l-4,0.8l-3.9,1.2l-3.8,1.6l-3.7,2l-3.4,2.4l-3.1,2.8l-2.9,3l-2.7,3.1l-2.6,3.1 l-2.7,2.8C12.5,28,6.2,30.3,0,30.3c-6.3,0-12.5-2.3-17.5-6.8l-2.7-2.8l-2.6-3.1l-2.7-3.1l-2.9-3l-3.2-2.8 L-35,6.2l-3.7-2l-3.8-1.6l-3.9-1.2l-4-0.8L-54.3,0.2L-58.2,0L-62,0Z @dp</string>
    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
-   <!-- If supported, are dreams enabled? (by default) -->
-   <bool name="config_dreamsEnabledByDefault">false</bool>
-   <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-   <bool name="config_displayBlanksAfterDoze">false</bool>
-   <bool name="config_dozePulsePickup">false</bool>
-   <bool name="config_supportDoubleTapWake">false</bool>
-   <bool name="config_enableBurnInProtection">true</bool>
-   <!-- 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>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-   <!-- True if the device supports system navigation keys. -->
-   <bool name="config_supportSystemNavigationKeys">true</bool>
-   <!-- Limit for the number of face templates per user -->
-   <integer name="config_faceMaxTemplatesPerUser">2</integer>
 </resources>
diff --git a/a20/overlay/frameworks/base/core/res/res/values/config.xml b/a20/overlay/frameworks/base/core/res/res/values/config.xml
index 6c4bbc8..aefd788 100644
--- a/a20/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,27 +35,7 @@
          -->
    <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>
-   <!-- If supported, are dreams enabled? (by default) -->
-   <bool name="config_dreamsEnabledByDefault">false</bool>
    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-   <bool name="config_displayBlanksAfterDoze">false</bool>
-   <bool name="config_dozePulsePickup">false</bool>
    <bool name="config_supportDoubleTapWake">true</bool>
    <bool name="config_enableBurnInProtection">true</bool>
-   <!-- 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>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-   <!-- True if the device supports system navigation keys. -->
-   <bool name="config_supportSystemNavigationKeys">true</bool>
-   <!-- Limit for the number of face templates per user -->
-   <integer name="config_faceMaxTemplatesPerUser">2</integer>
 </resources>
diff --git a/a20e/overlay/frameworks/base/core/res/res/values/config.xml b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
index c62ff96..bdd86d1 100644
--- a/a20e/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
@@ -1,21 +1,5 @@
 <resources>
-   <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
    <bool name="config_displayBlanksAfterDoze">true</bool>
-   <bool name="config_dozePulsePickup">false</bool>
    <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>
-   <bool name="config_supportDoubleTapWake">false</bool>
-   <bool name="config_enableBurnInProtection">false</bool>
-   <!-- 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>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
 </resources>
diff --git a/a30/overlay/frameworks/base/core/res/res/values/config.xml b/a30/overlay/frameworks/base/core/res/res/values/config.xml
index 0bf7342..5d041dd 100644
--- a/a30/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30/overlay/frameworks/base/core/res/res/values/config.xml
@@ -36,10 +36,7 @@
    <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -67.42857142857143 V 30.85714285714286 H 67.42857142857143 V 0 H 0 Z @dp</string>
    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
    <!-- If supported, are dreams enabled? (by default) -->
-   <bool name="config_dreamsEnabledByDefault">false</bool>
    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-   <bool name="config_displayBlanksAfterDoze">false</bool>
-   <bool name="config_dozePulsePickup">false</bool>
    <bool name="config_supportDoubleTapWake">true</bool>
    <bool name="config_enableBurnInProtection">true</bool>
    <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
@@ -49,21 +46,5 @@
    <!-- The type of the light sensor to be used by the display framework for things like
          auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
    <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</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>
    <bool name="config_automatic_brightness_available">true</bool>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-   <!-- True if the device supports system navigation keys. -->
-   <bool name="config_supportSystemNavigationKeys">true</bool>
-   <!-- Limit for the number of face templates per user -->
-   <integer name="config_faceMaxTemplatesPerUser">2</integer>
 </resources>
diff --git a/a30s/overlay/frameworks/base/core/res/res/values/config.xml b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
index 9f1f7e7..98bc3ed 100644
--- a/a30s/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,11 +35,7 @@
          -->
    <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -67.42857142857143 V 30.85714285714286 H 67.42857142857143 V 0 H 0 Z @dp</string>
    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
-   <!-- If supported, are dreams enabled? (by default) -->
-   <bool name="config_dreamsEnabledByDefault">false</bool>
    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-   <bool name="config_displayBlanksAfterDoze">false</bool>
-   <bool name="config_dozePulsePickup">false</bool>
    <bool name="config_supportDoubleTapWake">true</bool>
    <bool name="config_enableBurnInProtection">true</bool>
    <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
@@ -49,27 +45,5 @@
    <!-- The type of the light sensor to be used by the display framework for things like
          auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
    <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</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>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-   <!-- True if the device supports system navigation keys. -->
-   <bool name="config_supportSystemNavigationKeys">true</bool>
-   <!-- Limit for the number of face templates per user -->
-   <integer name="config_faceMaxTemplatesPerUser">2</integer>
    <bool name="config_automatic_brightness_available">true</bool>
-       <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
-    <integer-array name="config_udfps_sensor_props">
-        <item>540</item>
-        <item>2145</item>
-        <item>114</item>
-    </integer-array>
 </resources>
diff --git a/a30s/vendor.prop b/a30s/vendor.prop
index 4d063be..4220aa1 100644
--- a/a30s/vendor.prop
+++ b/a30s/vendor.prop
@@ -1,2 +1,9 @@
 ## Bluetooth
 bluetooth.device.default_name=Galaxy A30s
+
+# Fingerprint
+ro.vendor.fingerprint.force_calibrate=true
+ro.vendor.fingerprint.supports_gestures=false
+ro.vendor.fingerprint.type=udfps
+ro.vendor.fingerprint.sensor_location=540|2145|114
+ro.vendor.fingerprint.request_touch_event=true
diff --git a/a40/overlay/frameworks/base/core/res/res/values/config.xml b/a40/overlay/frameworks/base/core/res/res/values/config.xml
index de0579f..98bc3ed 100644
--- a/a40/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a40/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,11 +35,7 @@
          -->
    <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -67.42857142857143 V 30.85714285714286 H 67.42857142857143 V 0 H 0 Z @dp</string>
    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
-   <!-- If supported, are dreams enabled? (by default) -->
-   <bool name="config_dreamsEnabledByDefault">false</bool>
    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-   <bool name="config_displayBlanksAfterDoze">false</bool>
-   <bool name="config_dozePulsePickup">false</bool>
    <bool name="config_supportDoubleTapWake">true</bool>
    <bool name="config_enableBurnInProtection">true</bool>
    <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
@@ -49,21 +45,5 @@
    <!-- The type of the light sensor to be used by the display framework for things like
          auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
    <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</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>
-   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
-   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
-   <!-- Specify if the fingerprint hardware support gestures-->
-   <bool name="config_fingerprintSupportsGestures">true</bool>
-   <!-- True if the device supports system navigation keys. -->
-   <bool name="config_supportSystemNavigationKeys">true</bool>
-   <!-- Limit for the number of face templates per user -->
-   <integer name="config_faceMaxTemplatesPerUser">2</integer>
    <bool name="config_automatic_brightness_available">true</bool>
 </resources>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 1cc2146..9ed0762 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -128,7 +128,7 @@ PRODUCT_PACKAGES += \
 TARGET_BOARD_HAS_FP ?= true
 ifeq ($(TARGET_BOARD_HAS_FP), true)
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.3-service.samsung
+    android.hardware.biometrics.fingerprint-service.samsung
 endif
 
 # Gatekeeper
diff --git a/universal7885-common/vendor.prop b/universal7885-common/vendor.prop
index 21aa70c..4561f07 100644
--- a/universal7885-common/vendor.prop
+++ b/universal7885-common/vendor.prop
@@ -59,3 +59,7 @@ ro.config.vc_call_vol_steps=8
 ro.vendor.vibrator_hal.click_duration=75
 ro.vendor.vibrator_hal.tick_duration=65
 ro.vendor.vibrator_hal.texture_tick_duration=60
+
+# Fingerprint
+ro.vendor.fingerprint.type?=rear
+ro.vendor.fingerprint.supports_gestures?=true