diff --git a/app/backend/build.gradle.kts b/app/backend/build.gradle.kts
index 9061c718e7e42452da07d6fea20e8883ada88b35..b7dce5aecd18430557e17a4528fa9947ce1fa4f4 100644
--- a/app/backend/build.gradle.kts
+++ b/app/backend/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 val springVersion = "3.3.1"
 
 plugins {
@@ -74,13 +72,19 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "21"
+tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
+    compilerOptions {
+        freeCompilerArgs.add("-Xjsr305=strict")
     }
 }
 
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+    }
+}
+
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }
diff --git a/kpi-calculator/adapter/build.gradle.kts b/kpi-calculator/adapter/build.gradle.kts
index 5d6e8933f5b2938ff5f4468281fc88176e1b1ad5..769403ad64dea50f285f41d649b30a43cfd18e4a 100644
--- a/kpi-calculator/adapter/build.gradle.kts
+++ b/kpi-calculator/adapter/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation("de.fraunhofer.iem.kpiCalculator:model:0.0.2-SNAPSHOT")
+    implementation(project(":model"))
     testImplementation(kotlin("test"))
 }