From ac832a92f8a854d66bdb2ccc7c5a3c8fd7d678a7 Mon Sep 17 00:00:00 2001
From: Charlie <5764343+charlielye@users.noreply.github.com>
Date: Sun, 18 Jan 2026 12:01:41 +0000
Subject: [PATCH] chore: ami update

---
 barretenberg/crs/bootstrap.sh | 7 +++++--
 build-images/bootstrap.sh     | 9 ++++++---
 ci3/aws/ami_id_amd64          | 2 +-
 ci3/aws/ami_id_arm64          | 2 +-
 ci3/aws/ami_update.sh         | 2 ++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/barretenberg/crs/bootstrap.sh b/barretenberg/crs/bootstrap.sh
index c2502e3621cd..5ed9d78045a1 100755
--- a/barretenberg/crs/bootstrap.sh
+++ b/barretenberg/crs/bootstrap.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
+set -euo pipefail
+
+cmd=${1:-}
+shift || true
 
 # To run bb we need a crs.
 # Download ignition up front to ensure no race conditions at runtime.
@@ -40,6 +43,6 @@ case "$cmd" in
     build
     ;;
   *)
-    default_cmd_handler "$@"
+    exit 1
     ;;
 esac
diff --git a/build-images/bootstrap.sh b/build-images/bootstrap.sh
index 27fc0defe929..14d1b1d3af77 100755
--- a/build-images/bootstrap.sh
+++ b/build-images/bootstrap.sh
@@ -83,6 +83,10 @@ function build_all {
   parallel --tag --line-buffer ./bootstrap.sh {} ::: ec2-amd64 ec2-arm64
 }
 
+function update_amis {
+  parallel --tag --line-buffer ARCH={} $ci3/aws/ami_update.sh ::: amd64 arm64
+}
+
 case "$cmd" in
   "")
     build_images
@@ -108,10 +112,9 @@ case "$cmd" in
     docker_login
     build_all
     update_manifests
-    parallel --tag --line-buffer ARCH={} $ci3/aws/ami_update.sh ::: amd64 arm64
+    update_amis
     ;;
   *)
-    echo "Unknown command: $cmd"
-    exit 1
+    default_cmd_handler "$@"
     ;;
 esac
diff --git a/ci3/aws/ami_id_amd64 b/ci3/aws/ami_id_amd64
index 7f081f737b1a..a837bf6c3d60 100644
--- a/ci3/aws/ami_id_amd64
+++ b/ci3/aws/ami_id_amd64
@@ -1 +1 @@
-ami-09d27244b23be8891
+ami-067627aa971a1dcbb
diff --git a/ci3/aws/ami_id_arm64 b/ci3/aws/ami_id_arm64
index 9946f3eeb053..040b84c6025d 100644
--- a/ci3/aws/ami_id_arm64
+++ b/ci3/aws/ami_id_arm64
@@ -1 +1 @@
-ami-0e5e48268513912d0
+ami-099a6d94f71a679d0
diff --git a/ci3/aws/ami_update.sh b/ci3/aws/ami_update.sh
index a99d85685867..b379375ec916 100755
--- a/ci3/aws/ami_update.sh
+++ b/ci3/aws/ami_update.sh
@@ -48,6 +48,8 @@ ssh $ssh_args -F build_instance_ssh_config ubuntu@$ip '
   mkdir .aws
 '
 
+ssh -F build_instance_ssh_config -O exit ubuntu@$ip 2>/dev/null || true
+
 # Download crs onto machine.
 ssh $ssh_args -F build_instance_ssh_config ubuntu@$ip < ../../barretenberg/crs/bootstrap.sh