diff --git a/build.gradle b/build.gradle
index badd3719..6100cbce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,13 +40,6 @@ allprojects {
         google()
     }
 
-    // Set Kotlin JVM target to the same for all subprojects
-    tasks.withType(KotlinCompile).configureEach {
-        kotlinOptions {
-            jvmTarget = "21"
-        }
-    }
-
     tasks.withType(JavaCompile).tap {
         configureEach {
             options.compilerArgs.add("-Xlint:deprecation")
@@ -57,4 +50,4 @@ allprojects {
 wrapper {
     gradleVersion = libs.versions.gradle.get()
     distributionType = "all"
-}
\ No newline at end of file
+}
diff --git a/core/domain/build.gradle b/core/domain/build.gradle
index b5e81edb..0ff0b88b 100644
--- a/core/domain/build.gradle
+++ b/core/domain/build.gradle
@@ -13,8 +13,4 @@ dependencies {
 
 android {
     namespace = 'org.moire.ultrasonic.subsonic.domain'
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
 }
diff --git a/core/subsonic-api/build.gradle b/core/subsonic-api/build.gradle
index 47428b10..034da1e2 100644
--- a/core/subsonic-api/build.gradle
+++ b/core/subsonic-api/build.gradle
@@ -4,11 +4,6 @@ plugins {
 
 apply from: bootstrap.kotlinModule
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-}
-
 dependencies {
     api libs.retrofit
     api libs.jacksonConverter
diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle
index f5880485..f74dba21 100644
--- a/gradle_scripts/code_quality.gradle
+++ b/gradle_scripts/code_quality.gradle
@@ -27,6 +27,6 @@ if (isCodeQualityEnabled) {
                 parallel = true
             }
         }
-        tasks.detekt.jvmTarget = "17"
+        tasks.detekt.jvmTarget = "21"
     }
 }
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index b729c438..513b478b 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -53,8 +53,10 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = "21"
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
     }
 
     buildFeatures {
@@ -63,11 +65,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
-
     ksp {
         arg("room.schemaLocation", "$rootDir/ultrasonic/schemas")
     }