diff --git a/build.gradle b/build.gradle
index f1daf875..beec9739 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,14 +62,10 @@ version = project.findProperty('projectVersion')
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(25)
+        vendor = JvmVendorSpec.BELLSOFT
     }
 }
 
-sourceSets {
-    main.java.srcDirs 'src/main'
-    test.java.srcDirs 'src/test'
-}
-
 test {
     useJUnitPlatform()
 }
diff --git a/settings.gradle b/settings.gradle
index e592e50e..78382907 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
 rootProject.name = 'sdr-trunk'
\ No newline at end of file