diff --git a/.gitignore b/.gitignore
index c7865f48..0b843148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ gradle.properties
 .fleet
 # But we need these
 !.idea/runConfigurations
+.kotlin
 
 # Ignore Gradle build output directory
 build
diff --git a/build.gradle.kts b/build.gradle.kts
index 54b15778..7bc02cdd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 import org.jlleitschuh.gradle.ktlint.KtlintPlugin
@@ -43,12 +44,9 @@ subprojects {
     tasks {
         withType<KotlinJvmCompile> {
             dependsOn("ktlintFormat")
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-
-                freeCompilerArgs += listOf(
-                    "-Xcontext-receivers",
-                )
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_1_8
+                freeCompilerArgs.add("-Xcontext-receivers")
             }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49887615..991f44c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "2.0.20"
 coroutines = "1.7.3"
 serialization = "1.6.0"
 okhttp = "5.0.0-alpha.14" # Major version is locked by Tachiyomi extensions
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index bdf6fa57..d01e0977 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -141,11 +141,10 @@ tasks {
     }
 
     withType<KotlinJvmCompile> {
-        kotlinOptions {
-            freeCompilerArgs +=
-                listOf(
-                    "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                )
+        compilerOptions {
+            freeCompilerArgs.add(
+                "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+            )
         }
     }