diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..2d2cab5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,27 @@
+name: Bug Report
+description: Report an issue with an agent file (formatting, broken examples, etc.)
+labels: ["bug"]
+body:
+  - type: input
+    id: agent-file
+    attributes:
+      label: Agent file
+      placeholder: e.g. engineering/engineering-frontend-developer.md
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: What's wrong?
+      placeholder: Describe the issue — broken formatting, incorrect examples, outdated info, etc.
+    validations:
+      required: true
+
+  - type: textarea
+    id: suggestion
+    attributes:
+      label: Suggested fix
+      placeholder: If you have a fix in mind, describe it here.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/new-agent-request.yml b/.github/ISSUE_TEMPLATE/new-agent-request.yml
new file mode 100644
index 0000000..6059dc9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new-agent-request.yml
@@ -0,0 +1,45 @@
+name: New Agent Request
+description: Suggest a new agent to add to The Agency
+labels: ["enhancement", "new-agent"]
+body:
+  - type: input
+    id: agent-name
+    attributes:
+      label: Agent Name
+      placeholder: e.g. Database Engineer
+    validations:
+      required: true
+
+  - type: dropdown
+    id: category
+    attributes:
+      label: Category
+      options:
+        - engineering
+        - design
+        - marketing
+        - product
+        - project-management
+        - testing
+        - support
+        - spatial-computing
+        - specialized
+        - new category (describe below)
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: What would this agent do?
+      placeholder: Describe the agent's specialty, when you'd use it, and what gap it fills.
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-cases
+    attributes:
+      label: Example use cases
+      placeholder: Give 2-3 real scenarios where this agent would be useful.
+    validations:
+      required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..f621b15
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+## What does this PR do?
+
+<!-- Brief description of the change -->
+
+## Agent Information (if adding/modifying an agent)
+
+- **Agent Name**:
+- **Category**:
+- **Specialty**:
+
+## Checklist
+
+- [ ] Follows the agent template structure from CONTRIBUTING.md
+- [ ] Includes YAML frontmatter with `name`, `description`, `color`
+- [ ] Has concrete code/template examples (for new agents)
+- [ ] Tested in real scenarios
+- [ ] Proofread and formatted correctly