diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5a10a4aad..949f38cb6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,8 +5,7 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.jetbrains.kotlin.kapt)
+    alias(libs.plugins.android.legacy.kapt)
     alias(libs.plugins.google.ksp)
     alias(libs.plugins.jetbrains.kotlin.parcelize)
     alias(libs.plugins.sonarqube)
diff --git a/build.gradle.kts b/build.gradle.kts
index 2c9173f57..40d91d770 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,8 +5,7 @@
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.jetbrains.kotlin.android) apply false
-    alias(libs.plugins.jetbrains.kotlin.kapt) apply false
+    alias(libs.plugins.android.legacy.kapt) apply false
     alias(libs.plugins.google.ksp) apply false
     alias(libs.plugins.jetbrains.kotlin.parcelize) apply false
     alias(libs.plugins.sonarqube) apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ddfe32a31..c6413f68e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ groupie = "2.10.1"
 jsoup = "1.22.1"
 junit = "4.13.2"
 junit-ext = "1.3.0"
-kotlin = "2.2.21"
+kotlin = "2.2.10"
 ksp = "2.3.4"
 ktlint = "1.8.0"
 leakcanary = "2.14"
@@ -132,8 +132,7 @@ zacsweers-autoservice-compiler = { module = "dev.zacsweers.autoservice:auto-serv
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
+android-legacy-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" } # Needed for statesaver
 google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } # Needed for statesaver
 jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }