diff --git a/.github/workflows/callable.build.yml b/.github/workflows/callable.build.yml
index c5cf54d..6cc8aae 100644
--- a/.github/workflows/callable.build.yml
+++ b/.github/workflows/callable.build.yml
@@ -11,10 +11,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.code-analysis.codeql.yml b/.github/workflows/callable.code-analysis.codeql.yml
index 841e38e..ccee8ca 100644
--- a/.github/workflows/callable.code-analysis.codeql.yml
+++ b/.github/workflows/callable.code-analysis.codeql.yml
@@ -35,10 +35,6 @@ jobs:
           # queries: security-extended,security-and-quality
           queries: security-extended,security-and-quality
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.code-analysis.trivy.yml b/.github/workflows/callable.code-analysis.trivy.yml
index a71e420..140c174 100644
--- a/.github/workflows/callable.code-analysis.trivy.yml
+++ b/.github/workflows/callable.code-analysis.trivy.yml
@@ -17,10 +17,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.gradle-release.yml b/.github/workflows/callable.gradle-release.yml
index dbb6519..7df2e44 100644
--- a/.github/workflows/callable.gradle-release.yml
+++ b/.github/workflows/callable.gradle-release.yml
@@ -27,10 +27,6 @@ jobs:
         with:
           ref: main
           token: ${{ secrets.CI_GITHUB_TOKEN }}
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.integration-test.yml b/.github/workflows/callable.integration-test.yml
index 7919d1a..e8bc8af 100644
--- a/.github/workflows/callable.integration-test.yml
+++ b/.github/workflows/callable.integration-test.yml
@@ -11,10 +11,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.publish-javadoc.yml b/.github/workflows/callable.publish-javadoc.yml
index 8401cf2..915be4b 100644
--- a/.github/workflows/callable.publish-javadoc.yml
+++ b/.github/workflows/callable.publish-javadoc.yml
@@ -14,10 +14,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/.github/workflows/callable.publish-sonatype.yml b/.github/workflows/callable.publish-sonatype.yml
index f238134..7152998 100644
--- a/.github/workflows/callable.publish-sonatype.yml
+++ b/.github/workflows/callable.publish-sonatype.yml
@@ -10,10 +10,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.3.2
diff --git a/java-library-template/build.gradle.kts b/java-library-template/build.gradle.kts
index 9f96f54..c816d1b 100644
--- a/java-library-template/build.gradle.kts
+++ b/java-library-template/build.gradle.kts
@@ -1,3 +1,13 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
+
+plugins {
+    // Apply the java-library plugin for API and implementation separation.
+    `java-library`
+    `maven-publish`
+    signing
+}
+
 group = "dev.thriving.oss"
 
 object Meta {
@@ -14,14 +24,10 @@ object Meta {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-}
-
-plugins {
-    // Apply the java-library plugin for API and implementation separation.
-    `java-library`
-    `maven-publish`
-    signing
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+        vendor = JvmVendorSpec.AMAZON
+    }
 }
 
 repositories {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f105b4f..7490edb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "java-library-template"
 
 include("java-library-template")