diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48139aee..73c6e280 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,8 @@ jobs:
           dotnet-version: 3.1.x
       - uses: actions/setup-java@v4
         with:
-          java-version: '17' # The JDK version to make available on the path.
+          java-version: '21' # The JDK version to make available on the path.
+          distribution: 'zulu'
       - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
         working-directory: ./source
         run: dotnet clean -c Release && dotnet nuget locals all --clear
@@ -144,4 +145,4 @@ jobs:
     steps:
       - uses: release-drafter/release-drafter@v5
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 97d02eb2..3ad79439 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -60,9 +60,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 3.1.x
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: '17' # The JDK version to make available on the path.
+          java-version: '21' # The JDK version to make available on the path.
+          distribution: 'zulu'
       - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
         working-directory: ./source
         run: dotnet clean -c Release && dotnet nuget locals all --clear
@@ -136,4 +137,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: Benchmark
-          path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/
\ No newline at end of file
+          path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/