diff --git a/docker/build-android-with-docker.sh b/docker/build-android-with-docker.sh
index 8496c20979..6b49ae4d9d 100755
--- a/docker/build-android-with-docker.sh
+++ b/docker/build-android-with-docker.sh
@@ -21,7 +21,7 @@ function get_default_lunch_target {
     local def_lunch_target=""
     case "$(uname -m)" in
         x86_64|i386|x86|amd64) def_lunch_target="aosp_cf_x86_64_phone-trunk_staging-userdebug" ;;
-        aarch64|arm64) def_lunch_target="aosp_cf_arm64_phone-userdebug" ;;
+        aarch64|arm64) def_lunch_target="aosp_cf_arm64_only_phone-trunk_staging-userdebug" ;;
         *)
             >&2 echo "unsupported architecture $(uname -m)"
             exit 10
diff --git a/docker/download-aosp.sh b/docker/download-aosp.sh
index 4811169b76..35b1f72ab1 100755
--- a/docker/download-aosp.sh
+++ b/docker/download-aosp.sh
@@ -27,12 +27,15 @@ function parse_opts() {
 					ARCH=$2
 					case "${ARCH}" in
 						x86)
+							TARGET='aosp_x86-trunk_staging-userdebug'
 							THROTTLED=
 							;;
 						x86_64)
-							THROTTLED='-throttled'
+							TARGET='aosp_cf_x86_64_phone-trunk_staging-userdebug'
+							THROTTLED=
 							;;
 						arm64|aarch64)
+							TARGET='aosp_cf_arm64_only_phone-trunk_staging-userdebug'
 							ARCH='arm64'
 							THROTTLED='-throttled'
 							;;
@@ -134,7 +137,7 @@ SKIP_USERDATA=""
 
 parse_opts $*
 
-URL=https://ci.android.com/builds/latest/branches/aosp-main${THROTTLED}/targets/aosp_cf_${ARCH}_phone-userdebug/view/BUILD_INFO
+URL=https://ci.android.com/builds/latest/branches/aosp-main${THROTTLED}/targets/${TARGET}/view/BUILD_INFO
 RURL=$(curl -Ls -o /dev/null -w %{url_effective} ${URL})
 
 if [ "${DOWNLOAD_ANDROID}" -eq 1 ]; then