diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ae37ff7d..6cb607802 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs :
     strategy :
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.8.22, 1.9.0 ]
+        kotlin-version : [ 1.8.22, 1.9.10 ]
 
     steps :
       - uses : actions/checkout@v3
@@ -162,7 +162,7 @@ jobs :
       # solution.
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.8.22, 1.9.0 ]
+        kotlin-version : [ 1.8.22, 1.9.10 ]
         agp-version : [ 7.1.1, 7.2.0, 7.3.1 ]
 
     steps :
@@ -213,7 +213,7 @@ jobs :
       # solution.
       fail-fast : false
       matrix :
-        kotlin-version : [ 1.8.22, 1.9.0 ]
+        kotlin-version : [ 1.8.22, 1.9.10 ]
 
     steps :
       - uses : actions/checkout@v3
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a3587369..64dcd46c5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,10 +15,11 @@ dagger = "2.46.1"
 dokka = "1.8.20"
 espresso = "3.5.1"
 gradlePublish = "0.15.0"
-kotlin = "1.9.0"
+kotlin = "1.9.10"
 kct = "0.3.1"
 kotlinpoet = "1.14.2"
-ksp = "1.9.0-1.0.11"
+# If updating KSP version, we currently have ksp override logic in settings.gradle that needs to be updated too
+ksp = "1.9.10-1.0.13"
 ktlint = "0.41.0"
 ktlintPlugin = "10.2.0"
 mavenPublish = "0.18.0"
diff --git a/settings.gradle b/settings.gradle
index 7487307ad..c8e411fb5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,7 +15,12 @@ dependencyResolutionManagement {
         overrides.put(keyString, value.toString())
         if (keyString.endsWith("_kotlin")) {
           // TODO hardcoded to match what's in libs.versions.toml, but kinda ugly
-          overrides.put("override_ksp", "$value-1.0.11")
+          String kspPartialVersion = "1.0.13"
+          if (value.toString().startsWith("1.8")) {
+            // Latest KSP releases currently don't support Kotlin 1.8.x
+            kspPartialVersion = "1.0.11"
+          }
+          overrides.put("override_ksp", "$value-$kspPartialVersion")
         }
       }
     }