diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 129dcc03dc2d05..787acfe7b893ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -351,7 +351,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Build and test
-        run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
+        run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
 
   build-wasi:
     name: 'WASI'
diff --git a/Android/README.md b/Android/README.md
index 0004f26e72b21c..0474bdf1a79147 100644
--- a/Android/README.md
+++ b/Android/README.md
@@ -31,7 +31,8 @@ any packages it needs.
 The script also requires the following commands to be on the `PATH`:
 
 * `curl`
-* `java` (or set the `JAVA_HOME` environment variable)
+* `java` (or set the `JAVA_HOME` environment variable).
+  Java versions 17 and 21 are supported.
 
 
 ## Building