diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5f9a8fa8..43f936fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,13 +6,13 @@ compileSdk = "34"
 
 # Dependencies
 kotlin = "2.0.10"
-android-gradle-plugin = "8.5.0"
+android-gradle-plugin = "8.5.2"
 coroutines = "1.8.1"
 kotlinx-datetime = "0.6.0"
 ktor = "2.3.12"
 
 stately = "2.0.6"
-java = "17"
+java = "21"
 kermit = "2.0.4"
 sqliter = "1.3.1"
 
@@ -24,7 +24,7 @@ firebase-bom = "33.4.0"
 firebase-crashlytics-gradle = "3.0.2"
 gms-google-services = "4.4.2"
 
-compose-androidx-ui = "1.7.3"
+compose-androidx-ui = "1.6.8"
 compose-compiler = "1.5.15"
 composeNavigation = "2.8.2"
 compose-jb = "1.6.11"
@@ -47,6 +47,7 @@ ktlint = "11.0.0"
 coil = "3.0.0-alpha04"
 zoomimage = "1.1.0-alpha06"
 skie = "0.9.0-RC.1"
+toolchain = "0.8.0"
 
 [libraries]
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
@@ -124,6 +125,7 @@ sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 skie = { id = "co.touchlab.skie", version.ref = "skie" }
+toolchain = { id = "org.gradle.toolchains.foojay-resolver-convention", version.ref = "toolchain" }
 
 [bundles]
 ktor-common = ["ktor-client-core", "ktor-client-logging", "ktor-client-serialization", "ktor-client-contentNegotiation"]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 90d3abf2..a94d8087 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,6 +17,10 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
 include(":shared", ":shared-ui", ":android", ":ios")
 
 rootProject.name = "Droidcon"
diff --git a/shared-ui/build.gradle.kts b/shared-ui/build.gradle.kts
index 3f9cb943..bad22df6 100644
--- a/shared-ui/build.gradle.kts
+++ b/shared-ui/build.gradle.kts
@@ -87,7 +87,6 @@ kotlin {
 
             implementation(libs.stately.common)
             implementation(libs.koin.core)
-
             implementation(compose.ui)
             implementation(compose.foundation)
             implementation(compose.material3)