diff --git a/build.gradle.kts b/build.gradle.kts
index f7ed742..8eaf007 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
     alias(libs.plugins.kotlinJvm) apply false
     alias(libs.plugins.kotlinSerialization) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
 }
diff --git a/compose-app/build.gradle.kts b/compose-app/build.gradle.kts
index 40a67cd..339b009 100644
--- a/compose-app/build.gradle.kts
+++ b/compose-app/build.gradle.kts
@@ -31,8 +31,9 @@ import java.util.*
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.composeCompiler)
+    alias(libs.plugins.androidApplication)
 }
 
 val androidCompileSdk: String by project
@@ -249,7 +250,3 @@ compose.desktop {
         }
     }
 }
-
-compose.experimental {
-    web.application {}
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d71ccaa..3b33770 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,20 +1,20 @@
 [versions]
-kotlin = "2.0.0-RC1"
-kotlinx-atomicfu = "0.23.2"
-kotlinx-coroutines = "1.8.0"
-kotlinx-datetime = "0.5.0"
-kotlinx-serilization = "1.6.3"
+kotlin = "2.0.0"
+kotlinx-atomicfu = "0.24.0"
+kotlinx-coroutines = "1.8.1"
+kotlinx-datetime = "0.6.0"
+kotlinx-serialization = "1.6.3"
 agp = "8.2.2"
 androidx-camera = "1.3.3"
 androidx-core-splashscreen = "1.0.1"
-androidx-window = "1.2.0"
+androidx-window = "1.3.0"
 androidx-activity-compose = "1.9.0"
 androidx-browser = "1.8.0"
-androidx-datastore = "1.1.0"
-compose = "1.6.10-beta01"
+androidx-datastore = "1.1.1"
+compose = "1.6.10"
 decompose = "3.0.0"
 javaCv = "1.5.10"
-ktor = "3.0.0-beta-2-eap-932"
+ktor = "3.0.0-beta-2-eap-940"
 ktor-plugin = "3.0.0-beta-1"
 keycloak = "23.0.6"
 hikaricp = "5.1.0"
@@ -33,7 +33,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
-kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serilization" }
+kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 androidx-camera = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" }
 androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
@@ -91,6 +91,7 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 ktor = { id = "io.ktor.plugin", version.ref = "ktor-plugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b91e6a2..64eacca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
 #
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME