diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 058895c2b77d..44ff2c16b158 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 22, cache: 'true', cleanup-node: 'false' }
+          - { java-version: 21, cache: 'true', cleanup-node: 'true' }
+          - { java-version: 22, cache: 'restore', cleanup-node: 'false' }
+          - { java-version: 23-ea, cache: 'restore', cleanup-node: 'true' }
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4