diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56e..b86273d9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1797e96b..ebc6fa8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ allprojects {
     // Set Kotlin JVM target to the same for all subprojects
     tasks.withType(KotlinCompile).configureEach {
         kotlinOptions {
-            jvmTarget = "17"
+            jvmTarget = "21"
         }
     }
 
diff --git a/core/domain/build.gradle b/core/domain/build.gradle
index 32933d6e..75b14dc5 100644
--- a/core/domain/build.gradle
+++ b/core/domain/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 android {
     namespace 'org.moire.ultrasonic.subsonic.domain'
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
diff --git a/core/subsonic-api/build.gradle b/core/subsonic-api/build.gradle
index 625447f4..47428b10 100644
--- a/core/subsonic-api/build.gradle
+++ b/core/subsonic-api/build.gradle
@@ -5,8 +5,8 @@ plugins {
 apply from: bootstrap.kotlinModule
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 15f1f6d7..a92a3928 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -53,7 +53,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 
     buildFeatures {
@@ -63,8 +63,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     ksp {