diff --git a/build-logic/src/main/kotlin/docthor.kotlin-common-conventions.gradle.kts b/build-logic/src/main/kotlin/docthor.kotlin-common-conventions.gradle.kts
index 1fc4e87..84b11da 100644
--- a/build-logic/src/main/kotlin/docthor.kotlin-common-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/docthor.kotlin-common-conventions.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.api.plugins.jvm.JvmTestSuite
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.jetbrains.kotlin.jvm")
@@ -12,6 +13,20 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of("19"))
+    }
+}
+
+tasks
+    .withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>()
+    .configureEach {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_19)
+        }
+    }
+
 testing {
     suites {
         // Configure the built-in test suite
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d..1af9e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/libraries/fileprocessing/src/main/kotlin/de/itkl/processing/UnorderedParallelFlowMap.kt b/libraries/fileprocessing/src/main/kotlin/de/itkl/processing/UnorderedParallelFlowMap.kt
index e14a7ba..99de869 100644
--- a/libraries/fileprocessing/src/main/kotlin/de/itkl/processing/UnorderedParallelFlowMap.kt
+++ b/libraries/fileprocessing/src/main/kotlin/de/itkl/processing/UnorderedParallelFlowMap.kt
@@ -11,7 +11,6 @@ class ParallelUnorderedFlow<U>(
 ) : Flow<U>  {
     override suspend fun collect(collector: FlowCollector<U>) {
         mapperFlow.collect(collector)
-        producerJob.join()
     }
 
 }