diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9c3544..2166bb3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ storytale = "0.0.3+dev8"
 compose-plugin = "1.10.0"
 compose-navigation = "2.9.1"
 kotlinx-serialization-json = "1.9.0"
-kotlin = "2.2.21"
+kotlin = "2.3.10"
 kotlin-poet = "2.2.0"
 build-time-config = "2.3.1"
 code-highlights = "1.1.0"
diff --git a/modules/compiler-plugin/build.gradle.kts b/modules/compiler-plugin/build.gradle.kts
index 04f2b7e..aed235f 100644
--- a/modules/compiler-plugin/build.gradle.kts
+++ b/modules/compiler-plugin/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
@@ -7,6 +8,15 @@ plugins {
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.compose.compiler)
 }
+
+tasks.withType<KotlinCompile> {
+    compilerOptions {
+        apiVersion = KotlinVersion.KOTLIN_2_1
+        languageVersion = KotlinVersion.KOTLIN_2_1
+        optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
+    }
+}
+
 dependencies {
     compileOnly(compose.runtime)
     implementation(kotlin("compiler-embeddable"))
@@ -50,7 +60,3 @@ publishing {
         }
     }
 }
-
-tasks.withType<KotlinCompilationTask<*>>().configureEach {
-    compilerOptions.optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
-}
diff --git a/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt b/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt
index 6b8d23d..b74bedf 100644
--- a/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt
+++ b/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 
 class StorytaleComponentRegistrar : CompilerPluginRegistrar() {
     override val supportsK2: Boolean get() = true
+    override val pluginId: String = "storytale"
 
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
         Companion.registerExtensions(this)
diff --git a/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt b/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt
index 71d1f33..42635d2 100644
--- a/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt
+++ b/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
 
 @OptIn(ExperimentalCompilerApi::class)
 class PreviewComponentRegistrar : CompilerPluginRegistrar() {
+    override val pluginId: String = "storytale-preview"
     override val supportsK2: Boolean get() = true
 
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {