diff --git a/images/aws/coder-aienv/Dockerfile.noble b/images/aws/coder-aienv/Dockerfile.noble
index f34fcc3..666bde3 100644
--- a/images/aws/coder-aienv/Dockerfile.noble
+++ b/images/aws/coder-aienv/Dockerfile.noble
@@ -30,7 +30,7 @@ RUN apt install -y --no-install-recommends --no-install-suggests \
     lsof jq less \
     locales \
     sudo man \
-    unzip \
+    unzip zstd \
     nodejs \
     python3.12 python3.12-venv
 
@@ -86,6 +86,7 @@ ARG CLAUDE_CODE_VER=latest
 ARG GOOSE_VERSION=""
 ARG CURSOR_VERSION=latest
 ARG MUX_VERSION=latest
+ARG KIRO_VERSION=latest
 
 # RUN npm config set prefix=$HOME
 RUN curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
@@ -116,6 +117,15 @@ RUN curl -fsSL https://github.com/block/goose/releases/download/stable/download_
 # Install Coder Mux Web Server
 RUN sudo npm install -g --no-audit --no-fund --omit=dev --ignore-scripts "mux@${MUX_VERSION}"
 
+# Install AWS's Kiro CLI
+WORKDIR /tmp/kiro
+
+RUN curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/${KIRO_VERSION}/kirocli-x86_64-linux.zip" -o "kirocli.zip" && \
+    unzip kirocli.zip && \
+    ./kirocli/install.sh --no-confirm
+
+WORKDIR $HOME
+
 # Install VS Code Web
 RUN sudo mkdir -p "/usr/local/lib/vscode-web" && \
     curl -fsSL https://vscode.download.prss.microsoft.com/dbazure/download/stable/$(curl -fsSL https://update.code.visualstudio.com/api/commits/stable/server-linux-x64-web | cut -d '"' -f 2)/vscode-server-linux-x64-web.tar.gz | \