diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85d9a06d2..b50580e73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ on:
   workflow_dispatch:
 
 env:
+  JAVA_VERSION: "21"
   GIT_USERNAME: ${{ secrets.BOT_GITHUB_USERNAME }}
   GIT_EMAIL: ${{ secrets.BOT_GITHUB_EMAIL }}
   GIT_PASSWORD: ${{ secrets.BOT_GITHUB_TOKEN }}
@@ -43,6 +44,8 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
 
   tas_tests:
@@ -93,6 +96,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -115,6 +120,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -140,6 +147,8 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -178,6 +187,8 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: "Init"
@@ -212,6 +223,8 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: "Init"
diff --git a/.github/workflows/precommit_formatter.yml b/.github/workflows/precommit_formatter.yml
index 119186d45..2f31c8974 100644
--- a/.github/workflows/precommit_formatter.yml
+++ b/.github/workflows/precommit_formatter.yml
@@ -6,6 +6,7 @@ on:
       - precommit/**
 
 env:
+  JAVA_VERSION: "21"
   MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
   MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
 
@@ -19,6 +20,8 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Set up Python ${{ inputs.python-version }}
         uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 554c7dba5..4eea3cf14 100644
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -114,7 +114,7 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 21 -->
                     <argLine>
                         --illegal-access=warn
                         --add-opens=java.base/java.lang=ALL-UNNAMED
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 83071a7b2..abf465754 100644
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -90,7 +90,7 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 21 -->
                     <argLine>
                         --illegal-access=warn
                         --add-opens=java.base/java.lang=ALL-UNNAMED