diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e8b5054d3..75a6bd5da 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -11,6 +11,11 @@
     public static final ** CREATOR;
 }
 
+# https://issuetracker.google.com/347963245
+-keep class * extends androidx.room.RoomDatabase {
+    <init>();
+}
+
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ed8ed8756..3afb6c589 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 aboutlibraries = "11.2.1"
 accompanist = "0.34.0"
-agp = "8.6.0-alpha05"
+agp = "8.6.0-alpha07"
 androidx-activity = "1.9.0"
 androidx-appcompat = "1.7.0"
 androidx-biometric = "1.2.0-alpha05"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2635ae6c3..af6a7ef2d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,15 @@ pluginManagement {
         google()
         mavenCentral()
     }
+    // TODO: Remove when bundled R8 is updated
+    buildscript {
+        repositories {
+            maven("https://storage.googleapis.com/r8-releases/raw")
+        }
+        dependencies {
+            classpath("com.android.tools:r8:8.6.12-dev")
+        }
+    }
 }
 
 dependencyResolutionManagement {