diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index d73464810..2f3eb4f29 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -22,13 +22,13 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:9.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
     }
 }
 
 plugins {
     id 'com.diffplug.spotless' version '8.4.0'
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.3.21" apply false
 }
 
 subprojects {
diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
index dcb064ee4..c264e7165 100644
--- a/AdaptiveUiCodelab/gradle/libs.versions.toml
+++ b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ activityCompose = "1.13.0"
 espressoCore = "3.7.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
-kotlin = "2.3.10"
+kotlin = "2.3.21"
 kotlinxCoroutinesAndroid = "1.10.2"
 lifecycle = "2.10.0"
 window = "1.5.1"
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
index b66cfaada..a8a8ecc0a 100644
--- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -121,7 +121,7 @@ dependencies {
 
     implementation "com.google.dagger:hilt-android:2.59.2"
     ksp "com.google.dagger:hilt-compiler:2.59.2"
-    ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
+    ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.21"
 
     implementation "io.coil-kt:coil-compose:2.7.0"
 
@@ -135,5 +135,5 @@ dependencies {
     androidTestImplementation "com.google.dagger:hilt-android:2.59.2"
     androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.2"
     kspAndroidTest "com.google.dagger:hilt-compiler:2.59.2"
-    kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
+    kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.21"
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 09fa5101c..ca55ccaa9 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
         classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.7"
     }
 }
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
index 08fd38367..0403c2235 100644
--- a/AnimationCodelab/build.gradle
+++ b/AnimationCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:9.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index a319d5c55..676150e09 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index 2edde700a..dccd94fd7 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:9.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/BasicsCodelab/gradle/libs.versions.toml b/BasicsCodelab/gradle/libs.versions.toml
index a07612453..6afd08ac2 100644
--- a/BasicsCodelab/gradle/libs.versions.toml
+++ b/BasicsCodelab/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "9.2.0"
-kotlin = "2.3.10"
+kotlin = "2.3.21"
 coreKtx = "1.18.0"
 junit = "4.13.2"
 androidxJunit = "1.3.0"
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index 2a886061a..87913f2da 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -22,9 +22,9 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.8"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 8d0f83de6..e5a7bef98 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
index 02c8171a4..a8e2a7776 100644
--- a/PerformanceCodelab/gradle/libs.versions.toml
+++ b/PerformanceCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlinx-datetime = "0.7.1-0.6.x-compat"
 lifecycle-viewmodel-compose = "2.10.0"
 material-icons-core = "1.7.8"
 media3 = "1.10.0"
-org-jetbrains-kotlin-android = "2.3.10"
+org-jetbrains-kotlin-android = "2.3.21"
 core-ktx = "1.18.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.3.0"
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 332a7d42c..5e3899a92 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index aa6eb42d8..b1f2a34f5 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:9.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }
 
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
index e4ea52566..a569ad21b 100644
--- a/ThemingCodelabM2/build.gradle
+++ b/ThemingCodelabM2/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:9.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21"
     }
 }