diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index 3d3128c1ceb..a668739910d 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -59,13 +59,6 @@ get_gles_runtime_version
 get_vk_runtime_device_name
 get_vk_runtime_version
 
-# download Android Mesa from S3
-curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
-mkdir /mesa-android
-tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-
-INSTALL="/mesa-android/install"
-
 # replace libraries
 
 $ADB shell rm -f /vendor/lib64/libgallium_dri.so*
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 046ec916eb5..6f4881ff759 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -88,6 +88,14 @@ sleep 1
 
 popd
 
+# download Android Mesa from S3
+curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
+mkdir /mesa-android
+tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
+
+# shellcheck disable=SC2034 # used externally
+INSTALL="/mesa-android/install"
+
 # shellcheck disable=SC2034 # used externally
 ADB=adb