diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b98cbd9bbc..da2c9e49672 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ If you are interested in contributing to the Micronaut Framework and are looking
 
 ## JDK Setup
 
-The Micronaut Framework currently requires JDK 8
+The Micronaut Framework currently requires JDK 17
 
 ## IDE Setup
 
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle
index d76a85e56bb..c799a3a1182 100644
--- a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle
+++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle
@@ -3,13 +3,11 @@ plugins {
     id "io.micronaut.build.internal.convention-base"
 }
 
-configurations {
-    all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            String group = details.requested.group
-            if (group == 'org.ow2.asm') {
-                details.useVersion(libs.versions.asm.get())
-            }
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        String group = details.requested.group
+        if (group == 'org.ow2.asm') {
+            details.useVersion(libs.versions.asm.get())
         }
     }
 }
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle
index cfeabf60100..29cd4054861 100644
--- a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle
+++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 tasks.named("htmlSanityCheck") {
-    sourceDir = new File("${rootProject.buildDir}/docs/guide/")
+    sourceDir = rootProject.layout.buildDirectory.dir("docs/guide").get().asFile
     sourceDocuments = fileTree(sourceDir) {
         include "index.html"
     }
diff --git a/core/build.gradle b/core/build.gradle
index d3bd67cfc42..c01121ddefb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -31,7 +31,7 @@ spotless {
 }
 
 def versionInfo = tasks.register("micronautVersionInfo", WriteProperties) {
-    outputFile = "${buildDir}/resources/version/micronaut-version.properties"
+    destinationFile = layout.buildDirectory.file("resources/version/micronaut-version.properties")
     property 'micronaut.version', projectVersion
 }
 tasks.named("processResources") {
diff --git a/inject-kotlin/build.gradle b/inject-kotlin/build.gradle
index 29e9c4911be..17b7f3a5250 100644
--- a/inject-kotlin/build.gradle
+++ b/inject-kotlin/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     api project(":core-processor")
 
     implementation(libs.managed.ksp.api)
+
     kspTest(project)
     kspTest platform(libs.test.boms.micronaut.validation)
     kspTest (libs.micronaut.validation.processor) {
@@ -54,9 +55,12 @@ afterEvaluate {
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    jvmToolchain(17)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    compilerOptions {
         freeCompilerArgs = ['-Xjvm-default=all']
     }
 }