diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f2de406..7913015 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -125,9 +125,7 @@ TARGET_ENABLE_MEDIADRM_64 := true
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 
 # Fingerprint
-SOONG_CONFIG_NAMESPACES += ONEPLUS_FOD
-SOONG_CONFIG_ONEPLUS_FOD := POS_X POS_Y SIZE
-TARGET_SURFACEFLINGER_FOD_LIB := //hardware/oneplus:libfod_extension.oneplus
+TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oneplus:libudfps_extension.oneplus
 
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
diff --git a/common.mk b/common.mk
index 383dabc..a424061 100644
--- a/common.mk
+++ b/common.mk
@@ -267,8 +267,8 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.oneplus \
-    vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus
+    android.hardware.biometrics.fingerprint@2.3-service.oneplus \
+    vendor.goodix.hardware.biometrics.fingerprint@2.1.vendor
 
 # GPS
 PRODUCT_COPY_FILES += \
diff --git a/overlay-aosp/frameworks/base/core/res/res/values/config.xml b/overlay-aosp/frameworks/base/core/res/res/values/config.xml
index 148cbee..566855e 100644
--- a/overlay-aosp/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-aosp/frameworks/base/core/res/res/values/config.xml
@@ -53,9 +53,6 @@
     <!-- Whether device has screen with higher aspect ratio -->
     <bool name="config_haveHigherAspectRatioScreen">true</bool>
 
-    <!-- Shows the required view for in-display fingerprint -->
-    <bool name="config_supportsInDisplayFingerprint">true</bool> 
-
     <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
     <string name="config_oemFastChargerStatusPath" translatable="false">/sys/class/power_supply/battery/fastchg_status</string>
 
diff --git a/overlay-aosp/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay-aosp/frameworks/base/packages/SystemUI/res/values/config.xml
index b9651d6..8ceb912 100644
--- a/overlay-aosp/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay-aosp/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -18,4 +18,11 @@
 
     <!-- Allow devices override audio panel location to the left side -->
     <bool name="config_audioPanelOnLeftSide">true</bool>
+
+    <!-- HBM type of UDFPS overlay.
+            0 - GLOBAL HBM 
+            1 - LOCAL HBM
+    -->
+    <integer name="config_udfps_hbm_type">0</integer>
+
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f9848ee..c299d09 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -343,4 +343,7 @@
         <item>9</item> <!-- COLOR_MODE_DISPLAY_P3 -->
     </integer-array>
 
+     <!-- How long it takes for the HW to start illuminating after the illumination is requested. -->
+    <integer name="config_udfps_illumination_transition_ms">0</integer>
+
 </resources>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index d621157..b1af6b5 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -47,8 +47,7 @@
 /dev/stmvl53l1_ranging    u:object_r:vl53l1_device:s0
 
 # HALs
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.oneplus            u:object_r:hal_fingerprint_default_exec:s0
-/(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.oneplus    u:object_r:hal_lineage_fod_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.oneplus            u:object_r:hal_fingerprint_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.secure_element@1\.2-service                                   u:object_r:hal_secure_element_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus                                u:object_r:hal_lineage_touch_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.camera@1\.0-service                              u:object_r:hal_cameraHIDL_default_exec:s0
diff --git a/sepolicy/vendor/hal_lineage_fod_default.te b/sepolicy/vendor/hal_lineage_fod_default.te
deleted file mode 100644
index bf692eb..0000000
--- a/sepolicy/vendor/hal_lineage_fod_default.te
+++ /dev/null
@@ -1,4 +0,0 @@
-hal_client_domain(hal_lineage_fod_default, hal_display)
-hal_client_domain(hal_lineage_fod_default, hal_fingerprint)
-
-allow hal_lineage_fod_default sysfs_fod:file rw_file_perms;