diff --git a/manifest.xml b/manifest.xml
index fb3acd6..fada90c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,16 +19,6 @@
         </interface>
         <fqname>@6.0::IEffectsFactory/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.1::IBiometricsFingerprint/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 8b416d4..e5b8e42 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -399,14 +399,6 @@
          The default is false. -->
     <bool name="config_lidControlsSleep">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>
-
     <!-- SQLite -->
     <string name="db_default_journal_mode">MEMORY</string>
     <string name="db_default_sync_mode">OFF</string>
@@ -427,9 +419,6 @@
          2: gestures only for back, home and overview -->
     <integer name="config_navBarInteractionMode">2</integer>
 
-    <!-- Specify if the fingerprint hardware support gestures-->
-    <bool name="config_fingerprintSupportsGestures">true</bool>
-
     <!-- Enable system navigation keys. -->
     <bool name="config_supportSystemNavigationKeys">true</bool>
 
diff --git a/sdm710.mk b/sdm710.mk
index ddeb77e..46972fe 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -236,7 +236,9 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1.vendor
+    android.hardware.biometrics.fingerprint-service.xiaomi \
+    android.hardware.biometrics.fingerprint@2.1.vendor \
+
 
 # Dynamic Partitions
 PRODUCT_BUILD_SUPER_PARTITION := false
@@ -440,6 +442,7 @@ PRODUCT_PACKAGES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
+    hardware/xiaomi \
     hardware/google/interfaces \
     hardware/google/pixel \
     vendor/qcom/opensource/commonsys/system/bt/conf \
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 4cf20ce..ffb02b3 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -15,7 +15,7 @@
 /vendor/bin/hw/android\.hardware\.light@2\.0-service\.lenovo_sdm710                      u:object_r:hal_light_default_exec:s0
 /vendor/bin/hw/android\.hardware\.power@1\.3-service\.lenovo-libperfmgr                  u:object_r:hal_power_default_exec:s0
 /vendor/bin/hw/android\.hardware\.power-service\.lenovo-sdm710-libperfmgr                u:object_r:hal_power_default_exec:s0
-/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-fpcservice                u:object_r:hal_fingerprint_default_exec:s0
+/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.xiaomi                u:object_r:hal_fingerprint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.atrace@1.0-service\.pixel                              u:object_r:hal_atrace_default_exec:s0
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-qti                        u:object_r:hal_neuralnetworks_default_exec:s0