diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..d89b284a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+labels: bug
+
+---
+
+### Steps to reproduce
+
+1.
+2.
+3.
+
+### Expected behaviour
+- Tell us what should happen
+
+### Actual behaviour
+- Tell us what happens
+
+### Environment data
+
+Audiobookshelf Version:
+
+- [ ] Android App?
+- [ ] iOS App?
+
+#### Android Issue
+Android version:
+
+Device model:
+
+Stock or customized system:
+
+#### iOS Issue
+iOS Version:
+
+iPhone model:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..9d995c6f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: enhancement
+
+---
+
+### 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.