diff --git a/templates/al2023/provisioners/bb-containerd.sh b/templates/al2023/provisioners/bb-containerd.sh
index 0aea2e7d5..ff922984b 100644
--- a/templates/al2023/provisioners/bb-containerd.sh
+++ b/templates/al2023/provisioners/bb-containerd.sh
@@ -1,10 +1,24 @@
 #!/bin/bash
 
+set -o pipefail
+set -o nounset
+set -o errexit
+
+MACHINE=$(uname -m)
+if [ "$MACHINE" == "x86_64" ]; then
+  ARCH="amd64"
+elif [ "$MACHINE" == "aarch64" ]; then
+  ARCH="arm64"
+else
+  echo "Unknown machine architecture '$MACHINE'" >&2
+  exit 1
+fi
+
 # install containerd v2
-curl -OL https://github.com/containerd/containerd/releases/download/v2.0.2/containerd-2.0.2-linux-amd64.tar.gz
-sudo tar Cxzvf /usr/local containerd-2.0.2-linux-amd64.tar.gz
+curl -OL "https://github.com/containerd/containerd/releases/download/v2.0.2/containerd-2.0.2-linux-$ARCH.tar.gz"
+sudo tar Cxzvf /usr/local "containerd-2.0.2-linux-$ARCH.tar.gz"
 
 SERVICE_PATH="/lib/systemd/system/containerd.service"
 
-sudo sed -i '/^After=/ s/$/ /containerd-storage-setup.service/' $SERVICE_PATH
+sudo sed -i '/^After=/ s/$/ containerd-storage-setup.service/' $SERVICE_PATH
 sudo sed -i 's|^ExecStart=.*|ExecStart=/usr/local/bin/containerd|' $SERVICE_PATH
diff --git a/templates/al2023/provisioners/bb-devmapper-create.sh b/templates/al2023/provisioners/bb-devmapper-create.sh
index bb7cb1d5e..716b93472 100644
--- a/templates/al2023/provisioners/bb-devmapper-create.sh
+++ b/templates/al2023/provisioners/bb-devmapper-create.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-set -ex
+
+set -o pipefail
+set -o nounset
+set -o errexit
 
 sudo dnf install -y git make