diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1926c73c..08287f2c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 17, 21-ea ]
+        java_version: [ 17, 21 ]
 
     steps:
     - name: Checkout for build
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 4f86927b..0774a135 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -41,7 +41,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '20'
+          java-version: '21'
           cache: maven
       - name: Add static content
         run: |