diff --git a/packages/shorebird_cli/lib/src/commands/build_command.dart b/packages/shorebird_cli/lib/src/commands/build_command.dart
index bb5c0f20..1c4b0166 100644
--- a/packages/shorebird_cli/lib/src/commands/build_command.dart
+++ b/packages/shorebird_cli/lib/src/commands/build_command.dart
@@ -66,9 +66,6 @@ class BuildCommand extends ShorebirdCommand with ShorebirdEngineMixin {
       // only supports Android.
       'apk',
       '--release',
-      // This is temporary because the Shorebird engine currently
-      // does not support tree-shaking icons.
-      '--no-tree-shake-icons',
       '--local-engine-src-path',
       shorebirdEnginePath,
       '--local-engine',
diff --git a/packages/shorebird_cli/lib/src/shorebird_engine_mixin.dart b/packages/shorebird_cli/lib/src/shorebird_engine_mixin.dart
index dc6f730a..b56c093a 100644
--- a/packages/shorebird_cli/lib/src/shorebird_engine_mixin.dart
+++ b/packages/shorebird_cli/lib/src/shorebird_engine_mixin.dart
@@ -101,6 +101,9 @@ mixin ShorebirdEngineMixin on ShorebirdCommand {
         'out/android_release_arm64/clang_x64/gen_snapshot',
         'out/android_release_arm64/clang_x64/gen_snapshot_arm64',
         'out/android_release_arm64/clang_x64/impellerc',
+        'out/android_release_arm64/clang_x64/impellerc',
+        'out/host_release/gen/const_finder.dart.snapshot',
+        'out/host_release/font-subset',
       ];
 
       for (final executable in executables) {
diff --git a/packages/shorebird_code_push_api/lib/src/routes/download_engine/download_engine_handler.dart b/packages/shorebird_code_push_api/lib/src/routes/download_engine/download_engine_handler.dart
index 21465216..4fdbc418 100644
--- a/packages/shorebird_code_push_api/lib/src/routes/download_engine/download_engine_handler.dart
+++ b/packages/shorebird_code_push_api/lib/src/routes/download_engine/download_engine_handler.dart
@@ -5,7 +5,7 @@ import 'package:shelf/shelf.dart';
 import 'package:shorebird_code_push_api/src/provider.dart';
 
 final _engineUrl = Uri.parse(
-  'https://storage.googleapis.com/download/storage/v1/b/shorebird-code-push-api.appspot.com/o/${Uri.encodeComponent('engines/engine.zip')}?alt=media',
+  'https://storage.googleapis.com/download/storage/v1/b/shorebird-code-push-api.appspot.com/o/${Uri.encodeComponent('engines/dev/engine.zip')}?alt=media',
 );
 
 Future<Response> downloadEngineHandler(Request request, String revision) async {
diff --git a/scripts/build_engine.sh b/scripts/build_engine.sh
index a65242e8..a65bc82a 100755
--- a/scripts/build_engine.sh
+++ b/scripts/build_engine.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/bin/sh
 
 # Given a path to a Flutter engine, generate a shorebird version of it.
 # This is done by removing all the files that are not needed for the