diff --git a/recipe_modules/adhoc_validation/examples/full.expected/docs.json b/recipe_modules/adhoc_validation/examples/full.expected/docs.json
index 2f45b64..fbd6199 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/docs.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/docs.json
@@ -520,7 +520,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "Docs.gsutil Upload [START_DIR]/flutter sdk/dev/docs/api_docs.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/linux.json b/recipe_modules/adhoc_validation/examples/full.expected/linux.json
index da80679..75eaa77 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/linux.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/linux.json
@@ -272,7 +272,7 @@
       ]
     },
     "infra_step": true,
-    "name": "Docs.gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "Docs.gsutil Upload [START_DIR]/flutter sdk/dev/docs/api_docs.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/api_docs.zip",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
diff --git a/recipe_modules/archives/api.py b/recipe_modules/archives/api.py
index 2aeddfc..31c38ed 100644
--- a/recipe_modules/archives/api.py
+++ b/recipe_modules/archives/api.py
@@ -131,7 +131,7 @@
     self.m.file.ensure_directory('Ensure %s' % dir_part, local_dst_tree)
     self.m.file.copy('Copy %s to tmp location' % src, src, local_dst_tree)
     self.m.gsutil.upload(
-        name='Upload %s to gs://%s' % ('%s/*' % archive_dir, bucket),
+        name='Upload %s to %s' % (src, dst),
         source='%s/*' % archive_dir,
         bucket=bucket,
         dest='',
@@ -243,8 +243,17 @@
     bucket_and_prefix = LUCI_TO_GCS_PREFIX.get(bucket)
 
     for archive in archives:
+      # Artifacts bucket is calculated using the LUCI bucket but we also use the realm to upload
+      # artifacts to the same bucket but different path when the build configurations use an
+      # experimental realm. Defaults to experimental.
+      artifact_realm = REALM_TO_PATH.get(archive.get('realm', ''), 'experimental')
       source = checkout.join(archive.get('source'))
-      artifact_path = '/'.join(filter(bool, [bucket_and_prefix, 'flutter', commit, archive.get('destination')]))
+      artifact_path = '/'.join(
+          filter(
+              bool, [bucket_and_prefix, 'flutter', artifact_realm, commit,
+                        archive.get('destination')]
+          )
+      )
       dst = 'gs://%s' % artifact_path
       results.append(ArchivePaths(self.m.path.abspath(source), dst))
     return results
diff --git a/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
index b81ce88..12638f2 100644
--- a/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/flutter_pool_experimental_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json
index bab7f9f..0fcbe30 100644
--- a/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/flutter_pool_production_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_ci.json b/recipe_modules/archives/examples/full.expected/monorepo_ci.json
index ec34f42..7a1b96d 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_ci.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_ci.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json b/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
index 45fb296..a22e7e1 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_ci_experimental_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
index b451ef1..432ffb9 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
index 4531380..3c10317 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_production_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
index cfc24d8..6fc4fd0 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
index 99a3b53..b5c88f7 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
index 50f808b..7e4a6e5 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
index 206a062..3d0d517 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipe_modules/archives/examples/global_generator_paths.py b/recipe_modules/archives/examples/global_generator_paths.py
index 368f997..037214c 100644
--- a/recipe_modules/archives/examples/global_generator_paths.py
+++ b/recipe_modules/archives/examples/global_generator_paths.py
@@ -36,29 +36,29 @@
   expected_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/release-nobitcode/Flutter.dSYM.zip')),
-          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')),
-          remote='gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
       )
   ]
   expected_monorepo_results = [
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
       ),
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/release-nobitcode/Flutter.dSYM.zip')),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
       ),
       ArchivePaths(
           local=str(api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')),
-          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+          remote='gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
       )
   ]
   env_to_results = {
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 8cef752..8eef5dc 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -1038,7 +1038,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1179,7 +1179,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1320,7 +1320,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
index 8c0e474..d43dc59 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
@@ -1185,7 +1185,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1415,7 +1415,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1645,7 +1645,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 1ff7c25..cac019a 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -1172,7 +1172,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1313,7 +1313,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
@@ -1454,7 +1454,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/* to gs://download.flutter.io",
+    "name": "gsutil Upload [CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom to gs://download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/download.flutter.io/@@@"
     ]
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 6f1020d..4c04876 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -1044,7 +1044,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip to gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
@@ -1185,7 +1185,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_archives_v2",
+    "name": "gsutil Upload [CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io to gs://flutter_archives_v2/monorepo//download.flutter.io",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
     ]
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 8ab1faa..87ff719 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -798,7 +798,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -813,7 +813,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+    "name": "Ensure flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
   },
   {
     "cmd": [
@@ -824,7 +824,7 @@
       "/path/to/tmp/json",
       "copy",
       "/a/b/c.txt",
-      "[CLEANUP]/tmp_tmp_1/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+      "[CLEANUP]/tmp_tmp_1/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket"
     ],
     "infra_step": true,
     "luci_context": {
@@ -867,7 +867,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload /a/b/c.txt to gs://flutter_infra_release/flutter/experimental/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/engine_v2/signer.expected/config_from_file.json b/recipes/engine_v2/signer.expected/config_from_file.json
index 76ac771..f8c2f61 100644
--- a/recipes/engine_v2/signer.expected/config_from_file.json
+++ b/recipes/engine_v2/signer.expected/config_from_file.json
@@ -311,7 +311,7 @@
       "gs://a/"
     ],
     "infra_step": true,
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_4/* to gs://a",
+    "name": "gsutil Upload [CLEANUP]/tmp_tmp_3/artifact.zip to gs://a/b/c/artifact.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/a/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json
index 0f2b710..08f6315 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json
index 0f2b710..08f6315 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_experimental_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json
index 5ad72d6..67b9e68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json
index 9758f05..1f33a1a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json
index 5ad72d6..67b9e68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json
index 9758f05..1f33a1a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_beta_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json
index 80034e8..e5b4578 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
index b4abc66..2f7fd04 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
index 80034e8..e5b4578 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
index b4abc66..2f7fd04 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json
index 86a24c3..6f44fac 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
index 7f166b8..af812ed 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json
index 86a24c3..6f44fac 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
index 7f166b8..af812ed 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json
index 06c77a4..36b68fb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json
index 06c77a4..36b68fb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_experimental_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json
index ea7c855..0a2cce1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json
index 810ce5e..2bb26ca 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json
index ea7c855..0a2cce1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json
index 810ce5e..2bb26ca 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_stable_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.tar.xz to gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json
index 873f79d..5503f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json
index 873f79d..5503f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json
index dd5b79d..d5c9496 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
index 8b75154..ec68cdc 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json
index dd5b79d..d5c9496 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
index 8b75154..ec68cdc 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json
index 35fc8aa..77414d0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
index 3bac76a..c868374 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
index 35fc8aa..77414d0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
index 3bac76a..c868374 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json
index d9a9d7e..8255018 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
index fda22e5..66a90e1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json
index d9a9d7e..8255018 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_flutter.json
@@ -1050,7 +1050,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
index fda22e5..66a90e1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json
index 7686dbf..a5c0539 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json
index 7686dbf..a5c0539 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json
index 94c9bb9..dd8031b 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
index 6aadb74..5ce305a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json
index 94c9bb9..dd8031b 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_flutter.json
@@ -1107,7 +1107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1266,7 +1266,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
index 6aadb74..5ce305a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
@@ -872,7 +872,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]/tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]/archive/flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json
index 5fe24a2..a341cba 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json
index 5fe24a2..a341cba 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json
index 8cac855..31b9d83 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
index 1bf14e3..4737258 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json
index 8cac855..31b9d83 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
index 1bf14e3..4737258 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json
index b25ea05..5dab6e1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_flutter.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
index 4c0a61e..9f48e4e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json
index b25ea05..5dab6e1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_flutter.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
index 4c0a61e..9f48e4e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json
index f473a62..c4c2bd3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_flutter.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
index 663c7ca..7c53be1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json
index f473a62..c4c2bd3 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_flutter.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
index 663c7ca..7c53be1 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json
index e3be1da..7343043 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json
index e3be1da..7343043 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json
index 0a40555..102d409 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
index c43eb0a..5d1eb11 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json
index 0a40555..102d409 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_flutter.json
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\releases_linux.json to gs://flutter_infra_release/releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1162,7 +1162,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_2/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
index c43eb0a..5d1eb11 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
@@ -942,7 +942,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil Upload [CLEANUP]\\tmp_tmp_1/* to gs://flutter_infra_release",
+    "name": "gsutil Upload [START_DIR]\\archive\\flutter-archive-package.zip to gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]