diff --git a/build.gradle.kts b/build.gradle.kts
index 5077dc7..49c0eac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,6 +85,10 @@ kotlin {
   }
 }
 
+lint {
+  baseline = file("lint-baseline.xml")
+}
+
 moshi { enableSealed.set(true) }
 
 // We have a couple flaky tests on CI right now
diff --git a/gradle.properties b/gradle.properties
index 7ee7089..9a6ad03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,6 +11,13 @@ org.gradle.configureondemand=true
 org.gradle.configuration-cache=true
 moshix.generateProguardRules=false
 
+# Use new K2 UAST for lint
+android.lint.useK2Uast=true
+android.experimental.lint.missingBaselineIsEmptyBaseline=true
+
+# Use KSP2
+ksp.useKSP2=true
+
 POM_NAME=Kotlin CLI Util
 POM_ARTIFACT_ID=kotlin-cli-util
 POM_PACKAGING=jar
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ea68ec..95ecc6c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin = "2.0.0-Beta5"
+kotlin = "2.0.0-RC1"
 kotlinx-serialization = "1.6.3"
-ksp = "2.0.0-Beta5-1.0.19"
+ksp = "2.0.0-RC1-1.0.20"
 ktfmt = "0.47"
 jvmTarget = "17"
-moshix = "0.26.0-alpha02"
+moshix = "0.26.0-alpha03"
 moshi = "1.15.1"
 tikxml = "0.8.15"
 xmlutil = "0.86.3"
@@ -12,7 +12,7 @@ xmlutil = "0.86.3"
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
-lint = { id = "com.android.lint", version = "8.3.2" }
+lint = { id = "com.android.lint", version = "8.5.0-alpha04" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.28.0" }
 moshix = { id = "dev.zacsweers.moshix", version.ref = "moshix" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }