diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index 90876129d..2a8f94a41 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle
index 8a636a001..6663b5537 100644
--- a/AdaptiveUICodelab/build.gradle
+++ b/AdaptiveUICodelab/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 05700870c..2734728e0 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
     }
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
index de41c8ea0..3758e2ae7 100644
--- a/AnimationCodelab/build.gradle
+++ b/AnimationCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index 180040375..30a5b0681 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index 7ff68238e..747e63abf 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
index 151012a6d..884bd04ac 100644
--- a/BasicsCodelab/build.gradle.kts
+++ b/BasicsCodelab/build.gradle.kts
@@ -16,6 +16,6 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.3.2" apply false
+    id("com.android.application") version "8.4.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index f35705445..f99579ab3 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
     }
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 049e9ef19..521eae080 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index d546834b3..193a32296 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 7274301ac..be0b56464 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
index 27373e55e..dfcb0a5a1 100644
--- a/ThemingCodelabM2/build.gradle
+++ b/ThemingCodelabM2/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
+        classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
     }
 }