diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
index c8585076f1..d846d0a041 100644
--- a/.github/workflows/agp-matrix.yml
+++ b/.github/workflows/agp-matrix.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        agp: [ '9.0.0', '9.1.1', '9.2.1' ]
+        agp: [ '9.0.0', '9.2.1', '9.4.0' ]
         integrations: [ true, false ]
 
     name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 09d2869988..52d7684620 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -1,6 +1,6 @@
 
 object Config {
-    val AGP = System.getenv("VERSION_AGP") ?: "9.2.1"
+    val AGP = System.getenv("VERSION_AGP") ?: "9.4.0"
     val kotlinStdLib = "stdlib-jdk8"
     val kotlinStdLibVersionAndroid = "1.9.24"
     val kotlinTestJunit = "test-junit"
diff --git a/gradle.properties b/gradle.properties
index cdadce81e2..c919ff5335 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ android.useAndroidX=true
 # AGP 9+ migration opt-outs until we remove kotlin-android plugin and adopt built-in Kotlin.
 android.builtInKotlin=false
 android.newDsl=false
-android.experimental.lint.version=9.2.1
+android.experimental.lint.version=9.4.0
 
 # Release information
 versionName=8.55.0