diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0af6bba..994f062b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+        with:
+          java-version: '21'
       - name: "Clean-up SNAPSHOT artifacts"
         run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
       - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
@@ -54,7 +56,9 @@ jobs:
         -B -q -e -fae -V -DinstallAtEnd=true -U
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+        with:
+          java-version: '21'
       - name: "Build"
         run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
       - name: "Verify"
@@ -71,8 +75,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "current version Java 17"
-            java-version: 17
+          - name: "current version Java 21"
+            java-version: 21
           - name: "23.3 Enterprise Java 17"
             java-version: 17
             suite: -Penterprise-233-tests
@@ -136,9 +140,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
         with:
-          java-version: ${{ matrix.java-version }}
+          java-version: 21
       - name: "Login to Docker Hub"
         uses: docker/login-action@v3
         with:
@@ -162,7 +166,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+        with:
+          java-version: '21'
       - name: "Build"
         run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
       - name: "Publish"