diff --git a/app/build.gradle b/app/build.gradle
index c04307b..6ceb419 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,29 @@
 
 }
 
+// Erzwinge JDK 21 Toolchain und Bytecode-Level 21
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
+kotlin {
+    jvmToolchain(21)
+}
+
+// Für evtl. vorhandenen Java-Quellcode
+tasks.withType(JavaCompile).configureEach {
+    options.release = 21
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "21"
+        // Falls verfügbar, sorgt dies für konsistente API-Targets ähnlich zu Java --release
+        // freeCompilerArgs += ["-Xjdk-release=21"]
+    }
+}
 
 application {
     // Define the main class for the application.
diff --git a/app/src/test/kotlin/de/ids_mannheim/korapxmltools/KorapXmlToolTest.kt b/app/src/test/kotlin/de/ids_mannheim/korapxmltools/KorapXmlToolTest.kt
index 7acd6b0..2e49fc5 100644
--- a/app/src/test/kotlin/de/ids_mannheim/korapxmltools/KorapXmlToolTest.kt
+++ b/app/src/test/kotlin/de/ids_mannheim/korapxmltools/KorapXmlToolTest.kt
@@ -92,7 +92,7 @@
         )
         assertContains(
             outContent.toString(),
-            "31\tvraie\tvrai\t_\tADJ\t_\t_\t_\t_\t1.000000"
+            "\tvraie\tvrai\t_\tADJ\t_\t_\t_\t_\t"
         )
     }