diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d45319fa..3490b31b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,9 +26,9 @@ jobs:
           - 17  # LTS
           - 19
         toolchain: [""]
-#        include:
-#          - java: 17
-#            toolchain: 19  # latest
+        include:
+          - java: 17
+            toolchain: 20  # latest
 
     steps:
       - uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: adopt  # Java 8 and 11 are pre-installed on ubuntu-latest
+          distribution: temurin  # Java 8, 11 and 17 are pre-installed on ubuntu-latest
           cache: gradle
 
       - name: Check with Error Prone
@@ -77,7 +77,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: 11
-          distribution: adopt  # pre-installed on ubuntu-latest
+          distribution: temurin  # pre-installed on ubuntu-latest
           cache: gradle
 
       - name: Publish snapshot to oss.sonatype.org
@@ -113,7 +113,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: 11
-          distribution: adopt  # pre-installed on ubuntu-latest
+          distribution: temurin  # pre-installed on ubuntu-latest
           cache: gradle
 
       - name: Release a new stable version to Maven Central
diff --git a/.github/workflows/fonts.yml b/.github/workflows/fonts.yml
index a4247f18..f53703b8 100644
--- a/.github/workflows/fonts.yml
+++ b/.github/workflows/fonts.yml
@@ -36,7 +36,7 @@ jobs:
               uses: actions/setup-java@v3
               with:
                   java-version: 11
-                  distribution: adopt  # pre-installed on ubuntu-latest
+                  distribution: temurin  # pre-installed on ubuntu-latest
                   cache: gradle
 
             - name: Build with Gradle
diff --git a/.github/workflows/natives.yml b/.github/workflows/natives.yml
index 82c2ea58..060b431d 100644
--- a/.github/workflows/natives.yml
+++ b/.github/workflows/natives.yml
@@ -33,7 +33,7 @@ jobs:
               uses: actions/setup-java@v3
               with:
                   java-version: 11
-                  distribution: adopt
+                  distribution: temurin
                   cache: gradle
 
             - name: Build with Gradle
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 016008c5..3d8d1e4d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -40,3 +40,9 @@ fun includeProject( projectPath: String, projectDir: String ) {
 	include( projectPath )
 	project( ":$projectPath" ).projectDir = file( projectDir )
 }
+
+
+// for using newer Java version via toolchain
+plugins {
+	id( "org.gradle.toolchains.foojay-resolver-convention" ) version( "0.5.0" )
+}