diff --git a/koyeb/amazonq.sh b/koyeb/amazonq.sh
new file mode 100644
index 00000000..42e6b421
--- /dev/null
+++ b/koyeb/amazonq.sh
@@ -0,0 +1,56 @@
+#!/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)"
+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/koyeb/lib/common.sh)"
+fi
+
+log_info "Amazon Q CLI on Koyeb"
+echo ""
+
+# 1. Ensure Koyeb CLI and API token
+ensure_koyeb_cli
+ensure_koyeb_token
+
+# 2. Create service
+SERVER_NAME=$(get_server_name)
+create_server "$SERVER_NAME"
+
+# 3. Install base tools
+wait_for_cloud_init
+
+# 4. Install Amazon Q CLI
+log_warn "Installing Amazon Q CLI..."
+run_server "curl -fsSL https://desktop-release.q.us-east-1.amazonaws.com/latest/amazon-q-cli-install.sh | bash"
+log_info "Amazon Q CLI installed"
+
+# 5. 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
+
+# 6. Inject environment variables
+log_warn "Setting up environment variables..."
+
+inject_env_vars \
+    "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_API_KEY=${OPENROUTER_API_KEY}" \
+    "OPENAI_BASE_URL=https://openrouter.ai/api/v1"
+
+echo ""
+log_info "Koyeb service setup completed successfully!"
+log_info "Service: $KOYEB_SERVICE_NAME (Instance: $KOYEB_INSTANCE_ID)"
+echo ""
+
+# 7. Start Amazon Q interactively
+log_warn "Starting Amazon Q..."
+sleep 1
+clear
+interactive_session "source /root/.bashrc && q chat"
diff --git a/manifest.json b/manifest.json
index 39430783..83086c68 100644
--- a/manifest.json
+++ b/manifest.json
@@ -950,7 +950,7 @@
     "koyeb/codex": "implemented",
     "koyeb/interpreter": "implemented",
     "koyeb/gemini": "implemented",
-    "koyeb/amazonq": "missing",
+    "koyeb/amazonq": "implemented",
     "koyeb/cline": "missing",
     "koyeb/gptme": "missing",
     "koyeb/opencode": "missing",