diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b05a602f..ff0a9432 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -13,6 +14,10 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
+kotlin {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+}
+
 android {
     namespace = "com.mitteloupe.whoami"
     compileSdk = libs.versions.compileSdk.get().toInt()
@@ -67,10 +72,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7fe78a89..2185f451 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,8 +35,8 @@ ktlint = "12.3.0"
 detekt = "1.23.8"
 kotlinx-serialization-json = "1.9.0"
 minSdk = "22"
-targetSdk = "35"
-compileSdk = "35"
+targetSdk = "36"
+compileSdk = "36"
 
 [libraries]
 androidx-material3 = { module = "androidx.compose.material3:material3" }