diff --git a/device.mk b/device.mk
index 6043ee6..9c772e0 100644
--- a/device.mk
+++ b/device.mk
@@ -37,11 +37,6 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
     $(LOCAL_PATH)/overlay-lineage
 
-PRODUCT_PACKAGES += \
-    xiaomi_cmi_hwlevel_default_overlay \
-    xiaomi_cmi_hwlevel_p01_overlay \
-    xiaomi_cmi_hwlevel_p1_overlay
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml
diff --git a/rootdir/etc/init.device.rc b/rootdir/etc/init.device.rc
index 22ebc97..837ef43 100644
--- a/rootdir/etc/init.device.rc
+++ b/rootdir/etc/init.device.rc
@@ -1,3 +1,10 @@
 # PowerShare
 on boot
     chown system system /sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/wireless/reverse_chg_mode
+
+# UDFPS
+on property:ro.boot.hwlevel=P0.1
+    setprop persist.vendor.fingerprint.sensor_location 549|1925|99
+
+on property:ro.boot.hwlevel=P1
+    setprop persist.vendor.fingerprint.sensor_location 549|1925|99
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp
deleted file mode 100644
index 0b1e814..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-runtime_resource_overlay {
-    name: "xiaomi_cmi_hwlevel_default_overlay",
-    sdk_version: "current",
-    vendor: true
-}
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml
deleted file mode 100644
index 64eea0a..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xiaomi_sm8250.cmi.overlay.hwlevel_default"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="1"/>
-</manifest>
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/res/values/config.xml
deleted file mode 100644
index f896755..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 The LineageOS Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
-    <integer-array name="config_udfps_sensor_props" translatable="false" >
-      <!--
-        <item>sensorLocationX</item>
-        <item>sensorLocationY</item>
-        <item>sensorRadius</item>
-      -->
-        <item>540</item>
-        <item>1907</item>
-        <item>99</item>
-    </integer-array>
-</resources>
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp
deleted file mode 100644
index 1333ccb..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-runtime_resource_overlay {
-    name: "xiaomi_cmi_hwlevel_p01_overlay",
-    sdk_version: "current",
-    vendor: true
-}
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml
deleted file mode 100644
index b3437fa..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xiaomi_sm8250.cmi.overlay.hwlevel_p01"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:requiredSystemPropertyName="ro.boot.hwlevel"
-      android:requiredSystemPropertyValue="P0.1"
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/res/values/config.xml
deleted file mode 100644
index ee40bc0..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 The LineageOS Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
-    <integer-array name="config_udfps_sensor_props" translatable="false" >
-      <!--
-        <item>sensorLocationX</item>
-        <item>sensorLocationY</item>
-        <item>sensorRadius</item>
-      -->
-        <item>549</item>
-        <item>1925</item>
-        <item>99</item>
-    </integer-array>
-</resources>
\ No newline at end of file
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp
deleted file mode 100644
index d516b38..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-runtime_resource_overlay {
-    name: "xiaomi_cmi_hwlevel_p1_overlay",
-    sdk_version: "current",
-    vendor: true
-}
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml
deleted file mode 100644
index 371bcd9..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xiaomi_sm8250.cmi.overlay.hwlevel_p1"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:requiredSystemPropertyName="ro.boot.hwlevel"
-      android:requiredSystemPropertyValue="P1"
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="2"/>
-</manifest>
diff --git a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/res/values/config.xml
deleted file mode 100644
index ee40bc0..0000000
--- a/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 The LineageOS Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
-    <integer-array name="config_udfps_sensor_props" translatable="false" >
-      <!--
-        <item>sensorLocationX</item>
-        <item>sensorLocationY</item>
-        <item>sensorRadius</item>
-      -->
-        <item>549</item>
-        <item>1925</item>
-        <item>99</item>
-    </integer-array>
-</resources>
\ No newline at end of file
diff --git a/vendor.prop b/vendor.prop
index f26e075..e29f1b1 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -33,3 +33,8 @@ ro.hardware.audio.primary=cmi
 # Display
 ro.surface_flinger.set_touch_timer_ms=200
 vendor.display.defer_fps_frame_count=2
+
+# Fingerprint
+persist.vendor.fingerprint.sensor_location=540|1907|99
+persist.vendor.fingerprint.type=udfps_optical
+persist.vendor.fingerprint.udfps.control_illumination=true