diff --git a/boudicca.base/enricher-openapi/build.gradle.kts b/boudicca.base/enricher-openapi/build.gradle.kts
index 339b723a..d8a37589 100644
--- a/boudicca.base/enricher-openapi/build.gradle.kts
+++ b/boudicca.base/enricher-openapi/build.gradle.kts
@@ -8,8 +8,10 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 val openapi by configurations.creating {
diff --git a/boudicca.base/enricher-utils/build.gradle.kts b/boudicca.base/enricher-utils/build.gradle.kts
index f167d748..c2ca6902 100644
--- a/boudicca.base/enricher-utils/build.gradle.kts
+++ b/boudicca.base/enricher-utils/build.gradle.kts
@@ -1,11 +1,12 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     kotlin("jvm")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -18,9 +19,6 @@ dependencies {
     implementation(project(":boudicca.base:eventdb-openapi"))
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
diff --git a/boudicca.base/enricher/build.gradle.kts b/boudicca.base/enricher/build.gradle.kts
index 1af53859..7bf1381e 100644
--- a/boudicca.base/enricher/build.gradle.kts
+++ b/boudicca.base/enricher/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.3"
@@ -8,7 +6,10 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -35,11 +36,8 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
 
 tasks.withType<Test> {
diff --git a/boudicca.base/eventcollector-api/build.gradle.kts b/boudicca.base/eventcollector-api/build.gradle.kts
index 2e93be14..6f780273 100644
--- a/boudicca.base/eventcollector-api/build.gradle.kts
+++ b/boudicca.base/eventcollector-api/build.gradle.kts
@@ -19,11 +19,12 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
     kotlinOptions.javaParameters = true
 }
diff --git a/boudicca.base/eventdb-openapi/build.gradle.kts b/boudicca.base/eventdb-openapi/build.gradle.kts
index e1001b6f..b478f1c0 100644
--- a/boudicca.base/eventdb-openapi/build.gradle.kts
+++ b/boudicca.base/eventdb-openapi/build.gradle.kts
@@ -8,8 +8,10 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 val openapi by configurations.creating {
diff --git a/boudicca.base/eventdb/build.gradle.kts b/boudicca.base/eventdb/build.gradle.kts
index 937550de..2be60b40 100644
--- a/boudicca.base/eventdb/build.gradle.kts
+++ b/boudicca.base/eventdb/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.3"
@@ -8,7 +6,10 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -27,11 +28,8 @@ dependencies {
     testImplementation("org.springframework.security:spring-security-test")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
 
 tasks.withType<Test> {
diff --git a/boudicca.base/publisher-api/build.gradle.kts b/boudicca.base/publisher-api/build.gradle.kts
index 0573c6cb..38e7810f 100644
--- a/boudicca.base/publisher-api/build.gradle.kts
+++ b/boudicca.base/publisher-api/build.gradle.kts
@@ -14,11 +14,12 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
     kotlinOptions.javaParameters = true
 }
diff --git a/boudicca.base/publisher-event-html/build.gradle.kts b/boudicca.base/publisher-event-html/build.gradle.kts
index dc3b08e5..a7487b80 100644
--- a/boudicca.base/publisher-event-html/build.gradle.kts
+++ b/boudicca.base/publisher-event-html/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.3"
@@ -8,7 +6,10 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -25,11 +26,8 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
 
 tasks.withType<Test> {
diff --git a/boudicca.base/publisher-event-ical/build.gradle.kts b/boudicca.base/publisher-event-ical/build.gradle.kts
index a4138501..97990081 100644
--- a/boudicca.base/publisher-event-ical/build.gradle.kts
+++ b/boudicca.base/publisher-event-ical/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.3"
@@ -8,7 +6,10 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -32,11 +33,8 @@ dependencies {
     testImplementation("org.springframework.security:spring-security-test")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
 
 tasks.withType<Test> {
diff --git a/boudicca.base/search-api/build.gradle.kts b/boudicca.base/search-api/build.gradle.kts
index b8153e17..1af074ec 100644
--- a/boudicca.base/search-api/build.gradle.kts
+++ b/boudicca.base/search-api/build.gradle.kts
@@ -15,12 +15,13 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
     kotlinOptions.javaParameters = true
 }
 
diff --git a/boudicca.base/search-openapi/build.gradle.kts b/boudicca.base/search-openapi/build.gradle.kts
index dfc6db16..243ed901 100644
--- a/boudicca.base/search-openapi/build.gradle.kts
+++ b/boudicca.base/search-openapi/build.gradle.kts
@@ -8,8 +8,10 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 val openapi by configurations.creating {
diff --git a/boudicca.base/search/build.gradle.kts b/boudicca.base/search/build.gradle.kts
index e1dfb25d..d9cb1640 100644
--- a/boudicca.base/search/build.gradle.kts
+++ b/boudicca.base/search/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.3"
@@ -8,7 +6,10 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 repositories {
@@ -27,11 +28,8 @@ dependencies {
     testImplementation("org.springframework.security:spring-security-test")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
 
 tasks.withType<Test> {
diff --git a/boudicca.base/semantic-conventions/build.gradle.kts b/boudicca.base/semantic-conventions/build.gradle.kts
index 6a1530a8..98242324 100644
--- a/boudicca.base/semantic-conventions/build.gradle.kts
+++ b/boudicca.base/semantic-conventions/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("java-library")
+    kotlin("jvm")
 }
 
 repositories {
@@ -10,6 +10,12 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
 }
diff --git a/boudicca.events/eventcollectors/build.gradle.kts b/boudicca.events/eventcollectors/build.gradle.kts
index a6267602..d041f584 100644
--- a/boudicca.events/eventcollectors/build.gradle.kts
+++ b/boudicca.events/eventcollectors/build.gradle.kts
@@ -19,12 +19,13 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
     kotlinOptions.javaParameters = true
 }