diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index df13fa33..311b2dd2 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -126,7 +126,12 @@ jobs:
 
   ci:
     needs:
-      [semantic_pull_request, build_dart_packages, build_rust_crates, verify_packages]
+      [
+        semantic_pull_request,
+        build_dart_packages,
+        build_rust_crates,
+        verify_packages,
+      ]
     if: ${{ always() }}
 
     runs-on: ubuntu-latest
diff --git a/packages/shorebird_cli/lib/src/commands/init_command.dart b/packages/shorebird_cli/lib/src/commands/init_command.dart
index 0cf705ae..09ef7810 100644
--- a/packages/shorebird_cli/lib/src/commands/init_command.dart
+++ b/packages/shorebird_cli/lib/src/commands/init_command.dart
@@ -6,7 +6,6 @@ import 'package:shorebird_cli/src/command.dart';
 import 'package:shorebird_cli/src/config/config.dart';
 import 'package:shorebird_cli/src/shorebird_config_mixin.dart';
 import 'package:shorebird_cli/src/shorebird_create_app_mixin.dart';
-import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:yaml/yaml.dart';
 import 'package:yaml_edit/yaml_edit.dart';
 
diff --git a/packages/shorebird_cli/lib/src/flutter_engine_revision.dart b/packages/shorebird_cli/lib/src/flutter_engine_revision.dart
index 95b74a95..cdcbff61 100644
--- a/packages/shorebird_cli/lib/src/flutter_engine_revision.dart
+++ b/packages/shorebird_cli/lib/src/flutter_engine_revision.dart
@@ -1,3 +1,3 @@
 /// The hash of the Flutter engine required by Shorebird.
 /// Currently, Shorebird only supports the latest stable Flutter channel.
-const requiredFlutterEngineRevision = '1837b5be5f';
+const requiredFlutterEngineRevision = '9aa7816315';
diff --git a/packages/shorebird_cli/test/src/command_runner_test.dart b/packages/shorebird_cli/test/src/command_runner_test.dart
index 9e1d24e5..ffb7f00f 100644
--- a/packages/shorebird_cli/test/src/command_runner_test.dart
+++ b/packages/shorebird_cli/test/src/command_runner_test.dart
@@ -6,6 +6,7 @@ import 'package:mason_logger/mason_logger.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pub_updater/pub_updater.dart';
 import 'package:shorebird_cli/src/command_runner.dart';
+import 'package:shorebird_cli/src/flutter_engine_revision.dart';
 import 'package:shorebird_cli/src/version.dart';
 import 'package:test/test.dart';
 
@@ -42,12 +43,7 @@ void main() {
       processResult = _MockProcessResult();
       when(() => processResult.exitCode).thenReturn(ExitCode.success.code);
       when(() => processResult.stdout).thenReturn(
-        '''
-Flutter 3.7.7 • channel stable • git@github.com:flutter/flutter.git
-Framework • revision 2ad6cd72c0 (12 days ago) • 2023-03-08 09:41:59 -0800
-Engine • revision 1837b5be5f
-Tools • Dart 2.19.4 • DevTools 2.20.1
-''',
+        'Engine • revision $requiredFlutterEngineRevision',
       );
 
       commandRunner = ShorebirdCliCommandRunner(
diff --git a/packages/shorebird_cli/test/src/commands/init_command_test.dart b/packages/shorebird_cli/test/src/commands/init_command_test.dart
index 8d8bedf1..4dc66474 100644
--- a/packages/shorebird_cli/test/src/commands/init_command_test.dart
+++ b/packages/shorebird_cli/test/src/commands/init_command_test.dart
@@ -29,8 +29,6 @@ name: $appName
 version: $version
 environment:
   sdk: ">=2.19.0 <3.0.0"''';
-    const shorebirdYamlContent = '''
-app_id: $appId''';
     const session = Session(apiKey: apiKey);
 
     late Auth auth;
diff --git a/scripts/build_engine.sh b/scripts/build_engine.sh
index 401469a5..3bd90360 100755
--- a/scripts/build_engine.sh
+++ b/scripts/build_engine.sh
@@ -24,10 +24,6 @@ ninja -C ./src/out/android_release_arm64
 ./src/flutter/tools/gn --runtime-mode=release
 ninja -C ./src/out/host_release
 
-# Build the the host_release arm64 output.
-./src/flutter/tools/gn --runtime-mode=release --mac-cpu=arm64
-ninja -C ./src/out/host_release_arm64
-
 # List of all files to keep.
 KEEP_FILES=(
   "out/android_release_arm64/libflutter.so"
@@ -42,8 +38,8 @@ KEEP_FILES=(
   "out/android_release_arm64/flutter_embedding_release.maven-metadata.xml"
   "out/android_release_arm64/flutter_embedding_release-sources.jar"
   "out/android_release_arm64/arm64_v8a_release.maven-metadata.xml"  
-  "out/host_release_arm64/gen/const_finder.dart.snapshot"
-  "out/host_release_arm64/font-subset"
+  "out/host_release/gen/const_finder.dart.snapshot"
+  "out/host_release/font-subset"
   "flutter/prebuilts/macos-x64/dart-sdk/LICENSE"
   "flutter/prebuilts/macos-x64/dart-sdk/bin/dartaotruntime"
   "flutter/prebuilts/macos-x64/dart-sdk/bin/snapshots/analysis_server.dart.snapshot"
@@ -75,9 +71,6 @@ do
   cp -r $ENGINE_PATH/src/$file $TEMP_DIR/$file
 done
 
-# Rename host_release_arm64 to host_release
-mv -p $TEMP_DIR/out/host_release_arm64/ $TEMP_DIR/out/host_release/
-
 cd $TEMP_DIR
 
 # Zip the output.