diff --git a/Android/core/domain/build.gradle.kts b/Android/core/domain/build.gradle.kts
index 793bed4..0708026 100644
--- a/Android/core/domain/build.gradle.kts
+++ b/Android/core/domain/build.gradle.kts
@@ -1,9 +1,17 @@
 plugins {
-    id("java-library")
     alias(libs.plugins.jetbrains.kotlin.jvm)
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+kotlin.jvmToolchain(17)
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "17"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "17"
+    }
+    test {
+        useJUnitPlatform()
+    }
 }
diff --git a/Android/core/model/build.gradle.kts b/Android/core/model/build.gradle.kts
index 793bed4..0708026 100644
--- a/Android/core/model/build.gradle.kts
+++ b/Android/core/model/build.gradle.kts
@@ -1,9 +1,17 @@
 plugins {
-    id("java-library")
     alias(libs.plugins.jetbrains.kotlin.jvm)
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+kotlin.jvmToolchain(17)
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "17"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "17"
+    }
+    test {
+        useJUnitPlatform()
+    }
 }