diff --git a/build.gradle b/build.gradle
index 89992042dc..8f0a3e2970 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id "io.freefair.aspectj" version '6.3.0' apply false
+	id "io.freefair.aspectj" version '6.4.0' apply false
 	id 'org.jetbrains.dokka' version '1.6.0' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
@@ -51,7 +51,7 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.8.RC3') {
+			dependencySet(group: 'org.aspectj', version: '1.9.8') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 15ee3bcfc5..302504cabc 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -118,7 +118,7 @@ pluginManager.withPlugin("kotlin") {
 		}
 	}
 	else {
-		// Fallback to JDK11
+		// Fallback to JDK17
 		compileKotlin {
 			kotlinOptions {
 				jvmTarget = '1.8'