diff --git a/gradle.properties b/gradle.properties
index 4240f02912..9aefe9e69a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,7 +40,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.7.0-alpha01
+android.experimental.lint.version=8.8.0-alpha04
 
 # 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 a01b4cd79b..c7af9f3120 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.6.1"
+android_gradle_plugin = "8.7.0"
 kotlin = "1.9.25"
 kotlinpoetKsp = "1.17.0"
 ksp = "1.9.25-1.0.20"