diff --git a/.github/workflows/test-e2e.yaml b/.github/workflows/test-e2e.yaml
index 2b096d6d25..4d51459893 100644
--- a/.github/workflows/test-e2e.yaml
+++ b/.github/workflows/test-e2e.yaml
@@ -74,10 +74,10 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          distribution: zulu
-          java-version: 8
+          distribution: temurin
+          java-version: 17
 
-      - name: Download artifacts
+      - name: Download Maestro build from previous job
         uses: actions/download-artifact@v4
         with:
           name: maestro-cli-jdk11-run_id${{ github.run_id }}
@@ -105,8 +105,8 @@ jobs:
 
       - name: Set up Android Command-line Tools
         run: |
-          # v8, latest working on Java 8. Source: https://stackoverflow.com/a/78890086/7009800
-          install_android_sdk https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip
+          # v13
+          install_android_sdk https://dl.google.com/android/repository/commandlinetools-linux-11479570_latest.zip
           echo "$ANDROID_HOME/cmdline-tools/latest/bin:$PATH" >> $GITHUB_PATH
 
       - name: Set up Android SDK components