diff --git a/hostkey/README.md b/hostkey/README.md
index fd88c100..69e40b87 100644
--- a/hostkey/README.md
+++ b/hostkey/README.md
@@ -10,6 +10,12 @@ HOSTKEY VPS hosting via REST API. [HOSTKEY](https://hostkey.com/)
 bash <(curl -fsSL https://openrouter.ai/labs/spawn/hostkey/claude.sh)
 ```
 
+#### Amazon Q CLI
+
+```bash
+bash <(curl -fsSL https://openrouter.ai/labs/spawn/hostkey/amazonq.sh)
+```
+
 #### Open Interpreter
 
 ```bash
diff --git a/hostkey/amazonq.sh b/hostkey/amazonq.sh
new file mode 100644
index 00000000..fd684614
--- /dev/null
+++ b/hostkey/amazonq.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+set -eo pipefail
+
+# Source common functions - try local file first, fall back to remote
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"
+# shellcheck source=hostkey/lib/common.sh
+if [[ -f "${SCRIPT_DIR}/lib/common.sh" ]]; then
+    source "${SCRIPT_DIR}/lib/common.sh"
+else
+    eval "$(curl -fsSL https://raw.githubusercontent.com/OpenRouterTeam/spawn/main/hostkey/lib/common.sh)"
+fi
+
+log_info "Amazon Q CLI on HOSTKEY"
+echo ""
+
+# 1. Resolve HOSTKEY API token
+ensure_hostkey_token
+
+# 2. Generate + register SSH key
+ensure_ssh_key
+
+# 3. Get server name and create server
+SERVER_NAME=$(get_server_name)
+create_server "${SERVER_NAME}"
+
+# 4. Wait for SSH and cloud-init
+verify_server_connectivity "${HOSTKEY_INSTANCE_IP}"
+wait_for_cloud_init "${HOSTKEY_INSTANCE_IP}" 60
+
+# 5. Install Amazon Q CLI
+log_step "Installing Amazon Q CLI..."
+run_server "${HOSTKEY_INSTANCE_IP}" "curl -fsSL https://desktop-release.q.us-east-1.amazonaws.com/latest/amazon-q-cli-install.sh | bash"
+
+# Verify installation succeeded
+if ! run_server "${HOSTKEY_INSTANCE_IP}" "command -v q &> /dev/null"; then
+    log_install_failed "Amazon Q CLI" "curl -fsSL https://desktop-release.q.us-east-1.amazonaws.com/latest/amazon-q-cli-install.sh | bash" "${HOSTKEY_INSTANCE_IP}"
+    exit 1
+fi
+log_info "Amazon Q CLI installation verified successfully"
+
+# 6. Get OpenRouter API key
+echo ""
+if [[ -n "${OPENROUTER_API_KEY:-}" ]]; then
+    log_info "Using OpenRouter API key from environment"
+else
+    OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
+fi
+
+log_step "Setting up environment variables..."
+inject_env_vars_ssh "${HOSTKEY_INSTANCE_IP}" upload_file run_server \
+    "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_BASE_URL=https://openrouter.ai/api/v1"
+
+echo ""
+log_info "HOSTKEY server setup completed successfully!"
+log_info "Server: ${SERVER_NAME} (ID: ${HOSTKEY_INSTANCE_ID}, IP: ${HOSTKEY_INSTANCE_IP})"
+echo ""
+
+# 7. Start Amazon Q interactively
+log_step "Starting Amazon Q..."
+sleep 1
+clear
+interactive_session "${HOSTKEY_INSTANCE_IP}" "source ~/.zshrc && q chat"
diff --git a/manifest.json b/manifest.json
index ba55a403..6f3fcda2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1346,7 +1346,7 @@
     "hostkey/codex-cli": "missing",
     "hostkey/open-interpreter": "implemented",
     "hostkey/gemini-cli": "missing",
-    "hostkey/amazonq": "missing",
+    "hostkey/amazonq": "implemented",
     "hostkey/cline": "implemented",
     "hostkey/gptme": "implemented",
     "hostkey/opencode": "missing",