diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04b77b60..c307d5a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,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
@@ -74,7 +76,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"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: mvn install $MAVEN_CLI_OPTS -DskipTests=true -Dmaven.javadoc.skip=true
@@ -95,7 +99,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@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: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Release"
@@ -121,7 +127,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: "Publish artifacts"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: mvn deploy $MAVEN_CLI_OPTS -DskipTests=true
diff --git a/README.md b/README.md
index 24b62afb..82fdafdb 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ contains a `docker-compose` file and scripts that allows you to build and run th
 
 ### Pre-Requisites
 
-* Java version 17 or higher
+* Java version 21 or higher
 * Spring boot 3.1 or higher
 * Maven version 3.3 or higher
 
@@ -311,7 +311,7 @@ More Information: [Configuring Alfresco Event Gateway](https://www.github.com/Al
 
 ### Pre-Requisites
 
-* Java version 17 or higher
+* Java version 21 or higher
 * Maven version 3.3 or higher
 
 ### Build command
diff --git a/samples/event-api-handlers/README.md b/samples/event-api-handlers/README.md
index f2750f2e..73e644df 100644
--- a/samples/event-api-handlers/README.md
+++ b/samples/event-api-handlers/README.md
@@ -12,7 +12,7 @@ that log information about the handled events.
 
 To properly build and run the project in a local environment it is required to have installed some tools.
 
-* Java 17:
+* Java 21:
 ```bash
 $ java -version