diff --git a/build.gradle b/build.gradle
index 403a0d5d62..fdaef6a2f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ allprojects {
                 // PhotoView
                 includeGroupByRegex 'com\\.github\\.chrisbanes'
                 // PFLockScreen-Android
-                includeGroupByRegex 'com\\.github\\.ganfra'
+                includeGroupByRegex 'com\\.github\\.vector-im'
             }
         }
         maven {
diff --git a/vector/build.gradle b/vector/build.gradle
index 35175389c8..57fd0cc51a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -346,7 +346,7 @@ dependencies {
     implementation 'me.saket:better-link-movement-method:2.2.0'
     implementation 'com.google.android:flexbox:1.1.1'
     implementation "androidx.autofill:autofill:$autofill_version"
-    implementation 'com.github.ganfra:PFLockScreen-Android:1.0.0-beta8'
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta9'
 
     // Custom Tab
     implementation 'androidx.browser:browser:1.2.0'
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 8976415dec..8ea385fa32 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -61,7 +61,7 @@ class PinFragment @Inject constructor(
         val encodedPin = pinCodeStore.getEncodedPin() ?: return
         val authFragment = PFLockScreenFragment()
         val builder = PFFLockScreenConfiguration.Builder(requireContext())
-                .setUseFingerprint(true)
+                .setUseBiometric(true)
                 .setTitle(getString(R.string.auth_pin_confirm_to_disable_title))
                 .setClearCodeOnError(true)
                 .setMode(PFFLockScreenConfiguration.MODE_AUTH)
@@ -71,7 +71,7 @@ class PinFragment @Inject constructor(
             override fun onPinLoginFailed() {
             }
 
-            override fun onFingerprintSuccessful() {
+            override fun onBiometricAuthSuccessful() {
                 lifecycleScope.launch {
                     pinCodeStore.deleteEncodedPin()
                     vectorBaseActivity.setResult(Activity.RESULT_OK)
@@ -79,7 +79,7 @@ class PinFragment @Inject constructor(
                 }
             }
 
-            override fun onFingerprintLoginFailed() {
+            override fun onBiometricAuthLoginFailed() {
             }
 
             override fun onCodeInputSuccessful() {
@@ -122,7 +122,7 @@ class PinFragment @Inject constructor(
         val encodedPin = pinCodeStore.getEncodedPin() ?: return
         val authFragment = PFLockScreenFragment()
         val builder = PFFLockScreenConfiguration.Builder(requireContext())
-                .setUseFingerprint(true)
+                .setUseBiometric(true)
                 .setTitle(getString(R.string.auth_pin_title))
                 .setLeftButton(getString(R.string.auth_pin_forgot))
                 .setClearCodeOnError(true)
@@ -136,12 +136,12 @@ class PinFragment @Inject constructor(
             override fun onPinLoginFailed() {
             }
 
-            override fun onFingerprintSuccessful() {
+            override fun onBiometricAuthSuccessful() {
                 vectorBaseActivity.setResult(Activity.RESULT_OK)
                 vectorBaseActivity.finish()
             }
 
-            override fun onFingerprintLoginFailed() {
+            override fun onBiometricAuthLoginFailed() {
             }
 
             override fun onCodeInputSuccessful() {