diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
index f679f8a79d1..a62f38be0f2 100644
--- a/.github/workflows/binaries.yml
+++ b/.github/workflows/binaries.yml
@@ -193,7 +193,7 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v3.2.1
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '24'
           distribution: 'corretto'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2daac762c85..382a09ae9d2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -53,7 +53,7 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v3.2.1
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '24'
           distribution: 'corretto'
diff --git a/.github/workflows/run-openrewrite.yml b/.github/workflows/run-openrewrite.yml
index 1b74704ace6..945cd6f4a11 100644
--- a/.github/workflows/run-openrewrite.yml
+++ b/.github/workflows/run-openrewrite.yml
@@ -31,10 +31,10 @@ jobs:
           GH_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}}
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
diff --git a/.github/workflows/tests-code-fetchers.yml b/.github/workflows/tests-code-fetchers.yml
index 90fdb4db59a..03e5fefe762 100644
--- a/.github/workflows/tests-code-fetchers.yml
+++ b/.github/workflows/tests-code-fetchers.yml
@@ -53,10 +53,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run fetcher tests
diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 2bd53e76493..bbf592ce7b2 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -45,10 +45,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Run checkstyle reporter
         uses: dbelyaev/action-checkstyle@master
         with:
@@ -84,10 +84,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -118,10 +118,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -235,10 +235,10 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v5
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -270,10 +270,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Generate JBang cache key
         id: cache-key
         shell: bash
@@ -318,10 +318,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -367,10 +367,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -405,10 +405,10 @@ jobs:
           submodules: 'false'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Generate JBang cache key
         id: cache-key
         shell: bash
@@ -466,10 +466,10 @@ jobs:
           show-progress: 'false'
       - name: Set up JDK
         if: github.ref == 'refs/heads/main'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Generate JBang cache key
@@ -511,10 +511,10 @@ jobs:
         with:
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: 24
+          distribution: 'corretto'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew traceRequirements