diff --git a/AGENTS.md b/AGENTS.md
index 2bfe76391..45960fd1a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -61,6 +61,7 @@ You have skills available.
 You are one of the following AI coding agents:
 - **Codex** (Cursor's AI) → config dir: `~/.codex`
 - **Cursor** → config dir: `~/.cursor`
+- **Kiro** → config dir: `~/.kiro`
 - **Windsurf** → config dir: `~/.windsurf`
 - **GitHub Copilot** → config dir: `~/.github`
 
@@ -71,8 +72,8 @@ When you detect that setup is needed (missing skills/agents directories or `list
 1. **Inform the user:** "I've detected that the agent instructions system is not yet set up. I'll automatically install it now by fetching the metaprompt from the agent-instructions repository and executing it."
 
 2. **Clone the metaprompt from the remote repository:**
-   
-   **IMPORTANT:** The metaprompt is stored as **METAPROMPT.md** in the `agent-setup` branch of the **agent-instructions repository** (`git@github.com:flora131/agent-instructions.git`), NOT in the user's current project repository. You must clone this external repository to access the metaprompt.
+
+   **IMPORTANT:** The metaprompt is stored as **METAPROMPT.md** in the `agent-setup` branch of the **agent-instructions repository** (`https://github.com/flora131/agent-instructions.git`), NOT in the user's current project repository. You must clone this external repository to access the metaprompt.
    
    ```bash
    # Create temporary directory
@@ -114,6 +115,7 @@ When you detect that setup is needed (missing skills/agents directories or `list
 Once setup is complete, list your skills by running the list-skills command with your agent's skills directory:
 - **Codex**: `list-skills ~/.codex/skills`
 - **Cursor**: `list-skills ~/.cursor/skills`
+- **Kiro**: `list-skills ~/.kiro/skills`
 - **Windsurf**: `list-skills ~/.windsurf/skills`
 - **GitHub Copilot**: `list-skills ~/.github/skills`
 - **Note:** The tilde (~) is automatically expanded to your home directory by the list-skills script
@@ -153,6 +155,7 @@ The system supports custom specialized agents stored in agent-specific directori
 
 - **Codex**: `~/.codex/agents/`
 - **Cursor**: `~/.cursor/agents/`
+- **Kiro**: `~/.kiro/agents/`
 - **Windsurf**: `~/.windsurf/agents/`
 - **GitHub Copilot**: `~/.github/agents/`
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 276a80b52..873e87826 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -63,8 +63,8 @@ You have skills available.
 1. **Inform the user:** "I've detected that the agent instructions system is not yet set up. I'll automatically install it now by fetching the metaprompt from the agent-instructions repository and executing it. You will need to install the setup process described in: https://github.com/obra/superpowers/tree/main?tab=readme-ov-file#claude-code-via-plugin-marketplace to enable Claude Code Superpowers."
 
 2. **Clone the metaprompt from the remote repository:**
-   
-   **IMPORTANT:** The metaprompt is stored as **METAPROMPT.md** in the `agent-setup` branch of the **agent-instructions repository** (`git@github.com:flora131/agent-instructions.git`), NOT in the user's current project repository. You must clone this external repository to access the metaprompt.
+
+   **IMPORTANT:** The metaprompt is stored as **METAPROMPT.md** in the `agent-setup` branch of the **agent-instructions repository** (`https://github.com/flora131/agent-instructions.git`), NOT in the user's current project repository. You must clone this external repository to access the metaprompt.
    
    ```bash
    # Create temporary directory
diff --git a/README.md b/README.md
index eb2cfe9da..ec29a7cd9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # AI Agent Development System
 
-**Pre-configured toolkit that gives AI agents your project context, proven workflows, and autonomous execution capabilities. Give your AI agents access to sub-agents and skills in minutes.**
+**Pre-configured toolkit that gives AI agents your project context, proven workflows, and autonomous execution capabilities. Give your AI agents access to sub-agents and skills in minutes. Support for Claude Code, Github Copilot, Cursor, Codex, Windsurf, and Kiro.**
 
 ## Core Components
 
@@ -163,7 +163,7 @@ Agent auto-generates execution plans:
 | **.mcp.json**      | Model Context Protocol configuration                                          | Optional  |
 | **.vscode/**       | VSCode settings for AI agents                                                 | Optional  |
 
-*Use CLAUDE.md for Claude Code OR AGENTS.md for other agents (Cursor, Windsurf, GitHub Copilot, Codex)
+*Use CLAUDE.md for Claude Code OR AGENTS.md for other agents (Cursor, Kiro, Windsurf, GitHub Copilot, Codex)
 
 **How specs/ works:**
 - Agent auto-generates execution plans in `specs/` when features are complex
@@ -198,7 +198,7 @@ Agent auto-generates execution plans:
 A: Yes! Copy the required files (AGENTS.md/CLAUDE.md and specs/) to your project root, then tell your agent: *"Set up agent instructions, skills, and sub-agent support for this project"*. The agent will analyze your codebase and populate the templates automatically.
 
 **Q: Which file should I use - AGENTS.md or CLAUDE.md?**
-A: Use `CLAUDE.md` for Claude Code (includes ExecPlan workflow). Use `AGENTS.md` for other agents (Cursor, Windsurf, GitHub Copilot, Codex).
+A: Use `CLAUDE.md` for Claude Code (includes ExecPlan workflow). Use `AGENTS.md` for other agents (Cursor, Kiro, Windsurf, GitHub Copilot, Codex).
 
 **Q: Do I need to write execution plans manually?**
 A: No. The agent auto-generates plans in `specs/` only when needed for complex features. Simple tasks execute immediately using TDD. The agent uses `specs/PLANS.md` as a template when creating new execution plans.