diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f455d0e58..fa406b20d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -11,11 +11,6 @@
     public static final ** CREATOR;
 }
 
-# Workaround for https://issuetracker.google.com/331556916
--keepclassmembers class androidx.biometric.BiometricManager {
-    public int canAuthenticate(int);
-}
-
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7aa8350d2..1d7633da9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,15 @@ pluginManagement {
         google()
         mavenCentral()
     }
+    // TODO: Remove on AGP 8.5.0-alpha05
+    buildscript {
+        repositories {
+            maven("https://storage.googleapis.com/r8-releases/raw")
+        }
+        dependencies {
+            classpath("com.android.tools:r8:8.5.4-dev")
+        }
+    }
 }
 
 dependencyResolutionManagement {