diff --git a/gradle.properties b/gradle.properties
index f28522f5b00..cc75862b1f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ signing.element.nightly.keyPassword=Secret
 
 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.4.0-alpha13
+android.experimental.lint.version=8.5.0-alpha07
 
 # Enable test fixture for all modules by default
 android.experimental.enableTestFixtures=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0d7ba67d16..2ee00ffc1e1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.3.2"
+android_gradle_plugin = "8.4.0"
 kotlin = "1.9.24"
 ksp = "1.9.24-1.0.20"
 firebaseAppDistribution = "5.0.0"