diff --git a/ToolboxStack/output/toolbox-base/Dockerfile b/ToolboxStack/output/toolbox-base/Dockerfile
index 92ec3e2..b9d15a4 100644
--- a/ToolboxStack/output/toolbox-base/Dockerfile
+++ b/ToolboxStack/output/toolbox-base/Dockerfile
@@ -113,7 +113,9 @@ RUN chown "${USER_ID}:${GROUP_ID}" /tmp/aqua.yaml \
 RUN mise exec -- npm install -g @just-every/code @qwen-code/qwen-code @google/gemini-cli @openai/codex opencode-ai@latest
 
 # Install the same AI CLI tools for the toolbox user so they are available in the container runtime
-RUN su - "${USERNAME}" -c 'mise exec -- npm install -g @just-every/code @qwen-code/qwen-code @google/gemini-cli @openai/codex opencode-ai@latest'
+RUN su - "${USERNAME}" -c 'mise exec -- npm install -g @just-every/code @qwen-code/qwen-code @google/gemini-cli @openai/codex opencode-ai@latest' && \
+    # Ensure mise shims are properly generated for the installed tools
+    su - "${USERNAME}" -c 'mise reshim'
 
 # Prepare workspace directory with appropriate ownership
 RUN mkdir -p /workspace \
diff --git a/ToolboxStack/output/toolbox-base/aqua.yaml b/ToolboxStack/output/toolbox-base/aqua.yaml
index 4d8da33..7a99140 100644
--- a/ToolboxStack/output/toolbox-base/aqua.yaml
+++ b/ToolboxStack/output/toolbox-base/aqua.yaml
@@ -16,5 +16,5 @@ packages:
   - name: mvdan/sh@v3.12.0
   - name: koalaman/shellcheck@v0.11.0
   - name: hadolint/hadolint@v2.14.0
-  - name: astral-sh/uv@v0.9.5
+  - name: astral-sh/uv@v0.9.6
   - name: watchexec/watchexec@v2.3.2