diff --git a/recipes/packaging/packaging.expected/linux_beta_cosign.json b/recipes/packaging/packaging.expected/linux_beta_cosign.json
deleted file mode 100644
index 2baef77..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_cosign_prod.json
index 176621a..451a985 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_cosign_staging.json
index 176621a..be19fcf 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_experimental_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json
rename to recipes/packaging/packaging.expected/linux_beta_experimental_cosign_prod.json
index 80cc8a4..7525468 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_cosign_staging.json
index 176621a..22cbf4c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_beta_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_prod.json
index 54d49ac..e66ed11 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental.json b/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_beta_experimental.json
rename to recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
index 3af5cd9..af7e2fc 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_upload.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload.json
deleted file mode 100644
index 3af5cd9..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_upload.json
+++ /dev/null
@@ -1,668 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign.json
deleted file mode 100644
index 80cc8a4..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign.json
+++ /dev/null
@@ -1,872 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_prod.json
index 80cc8a4..7525468 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_staging.json
index 176621a..22cbf4c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json
index 54d49ac..e66ed11 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_beta_experimental.json
copy to recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json
index 3af5cd9..af7e2fc 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental.json
+++ b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_beta_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_beta_prod.json
index 54d49ac..57617f0 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_beta_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,7 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
+      "--branch=beta",
       "--publish"
     ],
     "env": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta.json b/recipes/packaging/packaging.expected/linux_beta_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_beta.json
rename to recipes/packaging/packaging.expected/linux_beta_staging.json
index 73d3538..969e285 100644
--- a/recipes/packaging/packaging.expected/linux_beta.json
+++ b/recipes/packaging/packaging.expected/linux_beta_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta_upload.json b/recipes/packaging/packaging.expected/linux_beta_upload.json
deleted file mode 100644
index 73d3538..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_upload.json
+++ /dev/null
@@ -1,669 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_beta_upload_cosign.json b/recipes/packaging/packaging.expected/linux_beta_upload_cosign.json
deleted file mode 100644
index 2baef77..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_upload_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_upload_cosign_prod.json
index 176621a..451a985 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_beta_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_beta_upload_cosign_staging.json
index 176621a..be19fcf 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_beta_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_beta_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_beta_upload_prod.json
index 54d49ac..57617f0 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_beta_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,7 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
+      "--branch=beta",
       "--publish"
     ],
     "env": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_beta.json b/recipes/packaging/packaging.expected/linux_beta_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_beta.json
copy to recipes/packaging/packaging.expected/linux_beta_upload_staging.json
index 73d3538..969e285 100644
--- a/recipes/packaging/packaging.expected/linux_beta.json
+++ b/recipes/packaging/packaging.expected/linux_beta_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master_cosign.json b/recipes/packaging/packaging.expected/linux_master_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_cosign_prod.json
similarity index 94%
rename from recipes/packaging/packaging.expected/linux_master.json
rename to recipes/packaging/packaging.expected/linux_master_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master_experimental.json b/recipes/packaging/packaging.expected/linux_master_experimental.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_experimental.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_master_experimental_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_experimental_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master_upload.json b/recipes/packaging/packaging.expected/linux_master_upload.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master_upload_cosign.json b/recipes/packaging/packaging.expected/linux_master_upload_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/linux_master_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_upload_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_upload_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_upload_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/linux_master_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/linux_master_upload_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/linux_master_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_cosign.json b/recipes/packaging/packaging.expected/linux_stable_cosign.json
deleted file mode 100644
index 07d7bf3..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_cosign_prod.json
index 176621a..a02a6af 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_cosign_staging.json
index 176621a..483b752 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_experimental_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
rename to recipes/packaging/packaging.expected/linux_stable_experimental_cosign_prod.json
index 176621a..d53f301 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_cosign_staging.json
index 176621a..aeb5ab9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
index 54d49ac..08e2b1e 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental.json b/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_stable_experimental.json
rename to recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
index c44e742..e37f21c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload.json
deleted file mode 100644
index c44e742..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload.json
+++ /dev/null
@@ -1,668 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign.json
deleted file mode 100644
index 176621a..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign.json
+++ /dev/null
@@ -1,872 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_prod.json
index 176621a..d53f301 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_staging.json
index 176621a..aeb5ab9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
index 54d49ac..08e2b1e 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental.json b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable_experimental.json
copy to recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
index c44e742..e37f21c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_stable_prod.json
index 54d49ac..ef12857 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/linux_stable.json
rename to recipes/packaging/packaging.expected/linux_stable_staging.json
index 54d49ac..c67732f 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_upload.json b/recipes/packaging/packaging.expected/linux_stable_upload.json
deleted file mode 100644
index 54d49ac..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_upload.json
+++ /dev/null
@@ -1,669 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_upload_cosign.json b/recipes/packaging/packaging.expected/linux_stable_upload_cosign.json
deleted file mode 100644
index 07d7bf3..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_upload_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_upload_cosign_prod.json
index 176621a..a02a6af 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/linux_stable_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/linux_stable_upload_cosign_staging.json
index 176621a..483b752 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/linux_stable_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_stable_upload_prod.json
index 54d49ac..ef12857 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_stable.json b/recipes/packaging/packaging.expected/linux_stable_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/linux_stable.json
copy to recipes/packaging/packaging.expected/linux_stable_upload_staging.json
index 54d49ac..c67732f 100644
--- a/recipes/packaging/packaging.expected/linux_stable.json
+++ b/recipes/packaging/packaging.expected/linux_stable_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_cosign.json b/recipes/packaging/packaging.expected/mac_beta_cosign.json
deleted file mode 100644
index dd3630c..0000000
--- a/recipes/packaging/packaging.expected/mac_beta_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_cosign_prod.json
index 9fcaf05..bfd1078 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_cosign_staging.json
index 9fcaf05..738062e 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_experimental_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
rename to recipes/packaging/packaging.expected/mac_beta_experimental_cosign_prod.json
index 9fcaf05..4969617 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_cosign_staging.json
index 9fcaf05..23698b7 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_prod.json
index 0bc972c..7507eeb 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental.json b/recipes/packaging/packaging.expected/mac_beta_experimental_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_beta_experimental.json
rename to recipes/packaging/packaging.expected/mac_beta_experimental_staging.json
index 0edfc6e..829b2cf 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_upload.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload.json
deleted file mode 100644
index 0edfc6e..0000000
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_upload.json
+++ /dev/null
@@ -1,668 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign.json
deleted file mode 100644
index 9fcaf05..0000000
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign.json
+++ /dev/null
@@ -1,872 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_prod.json
index 9fcaf05..4969617 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_staging.json
index 9fcaf05..23698b7 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json
index 0bc972c..7507eeb 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental.json b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta_experimental.json
copy to recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json
index 0edfc6e..829b2cf 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental.json
+++ b/recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_beta.json
rename to recipes/packaging/packaging.expected/mac_beta_prod.json
index 0bc972c..f4a454a 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_beta_staging.json
index 0bc972c..e5432f5 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_upload.json b/recipes/packaging/packaging.expected/mac_beta_upload.json
deleted file mode 100644
index 0bc972c..0000000
--- a/recipes/packaging/packaging.expected/mac_beta_upload.json
+++ /dev/null
@@ -1,669 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_upload_cosign.json b/recipes/packaging/packaging.expected/mac_beta_upload_cosign.json
deleted file mode 100644
index dd3630c..0000000
--- a/recipes/packaging/packaging.expected/mac_beta_upload_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_upload_cosign_prod.json
index 9fcaf05..bfd1078 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_beta_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_beta_upload_cosign_staging.json
index 9fcaf05..738062e 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_beta_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_beta_upload_prod.json
index 0bc972c..f4a454a 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_beta_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_beta_upload_staging.json
index 0bc972c..e5432f5 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_beta_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_master.json b/recipes/packaging/packaging.expected/mac_master.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_master_cosign.json b/recipes/packaging/packaging.expected/mac_master_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_master_experimental.json b/recipes/packaging/packaging.expected/mac_master_experimental.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_master_experimental_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_upload.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_master_upload.json b/recipes/packaging/packaging.expected/mac_master_upload.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_master_upload_cosign.json b/recipes/packaging/packaging.expected/mac_master_upload_cosign.json
deleted file mode 100644
index 0350aa4..0000000
--- a/recipes/packaging/packaging.expected/mac_master_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_upload_cosign_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_upload_cosign_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_upload_prod.json
index 0350aa4..63bc697 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/linux_master.json b/recipes/packaging/packaging.expected/mac_master_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/linux_master.json
copy to recipes/packaging/packaging.expected/mac_master_upload_staging.json
index 0350aa4..74bde44 100644
--- a/recipes/packaging/packaging.expected/linux_master.json
+++ b/recipes/packaging/packaging.expected/mac_master_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_cosign.json b/recipes/packaging/packaging.expected/mac_stable_cosign.json
deleted file mode 100644
index 7d7ac4c..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_cosign_prod.json
index 9fcaf05..d325e9b 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_cosign_staging.json
index 9fcaf05..1e1e8e5 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_experimental_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json
rename to recipes/packaging/packaging.expected/mac_stable_experimental_cosign_prod.json
index 30aaa0c..fe3bbe4 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_cosign_staging.json
index 9fcaf05..8282aa7 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_stable_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_prod.json
index 0bc972c..6cc5f3b 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental.json b/recipes/packaging/packaging.expected/mac_stable_experimental_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_stable_experimental.json
rename to recipes/packaging/packaging.expected/mac_stable_experimental_staging.json
index 050fb02..8d35d7c 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_upload.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload.json
deleted file mode 100644
index 050fb02..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_upload.json
+++ /dev/null
@@ -1,668 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign.json
deleted file mode 100644
index 30aaa0c..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign.json
+++ /dev/null
@@ -1,872 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_prod.json
index 30aaa0c..fe3bbe4 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_staging.json
index 9fcaf05..8282aa7 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +707,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +758,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +777,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +807,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +823,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +854,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json
index 0bc972c..6cc5f3b 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental.json b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_stable_experimental.json
copy to recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json
index 050fb02..8d35d7c 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -650,7 +650,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_stable_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_stable_prod.json
index 0bc972c..1c76d75 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_stable_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,7 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
+      "--branch=stable",
       "--publish"
     ],
     "env": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable.json b/recipes/packaging/packaging.expected/mac_stable_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/mac_stable.json
rename to recipes/packaging/packaging.expected/mac_stable_staging.json
index 101d9bc..8368c46 100644
--- a/recipes/packaging/packaging.expected/mac_stable.json
+++ b/recipes/packaging/packaging.expected/mac_stable_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable_upload.json b/recipes/packaging/packaging.expected/mac_stable_upload.json
deleted file mode 100644
index 101d9bc..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_upload.json
+++ /dev/null
@@ -1,669 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_stable_upload_cosign.json b/recipes/packaging/packaging.expected/mac_stable_upload_cosign.json
deleted file mode 100644
index 7d7ac4c..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_upload_cosign.json
+++ /dev/null
@@ -1,873 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_upload_cosign_prod.json
index 9fcaf05..d325e9b 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/mac_stable_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
copy to recipes/packaging/packaging.expected/mac_stable_upload_cosign_staging.json
index 9fcaf05..1e1e8e5 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/mac_stable_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -625,7 +625,8 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -707,7 +708,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -758,7 +759,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -777,7 +778,7 @@
       "blob",
       "-f",
       "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -807,7 +808,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -823,7 +824,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -854,7 +855,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_beta.json b/recipes/packaging/packaging.expected/mac_stable_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_beta.json
copy to recipes/packaging/packaging.expected/mac_stable_upload_prod.json
index 0bc972c..1c76d75 100644
--- a/recipes/packaging/packaging.expected/mac_beta.json
+++ b/recipes/packaging/packaging.expected/mac_stable_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,7 +621,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
+      "--branch=stable",
       "--publish"
     ],
     "env": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/mac_stable.json b/recipes/packaging/packaging.expected/mac_stable_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/mac_stable.json
copy to recipes/packaging/packaging.expected/mac_stable_upload_staging.json
index 101d9bc..8368c46 100644
--- a/recipes/packaging/packaging.expected/mac_stable.json
+++ b/recipes/packaging/packaging.expected/mac_stable_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -651,7 +651,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta.json b/recipes/packaging/packaging.expected/win_beta.json
deleted file mode 100644
index 67d3b4a..0000000
--- a/recipes/packaging/packaging.expected/win_beta.json
+++ /dev/null
@@ -1,735 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_cosign.json b/recipes/packaging/packaging.expected/win_beta_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_cosign_prod.json
index 6571045..e6b63f4 100644
--- a/recipes/packaging/packaging.expected/win_stable_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,7 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
+      "--branch=beta",
       "--publish"
     ],
     "env": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_beta_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_cosign_staging.json
index fe9b707..6e43b19 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental.json
deleted file mode 100644
index c1d15b2..0000000
--- a/recipes/packaging/packaging.expected/win_beta_experimental.json
+++ /dev/null
@@ -1,734 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json
deleted file mode 100644
index c7bd1b8..0000000
--- a/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json
+++ /dev/null
@@ -1,943 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/win_beta_cosign.json
rename to recipes/packaging/packaging.expected/win_beta_experimental_cosign_prod.json
index fe9b707..558e611 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,8 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -723,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_beta_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_cosign_staging.json
index fe9b707..c0576ce 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,8 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -723,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_prod.json
index a58c3cd..2ac495a 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_staging.json
index a58c3cd..f725eb5 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload.json
deleted file mode 100644
index c1d15b2..0000000
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload.json
+++ /dev/null
@@ -1,734 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json
deleted file mode 100644
index c7bd1b8..0000000
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json
+++ /dev/null
@@ -1,943 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_beta_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_prod.json
index fe9b707..558e611 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,8 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -723,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_beta_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_staging.json
index fe9b707..c0576ce 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,8 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -723,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json
index a58c3cd..2ac495a 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
index a58c3cd..f725eb5 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_prod.json
index a58c3cd..4070b1c 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_staging.json
index a58c3cd..63cbe49 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_upload.json b/recipes/packaging/packaging.expected/win_beta_upload.json
deleted file mode 100644
index 67d3b4a..0000000
--- a/recipes/packaging/packaging.expected/win_beta_upload.json
+++ /dev/null
@@ -1,735 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_beta_upload_cosign.json b/recipes/packaging/packaging.expected/win_beta_upload_cosign.json
deleted file mode 100644
index fe9b707..0000000
--- a/recipes/packaging/packaging.expected/win_beta_upload_cosign.json
+++ /dev/null
@@ -1,944 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_cosign.json b/recipes/packaging/packaging.expected/win_beta_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_upload_cosign_prod.json
index 6571045..e6b63f4 100644
--- a/recipes/packaging/packaging.expected/win_stable_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,7 +691,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
+      "--branch=beta",
       "--publish"
     ],
     "env": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_upload_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_beta_cosign.json
copy to recipes/packaging/packaging.expected/win_beta_upload_cosign_staging.json
index fe9b707..6e43b19 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/beta/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_upload_prod.json
index a58c3cd..4070b1c 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_beta_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_beta_upload_staging.json
index a58c3cd..63cbe49 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master_cosign.json b/recipes/packaging/packaging.expected/win_master_cosign.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_cosign_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_cosign_staging.json
similarity index 94%
rename from recipes/packaging/packaging.expected/win_master.json
rename to recipes/packaging/packaging.expected/win_master_cosign_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master_experimental.json b/recipes/packaging/packaging.expected/win_master_experimental.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_experimental.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_cosign.json b/recipes/packaging/packaging.expected/win_master_experimental_cosign.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_experimental_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_cosign_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_cosign_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload.json b/recipes/packaging/packaging.expected/win_master_experimental_upload.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master_upload.json b/recipes/packaging/packaging.expected/win_master_upload.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_upload.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master_upload_cosign.json b/recipes/packaging/packaging.expected/win_master_upload_cosign.json
deleted file mode 100644
index ca7a88b..0000000
--- a/recipes/packaging/packaging.expected/win_master_upload_cosign.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_upload_cosign_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_upload_cosign_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_upload_cosign_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_upload_cosign_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_upload_prod.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_upload_prod.json
index ca7a88b..0cd68d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master_upload_staging.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_master.json
copy to recipes/packaging/packaging.expected/win_master_upload_staging.json
index ca7a88b..92af99b 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable.json b/recipes/packaging/packaging.expected/win_stable.json
deleted file mode 100644
index fa7ec7d..0000000
--- a/recipes/packaging/packaging.expected/win_stable.json
+++ /dev/null
@@ -1,735 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_cosign.json b/recipes/packaging/packaging.expected/win_stable_cosign_prod.json
similarity index 95%
rename from recipes/packaging/packaging.expected/win_stable_cosign.json
rename to recipes/packaging/packaging.expected/win_stable_cosign_prod.json
index 6571045..de98324 100644
--- a/recipes/packaging/packaging.expected/win_stable_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_cosign_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
rename to recipes/packaging/packaging.expected/win_stable_cosign_staging.json
index a0f9e53..68ba788 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,7 +691,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -722,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_cosign_prod.json
index a0f9e53..5e874a3 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -722,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_cosign_staging.json
index a0f9e53..2467290 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -722,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_experimental_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_prod.json
index a58c3cd..ce2a3db 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_experimental_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_staging.json
index a58c3cd..8542236 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload.json
deleted file mode 100644
index a58c3cd..0000000
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload.json
+++ /dev/null
@@ -1,734 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json
deleted file mode 100644
index a0f9e53..0000000
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json
+++ /dev/null
@@ -1,943 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_prod.json
index a0f9e53..5e874a3 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -722,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_staging.json
index a0f9e53..2467290 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -722,7 +722,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +775,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +827,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +846,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +877,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +893,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +925,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json
index a58c3cd..ce2a3db 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
index a58c3cd..8542236 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -716,7 +716,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_prod.json
index a58c3cd..3ff1c2e 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_staging.json
similarity index 95%
rename from recipes/packaging/packaging.expected/win_stable_experimental.json
rename to recipes/packaging/packaging.expected/win_stable_staging.json
index a58c3cd..23a6bea 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_upload.json b/recipes/packaging/packaging.expected/win_stable_upload.json
deleted file mode 100644
index fa7ec7d..0000000
--- a/recipes/packaging/packaging.expected/win_stable_upload.json
+++ /dev/null
@@ -1,735 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_upload_cosign.json b/recipes/packaging/packaging.expected/win_stable_upload_cosign.json
deleted file mode 100644
index 6571045..0000000
--- a/recipes/packaging/packaging.expected/win_stable_upload_cosign.json
+++ /dev/null
@@ -1,944 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "gcloud",
-      "auth",
-      "configure-docker",
-      "us-docker.pkg.dev"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "configure docker registry"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "upload",
-      "blob",
-      "-f",
-      "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "upload through cosign"
-  },
-  {
-    "cmd": [
-      "cosign",
-      "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
-      "--force"
-    ],
-    "env": {
-      "COSIGN_EXPERIMENTAL": "true",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "sign flutter artifact"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/packaging/packaging.expected/win_stable_cosign.json b/recipes/packaging/packaging.expected/win_stable_upload_cosign_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_upload_cosign_prod.json
index 6571045..de98324 100644
--- a/recipes/packaging/packaging.expected/win_stable_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload_cosign_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -723,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -776,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -828,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -847,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -878,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -894,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -926,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_upload_cosign_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
copy to recipes/packaging/packaging.expected/win_stable_upload_cosign_staging.json
index a0f9e53..68ba788 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload_cosign_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -458,7 +458,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -503,7 +503,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -554,7 +554,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -607,7 +607,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -660,7 +660,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -691,7 +691,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -722,7 +723,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -775,7 +776,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -827,7 +828,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -846,7 +847,7 @@
       "blob",
       "-f",
       "[START_DIR]\\archive\\flutter-archive-package.tar.xz",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz"
     ],
     "env": {
       "COSIGN_EXPERIMENTAL": "true",
@@ -877,7 +878,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -893,7 +894,7 @@
     "cmd": [
       "cosign",
       "sign",
-      "us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
+      "us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts/stable/deadbeef/flutter-archive-package.tar.xz",
       "--force"
     ],
     "env": {
@@ -925,7 +926,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_upload_prod.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_upload_prod.json
index a58c3cd..3ff1c2e 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload_prod.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:prod"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_upload_staging.json
similarity index 95%
copy from recipes/packaging/packaging.expected/win_stable_experimental.json
copy to recipes/packaging/packaging.expected/win_stable_upload_staging.json
index a58c3cd..23a6bea 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload_staging.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -501,7 +501,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +551,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +603,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +655,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,7 +686,8 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=stable",
+      "--publish"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -716,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:ci"
+        "name": "project:staging"
       },
       "resultdb": {
         "current_invocation": {
diff --git a/recipes/packaging/packaging.py b/recipes/packaging/packaging.py
index 235d55e..f60fd91 100644
--- a/recipes/packaging/packaging.py
+++ b/recipes/packaging/packaging.py
@@ -75,10 +75,11 @@
   """Uploads flutter package to the artifact registry, then signs it using a KMS key.
   This is all done using the package cosign.
   """
-  if not api.runtime.is_experimental:
-    base_artifact_registry_url = 'us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts' # TODO(drewroen) Update production url to an actual production url
+  bucket = api.buildbucket.build.builder.bucket
+  if not api.runtime.is_experimental and bucket == 'prod':
+    base_artifact_registry_url = 'us-docker.pkg.dev/flutter-infra/flutter-artifacts'
   else:
-    base_artifact_registry_url = 'us-docker.pkg.dev/flutter-dashboard-dev/flutter-artifacts'
+    base_artifact_registry_url = 'us-docker.pkg.dev/flutter-infra-staging/flutter-artifacts'
 
   artifact_registry_url = '%s/%s/%s/%s' % (base_artifact_registry_url, branch, git_hash, api.path.basename(flutter_path))
 
@@ -168,23 +169,28 @@
       for platform in ('mac', 'linux', 'win'):
         for branch in ('master', 'beta', 'stable'):
           for upload_with_cosign in (True, False):
-            git_ref = 'refs/heads/' + branch
-            test = api.test(
-                '%s_%s%s%s%s' % (
-                    platform,
-                    branch,
-                    '_experimental' if experimental else '',
-                    '_upload' if should_upload else '',
-                    '_cosign' if upload_with_cosign else ''
-                ), api.platform(platform, 64),
-                api.buildbucket.ci_build(git_ref=git_ref, revision=None),
-                api.properties(
-                    shard='tests',
-                    fuchsia_ctl_version='version:0.0.2',
-                    upload_packages=should_upload,
-                    gold_tryjob=not should_upload,
-                    upload_with_cosign=upload_with_cosign
-                ), api.runtime(is_experimental=experimental),
-                api.repo_util.flutter_environment_data()
-            )
-            yield test
+            for bucket in ('prod', 'staging'):
+              git_ref = 'refs/heads/' + branch
+              test = api.test(
+                  '%s_%s%s%s%s_%s' % (
+                      platform,
+                      branch,
+                      '_experimental' if experimental else '',
+                      '_upload' if should_upload else '',
+                      '_cosign' if upload_with_cosign else '',
+                      bucket
+                  ), api.platform(platform, 64),
+                  api.buildbucket.ci_build(
+                      git_ref=git_ref,
+                      revision=None,
+                      bucket=bucket
+                  ), api.properties(
+                      shard='tests',
+                      fuchsia_ctl_version='version:0.0.2',
+                      upload_packages=should_upload,
+                      gold_tryjob=not should_upload,
+                      upload_with_cosign=upload_with_cosign
+                  ), api.runtime(is_experimental=experimental),
+                  api.repo_util.flutter_environment_data()
+              )
+              yield test