diff --git a/device-common.mk b/device-common.mk
index ef95a64..3f3c895 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -281,9 +281,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/lowi.conf:system/etc/lowi.conf
 
-# Fingerprint
+# Fingerprint HIDL implementation
 PRODUCT_PACKAGES += \
-    fingerprintd
+    fingerprint.fpc \
+    android.hardware.biometrics.fingerprint@2.1-service
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
diff --git a/init.hardware.rc b/init.hardware.rc
index 9b7dcd7..e057a36 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -414,11 +414,6 @@ service loc_launcher /vendor/bin/loc_launcher
 service pd_mapper /vendor/bin/pd-mapper
      class core
 
-service fingerprintd /system/bin/fingerprintd
-    class late_start
-    user system
-    group system
-
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -B -z \
         -o /data/user_de/0/com.android.shell/files/bugreports/bugreport