diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 3e0c51ca1..2e6e9abd3 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -184,6 +184,10 @@ jobs:
       with:
         key: ${{ github.job }}
 
+    - name: Create data.zip in assets directory
+      run: zip -r test/android/app/src/main/assets/data.zip -@ < test/android/app/src/main/assets/to_zip.txt
+      working-directory: .
+
     - name: Build C++ Unit Tests App
       run: |
         ./gradlew assembleDebug assembleAndroidTest
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index a6a17b3a1..406fb6ad3 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -29,8 +29,9 @@ jobs:
             appFile: "MapLibreAndroidTestApp-drawable-release.apk",
             name: "Android Benchmark",
             testFilter: "org.maplibre.android.benchmark.Benchmark",
-            # top devices, query with `aws list-device-pools --arn <project_arn>`
-            devicePool: "arn:aws:devicefarm:us-west-2::devicepool:082d10e5-d7d7-48a5-ba5c-b33d66efa1f5",
+            # Google Pixel 7 Pro
+            # query with `aws list-device-pools --arn <project_arn>`
+            devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564",
             # benchmark-android.yaml
             # see https://github.com/maplibre/ci-runners/tree/main/aws-device-farm/custom-test-envs
             testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/14862afb-cf88-44aa-9f1e-5131cbb22f01"
@@ -159,7 +160,7 @@ jobs:
           node scripts/aws-device-farm/log-test-spec-output.mjs ${{ steps.aws_device_farm_run.outputs.runArn }}
 
       - name: Generate another token (previous one could have expired)
-        if: always() && env.run_device_test == 'true'
+        if: always()
         id: generate_token_2
         uses: tibdex/github-app-token@v2
         with: