diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/report-an-issue.md b/.github/ISSUE_TEMPLATE/report-an-issue.md
new file mode 100644
index 0000000..9d93471
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-an-issue.md
@@ -0,0 +1,23 @@
+---
+name: Report an Issue
+about: Report an issue to help improve the software
+title: "[ISSUE]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the issue**
+A clear and concise description of what the bug is.
+
+**Operating System**
+Tell us which OS you are running
+
+**To Reproduce**
+If the problem is intent / voice related please tell us what you said which caused the issue, or if the problem is related to running the skill or web service tell us which commands you ran. 
+
+**Logs**
+Please paste any logs generated by the AskNavidrome web service
+
+**Comments**
+Add any other context about the problem here.