diff --git a/Android.bp b/Android.bp
index d5ff2c9..c2a6e59 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,5 +7,6 @@
 soong_namespace {
     imports: [
         "hardware/qcom-caf/bootctrl",
+        "hardware/nothing",
     ],
 }
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 200aa42..467a58f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -94,6 +94,9 @@ TARGET_USES_ION := true
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
 
+# Fingerprint
+TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/nothing:libudfps_extension.nothing
+
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(DEVICE_PATH)/configs/vintf/vendor_framework_compatibility_matrix.xml \
diff --git a/device.mk b/device.mk
index b060426..7d192d9 100644
--- a/device.mk
+++ b/device.mk
@@ -25,6 +25,7 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
+    hardware/nothing \
     vendor/nxp/nfc \
     vendor/qcom/opensource/usb/etc
 
@@ -202,7 +203,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.3.vendor
+    android.hardware.biometrics.fingerprint@2.3-service.nothing
 
 # Gatekeeper
 PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 45a67e1..aadc0f6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -746,9 +746,6 @@ vendor/lib64/vendor.qti.esepowermanager@1.0.so
 vendor/lib64/vendor.qti.esepowermanager@1.1.so
 
 # Fingerprint
-vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service
-vendor/etc/init/android.hardware.biometrics.fingerprint@2.3-service.rc
-vendor/etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.3-service.xml
 vendor/lib64/hw/fingerprint.default.so:vendor/lib64/hw/fingerprint.lahaina.so
 vendor/lib64/libgf_hal.so
 vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so