diff --git a/.github/workflows/maven-acceptance-manual.yml b/.github/workflows/maven-acceptance-manual.yml
index fff637bc..fd8a25b4 100644
--- a/.github/workflows/maven-acceptance-manual.yml
+++ b/.github/workflows/maven-acceptance-manual.yml
@@ -27,7 +27,10 @@ jobs:
           - jdk: '21'
             distribution: 'temurin'
             experimental: false
-          - jdk: '22-ea'
+          - jdk: '22'
+            distribution: 'zulu'
+            experimental: true
+          - jdk: '23-ea'
             distribution: 'zulu'
             experimental: true
     continue-on-error: ${{ matrix.experimental }}
diff --git a/.github/workflows/maven-acceptance-wide.yml b/.github/workflows/maven-acceptance-wide.yml
index 57fa02da..2db2739d 100644
--- a/.github/workflows/maven-acceptance-wide.yml
+++ b/.github/workflows/maven-acceptance-wide.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: CI acceptance tests
+name: CI acceptance tests (more JDKs)
 
 on:
   schedule:
@@ -20,13 +20,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: ['17']
+        jdk: ['17', '21']
         distribution: ['temurin', 'corretto', 'microsoft', 'adopt-openj9', 'zulu']
         experimental: [false]
         include:
-          - jdk: '21'
+          - jdk: '22'
             distribution: 'zulu'
-            experimental: false
+            experimental: true
           # - jdk: '22-ea'
           #   distribution: 'zulu'
           #   experimental: true
diff --git a/.github/workflows/maven-acceptance.yml b/.github/workflows/maven-acceptance.yml
index 7b453078..8b26858a 100644
--- a/.github/workflows/maven-acceptance.yml
+++ b/.github/workflows/maven-acceptance.yml
@@ -21,16 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # jdk: ['11']
-        # distribution: ['temurin', 'corretto', 'microsoft', 'adopt-openj9', 'zulu']
-        # experimental: [false]
+        jdk: ['17', '21']
+        distribution: ['temurin']
+        experimental: [false]
         include:
-          - jdk: '17'
+          - jdk: '22'
             distribution: 'zulu'
-            experimental: false
-          # - jdk: '19'
-          #   distribution: 'zulu'
-          #   experimental: true
+            experimental: true
     continue-on-error: ${{ matrix.experimental }}
 
     steps:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 90d5e01e..d68fa3bd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,14 +21,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: ['17']
+        jdk: ['17', '21']
         distribution: ['temurin']
         experimental: [false]
         include:
-          - jdk: '20'
+          - jdk: '22'
             distribution: zulu
             experimental: true
-          - jdk: '21'
+          - jdk: '23-ea'
             distribution: zulu
             experimental: true
     continue-on-error: ${{ matrix.experimental }}