diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index de78e6c62..4b78e705a 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle
index 19c4903e1..a89d515b9 100644
--- a/AdaptiveUICodelab/build.gradle
+++ b/AdaptiveUICodelab/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index d786f28ab..d1579082e 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.50"
     }
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
index 382b0ca1e..434e8b20b 100644
--- a/AnimationCodelab/build.gradle
+++ b/AnimationCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index bb3b681f7..66a6cdc25 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index 1e32bb45f..a421e2d7d 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
index 38eb61081..dd9f9f17f 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.1.4" apply false
+    id("com.android.application") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.21" apply false
 }
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index d2a6cfc21..7f3774f6b 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.6"
     }
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 3e36c8f34..34a23caa2 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 5fcfefb54..65e6c0940 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index fba600d0a..81c205e20 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
index 37c49c311..70824c26e 100644
--- a/ThemingCodelabM2/build.gradle
+++ b/ThemingCodelabM2/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.4"
+        classpath "com.android.tools.build:gradle:8.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }