diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4963616..bdbdfae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,11 +15,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        distribution: 'temurin' # See 'Supported distributions' for available options
+        java-version: '21'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Codecov
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e223417..6141896 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,10 +19,10 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up JAVA 8
+      - name: Set up JAVA 21
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: '21'
           distribution: "temurin"
 
       - name: Determine the version
@@ -41,10 +41,10 @@ jobs:
           exit 1
         if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name
 
-      - name: Set up JDK 8 for snapshots
+      - name: Set up JDK 21 for snapshots
         uses: actions/setup-java@v4
         with:
-          java-version: "8"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-snapshots
@@ -52,10 +52,10 @@ jobs:
           server-password: MAVEN_PASSWORD
         if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT'))
 
-      - name: Set up JDK 8 for releases
+      - name: Set up JDK 21 for releases
         uses: actions/setup-java@v4
         with:
-          java-version: "8"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-releases