diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 0db272f2..85149530 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -7,15 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '15', '17' ]
+        java: [ '11', '17', '21', '25' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v6
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 07b3f791..67b02501 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,10 +7,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots verify
 
@@ -21,10 +21,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Setup Maven Central
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index ef517529..465674fa 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -10,10 +10,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots verify
 
@@ -24,10 +24,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Setup Maven Central
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD