diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..af0172a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug Report
+about: Report an issue with an existing skill.
+title: '[Bug] '
+labels: bug
+assignees: ''
+---
+
+### Affected Skill
+<!-- Please provide the path to the skill (e.g., `build/agp/agp-9-upgrade`). -->
+
+### Description
+<!-- A clear and concise description of what the bug is. -->
+
+### Expected Behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Actual Behavior
+<!-- A clear and concise description of what actually happened. -->
+
+### Steps to Reproduce
+<!-- Steps to reproduce the behavior. Please include the model used and the prompt provided to the LLM. -->
+
+### Suggested Fix
+<!-- If you have a solution in mind, please describe it. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..e30f9e7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Suggest a new skill to fill a gap in the LLM's knowledge.
+title: '[Feature] '
+labels: enhancement
+assignees: ''
+---
+
+> [!NOTE]
+> Feature requests are accepted only if the proposed skill fills a verified gap in state-of-the-art LLMs. To assess this, please test your use case against both a fast model (e.g., Gemini 3 Flash) and a reasoning/thinking model (e.g., Gemini 3.1 Pro).
+
+### What is the gap in the LLM's knowledge?
+<!-- Describe what the LLM currently struggles with or cannot do regarding Android development. Ideally, include link to repository and used prompt. -->
+
+### Proposed Skill
+<!-- Describe the skill you are proposing to fill this gap. What should it cover? -->
+
+### Additional Context
+<!-- Add any other context or references here. -->