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 acb7bea..6c45973 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/releases_linux.json",
+    "name": "gsutil 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 acb7bea..6c45973 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/releases_linux.json",
+    "name": "gsutil 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 929cf41..667a8b6 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux (2)"
+    "name": "Ensure releases/beta/linux"
   },
   {
     "cmd": [
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 929cf41..667a8b6 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/linux/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/linux (2)"
+    "name": "Ensure releases/beta/linux"
   },
   {
     "cmd": [
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 8b141b6..eb4a742 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/releases_linux.json",
+    "name": "gsutil 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 8b141b6..eb4a742 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/releases_linux.json",
+    "name": "gsutil 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 09df1b6..f4e294d 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux (2)"
+    "name": "Ensure releases/stable/linux"
   },
   {
     "cmd": [
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 09df1b6..f4e294d 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/linux"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/linux/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/linux/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/linux (2)"
+    "name": "Ensure releases/stable/linux"
   },
   {
     "cmd": [
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 4329c8b..b886faa 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/releases_linux.json",
+    "name": "gsutil 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 4329c8b..b886faa 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/releases_linux.json",
+    "name": "gsutil 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 ef254f0..63a4ebf 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos (2)"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
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 ef254f0..63a4ebf 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/macos/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/macos (2)"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
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 527c446..a2eee59 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/releases_linux.json",
+    "name": "gsutil 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 527c446..a2eee59 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/releases_linux.json",
+    "name": "gsutil 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 99953a8..2b288eb 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos (2)"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
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 99953a8..2b288eb 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
@@ -960,7 +960,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1000,7 +1000,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -1011,7 +1011,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
+      "[CLEANUP]/tmp_tmp_1/releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1051,7 +1051,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -1104,7 +1104,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/macos/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/macos (2)"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
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 5fa5c89..a4f8b8e 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/releases_linux.json",
+    "name": "gsutil 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 5fa5c89..a4f8b8e 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/releases_linux.json",
+    "name": "gsutil 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 80069f2..fc77956 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows (2)"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
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 80069f2..fc77956 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/windows/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/windows (2)"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
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 76a3a88..450b84e 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/releases_linux.json",
+    "name": "gsutil 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 76a3a88..450b84e 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/releases_linux.json",
+    "name": "gsutil 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 c1d6ab0..85f2309 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows (2)"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
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 c1d6ab0..85f2309 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
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows"
+    "name": "Ensure releases"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
+      "[CLEANUP]\\tmp_tmp_1\\releases"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/windows/releases_linux.json",
+    "name": "gsutil releases/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/windows (2)"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
diff --git a/recipes/packaging_v2/packaging_v2.py b/recipes/packaging_v2/packaging_v2.py
index d46a224..857a811 100644
--- a/recipes/packaging_v2/packaging_v2.py
+++ b/recipes/packaging_v2/packaging_v2.py
@@ -88,7 +88,8 @@
         pkg_gs_path = '%s/%s' % (dest_gs, file_name)
         metadata_absolute_path = GetFlutterMetadataAbsolutePath(api, work_dir)
         metadata_filename = api.path.basename(metadata_absolute_path)
-        metadata_gs_path = "%s/%s" % (dest_gs, metadata_filename)
+        metadata_dst = 'gs://flutter_infra_release/releases'
+        metadata_gs_path = "%s/%s" % (metadata_dst, metadata_filename)
         api.archives.upload_artifact(metadata_absolute_path, metadata_gs_path)
       else:
         # add experimental subpath if branch is not beta or stable