diff --git a/.ci/targets/analyze.yaml b/.ci/targets/analyze.yaml
index 02ae19504c2..793ac03e266 100644
--- a/.ci/targets/analyze.yaml
+++ b/.ci/targets/analyze.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: analyze repo tools
     script: .ci/scripts/analyze_repo_tools.sh
   - name: analyze
diff --git a/.ci/targets/analyze_legacy.yaml b/.ci/targets/analyze_legacy.yaml
index 3c95e6c0e1c..0d2d3335846 100644
--- a/.ci/targets/analyze_legacy.yaml
+++ b/.ci/targets/analyze_legacy.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   # Does a sanity check that packages at least pass analysis on the N-1 and N-2
   # versions of Flutter stable if the package claims to support that version.
   # This is to minimize accidentally making changes that break old versions
diff --git a/.ci/targets/android_build_all_packages.yaml b/.ci/targets/android_build_all_packages.yaml
index 6c807e8334d..5343cfb1796 100644
--- a/.ci/targets/android_build_all_packages.yaml
+++ b/.ci/targets/android_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for Android debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["apk", "debug"]
diff --git a/.ci/targets/dart_unit_tests.yaml b/.ci/targets/dart_unit_tests.yaml
index 3d06b600fd5..9d0939d6e28 100644
--- a/.ci/targets/dart_unit_tests.yaml
+++ b/.ci/targets/dart_unit_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: Dart unit tests
     script: script/tool_runner.sh
     args: ["dart-test", "--exclude=script/configs/dart_unit_tests_exceptions.yaml", "--platform=vm"]
diff --git a/.ci/targets/ios_build_all_packages.yaml b/.ci/targets/ios_build_all_packages.yaml
index 3ebef6c7380..c85ec5c1f7c 100644
--- a/.ci/targets/ios_build_all_packages.yaml
+++ b/.ci/targets/ios_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for iOS debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["ios", "debug", "--no-codesign"]
diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml
index a89554ee65c..97b92d38309 100644
--- a/.ci/targets/ios_platform_tests.yaml
+++ b/.ci/targets/ios_platform_tests.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create simulator
     script: .ci/scripts/create_simulator.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build examples
     script: script/tool_runner.sh
     args: ["build-examples", "--ios"]
@@ -25,3 +27,4 @@ tasks:
   - name: remove simulator
     script: .ci/scripts/remove_simulator.sh
     always: true
+    infra_step: true
diff --git a/.ci/targets/linux_build_all_packages.yaml b/.ci/targets/linux_build_all_packages.yaml
index b54f7b1e56c..7d634af090a 100644
--- a/.ci/targets/linux_build_all_packages.yaml
+++ b/.ci/targets/linux_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for Linux debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["linux", "debug"]
diff --git a/.ci/targets/linux_custom_package_tests.yaml b/.ci/targets/linux_custom_package_tests.yaml
index 8c691789a81..b64cd96059a 100644
--- a/.ci/targets/linux_custom_package_tests.yaml
+++ b/.ci/targets/linux_custom_package_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: custom tests
     script: script/tool_runner.sh
     args: ["custom-test"]
diff --git a/.ci/targets/macos_build_all_packages.yaml b/.ci/targets/macos_build_all_packages.yaml
index 0810966c084..6cc47655959 100644
--- a/.ci/targets/macos_build_all_packages.yaml
+++ b/.ci/targets/macos_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for macOS debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["macos", "debug"]
diff --git a/.ci/targets/macos_check_podspecs.yaml b/.ci/targets/macos_check_podspecs.yaml
index 0b221732563..9df7e66afd4 100644
--- a/.ci/targets/macos_check_podspecs.yaml
+++ b/.ci/targets/macos_check_podspecs.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: validate iOS and macOS podspecs
     script: script/tool_runner.sh
     args: ["podspec-check"]
diff --git a/.ci/targets/macos_custom_package_tests.yaml b/.ci/targets/macos_custom_package_tests.yaml
index 5e5b2553aea..4b0de789f9a 100644
--- a/.ci/targets/macos_custom_package_tests.yaml
+++ b/.ci/targets/macos_custom_package_tests.yaml
@@ -1,10 +1,13 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create simulator
     script: .ci/scripts/create_simulator.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: custom package tests
     script: .ci/scripts/custom_package_tests.sh
   - name: remove simulator
     script: .ci/scripts/remove_simulator.sh
     always: true
+    infra_step: true
diff --git a/.ci/targets/macos_platform_tests.yaml b/.ci/targets/macos_platform_tests.yaml
index 4b2ee4eac1f..92b937e9436 100644
--- a/.ci/targets/macos_platform_tests.yaml
+++ b/.ci/targets/macos_platform_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build examples
     script: script/tool_runner.sh
     args: ["build-examples", "--macos"]
diff --git a/.ci/targets/repo_checks.yaml b/.ci/targets/repo_checks.yaml
index eccc1431d5f..f5a5f1d112f 100644
--- a/.ci/targets/repo_checks.yaml
+++ b/.ci/targets/repo_checks.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: format
     script: script/tool_runner.sh
     args: ["format", "--fail-on-change"]
diff --git a/.ci/targets/repo_tools_tests.yaml b/.ci/targets/repo_tools_tests.yaml
index 265e74bdd06..bd80daeb3fb 100644
--- a/.ci/targets/repo_tools_tests.yaml
+++ b/.ci/targets/repo_tools_tests.yaml
@@ -1,5 +1,6 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: tool unit tests
     script: .ci/scripts/plugin_tools_tests.sh
diff --git a/.ci/targets/web_build_all_packages.yaml b/.ci/targets/web_build_all_packages.yaml
index d3b7ae01072..1be790f62d5 100644
--- a/.ci/targets/web_build_all_packages.yaml
+++ b/.ci/targets/web_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   # No debug version, unlike the other platforms, since web does not support
   # debug builds.
   - name: build all_packages app for Web release
diff --git a/.ci/targets/web_dart_unit_tests.yaml b/.ci/targets/web_dart_unit_tests.yaml
index ad56af5144f..35b8073e241 100644
--- a/.ci/targets/web_dart_unit_tests.yaml
+++ b/.ci/targets/web_dart_unit_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: Dart unit tests - web
     script: script/tool_runner.sh
     args: ["dart-test", "--exclude=script/configs/dart_unit_tests_exceptions.yaml", "--platform=chrome"]
diff --git a/.ci/targets/web_platform_tests.yaml b/.ci/targets/web_platform_tests.yaml
index e2328622bc1..acfb9cd8a63 100644
--- a/.ci/targets/web_platform_tests.yaml
+++ b/.ci/targets/web_platform_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build examples
     script: script/tool_runner.sh
     args: ["build-examples", "--web"]
diff --git a/.ci/targets/windows_build_all_packages.yaml b/.ci/targets/windows_build_all_packages.yaml
index de30188bf6f..e7928ac05a8 100644
--- a/.ci/targets/windows_build_all_packages.yaml
+++ b/.ci/targets/windows_build_all_packages.yaml
@@ -1,8 +1,10 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages app for Windows debug
     script: .ci/scripts/build_all_packages_app.sh
     args: ["windows", "debug"]
diff --git a/.ci/targets/windows_build_and_platform_tests.yaml b/.ci/targets/windows_build_and_platform_tests.yaml
index cda3e57f75d..4bd73f91305 100644
--- a/.ci/targets/windows_build_and_platform_tests.yaml
+++ b/.ci/targets/windows_build_and_platform_tests.yaml
@@ -1,6 +1,7 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build examples (Win32)
     script: .ci/scripts/build_examples_win32.sh
   - name: native unit tests (Win32)
diff --git a/.ci/targets/windows_custom_package_tests.yaml b/.ci/targets/windows_custom_package_tests.yaml
index 46ea2506d1c..91df11fca35 100644
--- a/.ci/targets/windows_custom_package_tests.yaml
+++ b/.ci/targets/windows_custom_package_tests.yaml
@@ -1,5 +1,6 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: custom package tests
     script: .ci/scripts/custom_package_tests.sh
diff --git a/.ci/targets/windows_dart_unit_tests.yaml b/.ci/targets/windows_dart_unit_tests.yaml
index 66a99d3e20f..0dd815de286 100644
--- a/.ci/targets/windows_dart_unit_tests.yaml
+++ b/.ci/targets/windows_dart_unit_tests.yaml
@@ -1,5 +1,6 @@
 tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
   - name: dart unit tests
     script: .ci/scripts/dart_unit_tests_win32.sh