diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..ae36bd5a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,50 @@
+name: Bug Report
+description: Report a SKILL.md validation error, broken script, or incorrect content
+title: "[Bug]: "
+labels: ["bug", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug!
+  - type: input
+    id: skill-name
+    attributes:
+      label: Skill Name
+      description: Which skill has the issue?
+      placeholder: e.g., analyzing-disk-image-with-autopsy
+    validations:
+      required: true
+  - type: dropdown
+    id: bug-type
+    attributes:
+      label: Bug Type
+      options:
+        - SKILL.md validation error
+        - Broken/incorrect script
+        - Wrong instructions or commands
+        - Missing required files
+        - Incorrect metadata/frontmatter
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: What is the issue?
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: What should happen instead?
+    validations:
+      required: true
+  - type: input
+    id: ai-agent
+    attributes:
+      label: AI Agent Used
+      description: Which AI agent were you using?
+      placeholder: e.g., Claude Code, GitHub Copilot, Codex CLI
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..d2b10ece
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Security Vulnerability
+    url: https://github.com/mukul975/Anthropic-Cybersecurity-Skills/security/advisories/new
+    about: Report a security vulnerability in this repository
+  - name: Discussion
+    url: https://github.com/mukul975/Anthropic-Cybersecurity-Skills/discussions
+    about: Ask questions or discuss ideas
diff --git a/.github/ISSUE_TEMPLATE/new-skill-request.yml b/.github/ISSUE_TEMPLATE/new-skill-request.yml
new file mode 100644
index 00000000..ac19d3f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new-skill-request.yml
@@ -0,0 +1,58 @@
+name: New Skill Request
+description: Request a new cybersecurity skill to be added to the database
+title: "[Skill Request]: "
+labels: ["enhancement", "new-skill", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Request a new cybersecurity skill. The more detail you provide, the faster we can add it!
+  - type: input
+    id: skill-name
+    attributes:
+      label: Proposed Skill Name
+      description: Kebab-case gerund form (e.g., analyzing-memory-dump-with-volatility)
+      placeholder: performing-task-name
+    validations:
+      required: true
+  - type: dropdown
+    id: category
+    attributes:
+      label: Category
+      options:
+        - Threat Detection
+        - Incident Response
+        - Penetration Testing
+        - Digital Forensics
+        - Compliance & Governance
+        - Network Security
+        - Cloud Security
+        - Application Security
+        - Malware Analysis
+        - OSINT
+        - Zero Trust Architecture
+        - OT/ICS Security
+        - DevSecOps
+        - Ransomware Defense
+        - Threat Intelligence
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Skill Description
+      description: What should this skill teach an AI agent to do?
+    validations:
+      required: true
+  - type: input
+    id: mitre-attack
+    attributes:
+      label: MITRE ATT&CK Technique(s)
+      description: Optional - relevant technique IDs
+      placeholder: e.g., T1059, T1078
+  - type: textarea
+    id: tools
+    attributes:
+      label: Key Tools
+      description: What tools/commands should this skill cover?
diff --git a/.github/ISSUE_TEMPLATE/skill-improvement.yml b/.github/ISSUE_TEMPLATE/skill-improvement.yml
new file mode 100644
index 00000000..96afb5f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/skill-improvement.yml
@@ -0,0 +1,41 @@
+name: Skill Improvement
+description: Suggest improvements to an existing skill
+title: "[Improvement]: "
+labels: ["enhancement", "skill-improvement"]
+body:
+  - type: input
+    id: skill-name
+    attributes:
+      label: Skill Name
+      placeholder: e.g., analyzing-network-traffic-with-wireshark
+    validations:
+      required: true
+  - type: dropdown
+    id: improvement-type
+    attributes:
+      label: Type of Improvement
+      options:
+        - More accurate/updated instructions
+        - Better workflow steps
+        - Add missing tools or commands
+        - Improve description for agent discovery
+        - Add MITRE ATT&CK mapping
+        - Add NIST CSF alignment
+        - Improve scripts/assets
+        - Fix outdated content
+    validations:
+      required: true
+  - type: textarea
+    id: current-issue
+    attributes:
+      label: Current Issue
+      description: What is wrong or missing?
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-improvement
+    attributes:
+      label: Suggested Improvement
+      description: What should be changed or added?
+    validations:
+      required: true