diff --git a/app/build.gradle b/app/build.gradle
index 8893b7b..2d0498a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,9 +4,16 @@ plugins {
     id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
 }
 
+kotlin {
+    jvmToolchain 11
+    sourceSets.configureEach {
+        languageSettings.optIn("kotlin.RequiresOptIn")
+    }
+}
+
 android {
     compileSdk 34
-    buildToolsVersion '34.0.0'
+    buildToolsVersion = '34.0.0'
 
     defaultConfig {
         applicationId "org.mosad.teapod"
@@ -32,16 +39,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        kotlin.sourceSets.configureEach {
-            languageSettings.optIn("kotlin.RequiresOptIn")
-        }
-    }
     namespace 'org.mosad.teapod'
 }
 
diff --git a/build.gradle b/build.gradle
index 3c16f5c..13cc887 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.22"
+    ext.kotlin_version = "1.9.0"
     ext.ktor_version = "2.3.6"
     ext.exo_version = "2.18.7"
     repositories {