diff --git a/msm8976.mk b/msm8976.mk
index cf89d79..f41afb0 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -135,7 +135,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    fingerprintd \
+    android.hardware.biometrics.fingerprint@2.1-service \
     fingerprint.msm8952
 
 # For android_filesystem_config.h
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index c7f144d..e83bd39 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1534,9 +1534,3 @@ on property:init.svc.per_mgr=running
 
 on property:sys.shutdown.requested=*
     stop per_proxy
-
-service fingerprintd /system/bin/fingerprintd
-    class late_start
-    user system
-    group system
-    writepid /dev/cpuset/system-background/tasks