diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..b9ab8a7c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve RaspAP
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Before submitting an issue**
+Please read this first https://github.com/billz/raspap-webgui/wiki/Reporting-issues
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Your environment**
+* Raspberry Pi hardware (examples: Pi 3 Model B, Pi Zero W)  
+* Raspbian version (examples: Buster Lite, Buster Desktop)
+* Followed the project prerequisites? (Y/N)
+* Checked the project FAQ? (Y/N)
+* RaspAP Quick Install or Manual setup?
+* Using default configuration? (Y/N)
+* Simultaneous AP and managed mode? (Y/N)
+* Onboard wireless chipset or external adapter? 
+* Other software or services running with RaspAP?
+
+**Steps to reproduce**
+Tell us how to reproduce this issue. Provide as much detailed information as possible.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Actual behavior**
+Tell us what you observed instead.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..e3c69965
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for RaspAP
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. For example, 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.