diff --git a/.github/ISSUE_TEMPLATE/agent_request.yml b/.github/ISSUE_TEMPLATE/agent_request.yml
new file mode 100644
index 00000000..61b214d1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/agent_request.yml
@@ -0,0 +1,81 @@
+name: Agent Request
+description: Request support for a new AI coding agent
+title: "[Agent]: "
+labels: ["agent-request", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for suggesting a new agent! We prioritize agents with strong community demand.
+
+  - type: input
+    id: agent-name
+    attributes:
+      label: Agent Name
+      description: Name of the AI coding agent
+      placeholder: e.g., Cursor, Continue, Tabby
+    validations:
+      required: true
+
+  - type: input
+    id: agent-url
+    attributes:
+      label: Repository / Website URL
+      description: Link to the agent's GitHub repo or homepage
+      placeholder: https://github.com/org/agent
+    validations:
+      required: true
+
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Install Method
+      description: How is the agent installed?
+      options:
+        - npm / npx
+        - pip / pipx
+        - curl | bash
+        - brew
+        - Other (describe below)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: openrouter-support
+    attributes:
+      label: OpenRouter Compatibility
+      description: Does the agent work with OpenRouter?
+      options:
+        - Native support (OPENROUTER_API_KEY)
+        - Via OPENAI_BASE_URL override
+        - Via ANTHROPIC_BASE_URL override
+        - Not sure
+    validations:
+      required: true
+
+  - type: textarea
+    id: evidence
+    attributes:
+      label: Community Demand Evidence
+      description: |
+        We require at least 2 of the following:
+        - 1000+ GitHub stars
+        - Hacker News post with 50+ points
+        - Reddit post with 100+ upvotes (r/LocalLLaMA, r/MachineLearning, r/ChatGPT)
+        - Explicit user request in this repo's issues
+
+        Paste links or screenshots showing demand.
+      placeholder: |
+        - GitHub: 5k stars (https://github.com/org/agent)
+        - HN: 200 points (https://news.ycombinator.com/item?id=...)
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Any other details (config requirements, env vars, known limitations)
+      placeholder: Requires Node 20+, uses OPENAI_API_KEY env var
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/cloud_request.yml b/.github/ISSUE_TEMPLATE/cloud_request.yml
new file mode 100644
index 00000000..8263e6e8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cloud_request.yml
@@ -0,0 +1,100 @@
+name: Cloud Provider Request
+description: Request support for a new cloud provider
+title: "[Cloud]: "
+labels: ["cloud-request", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for suggesting a new cloud provider! We bias heavily toward adding more clouds.
+
+  - type: input
+    id: cloud-name
+    attributes:
+      label: Cloud Provider Name
+      description: Name of the cloud provider
+      placeholder: e.g., OVH, Paperspace, Vast.ai
+    validations:
+      required: true
+
+  - type: input
+    id: cloud-url
+    attributes:
+      label: Website URL
+      description: Link to the provider's homepage
+      placeholder: https://cloud.provider.com
+    validations:
+      required: true
+
+  - type: dropdown
+    id: cloud-type
+    attributes:
+      label: Provider Type
+      description: What kind of compute does it offer?
+      options:
+        - VPS / Cloud Servers (SSH access)
+        - GPU Cloud
+        - Container / Sandbox Platform
+        - Serverless / Functions
+        - Other (describe below)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: api-type
+    attributes:
+      label: API / CLI Access
+      description: How do you provision and manage instances?
+      options:
+        - REST API
+        - CLI tool
+        - Both REST API and CLI
+        - SDK only (Python, Node, etc.)
+        - Web console only (no API)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: billing
+    attributes:
+      label: Billing Model
+      description: How is compute billed?
+      options:
+        - Per-hour
+        - Per-minute / Per-second
+        - Monthly
+        - Pay-as-you-go (usage-based)
+        - Free tier available
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: why
+    attributes:
+      label: Why This Provider?
+      description: What makes this provider a good fit for spawn? (pricing, speed, regions, unique features)
+      placeholder: |
+        - Fast provisioning (~30s)
+        - Cheap GPU instances
+        - Good API docs
+    validations:
+      required: true
+
+  - type: textarea
+    id: api-docs
+    attributes:
+      label: API Documentation Link
+      description: Link to API docs or CLI reference (if available)
+      placeholder: https://docs.provider.com/api
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Any other details (auth method, regions, OS support, limitations)
+      placeholder: Uses API key auth, available in US and EU regions
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a167ac8a..3ba13e0c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: Feature Request Discussion
-    url: https://github.com/OpenRouterTeam/spawn/discussions/new?category=ideas
-    about: Suggest new agents or cloud providers