diff --git a/shorebird/ci/shards/linux.json b/shorebird/ci/shards/linux.json
index 435ec9bebb7b7..ffd1b4982dbda 100644
--- a/shorebird/ci/shards/linux.json
+++ b/shorebird/ci/shards/linux.json
@@ -91,6 +91,10 @@
         "gn_args": ["--no-prebuilt-dart-sdk"],
         "ninja_targets": ["flutter/build/archives:artifacts"],
         "out_dir": "host_debug"
+      },
+      {
+        "type": "shell",
+        "command": "mkdir -p out/host_release/aot_tools && out/host_release/dart-sdk/bin/dart pub get --offline --directory=flutter/third_party/dart/pkg/aot_tools && out/host_release/dart-sdk/bin/dart compile kernel flutter/third_party/dart/pkg/aot_tools/bin/aot_tools.dart -o out/host_release/aot_tools/aot-tools.dill"
       }
     ],
     "artifacts": [
diff --git a/shorebird/ci/shards/macos.json b/shorebird/ci/shards/macos.json
index 19173eecfa486..a6b7cf37016ab 100644
--- a/shorebird/ci/shards/macos.json
+++ b/shorebird/ci/shards/macos.json
@@ -157,12 +157,16 @@
         "gn_args": ["--runtime-mode=release", "--mac", "--mac-cpu=x64"],
         "ninja_targets": ["flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", "flutter/lib/snapshot:generate_snapshot_bins", "flutter/build/archives:artifacts"],
         "out_dir": "mac_release"
+      },
+      {
+        "type": "shell",
+        "command": "flutter/bin/et stamp && cp out/engine_stamp.json out/mac_release/engine_stamp.json"
       }
     ],
     "compose_input": "macos-framework",
     "artifacts": [
       {"src": "host_release/dart-sdk", "dst": "flutter_infra_release/flutter/$engine/dart-sdk-darwin-x64.zip", "zip": true, "content_hash": true},
-      {"src": "engine_stamp.json", "dst": "flutter_infra_release/flutter/$engine/engine_stamp.json"}
+      {"src": "mac_release/engine_stamp.json", "dst": "flutter_infra_release/flutter/$engine/engine_stamp.json"}
     ]
   }
 }