diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000000..979f0b717229
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Drone switched on '...'
+2. Uploaded mission '....' (attach QGC mission file)
+3. Took off '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Log Files and Screenshots**
+Always provide the flight log file, add screenshots to help explain your problem.
+ - Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/en/flight-reporting.html))
+ - Share the link to a log showing the problem on [PX4 Flight Review](http://logs.px4.io/)
+
+**Drone (please complete the following information):**
+ - Description of the type of drone
+ - Photo of the IMU / autopilot setup if possible
+
+**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 000000000000..87b4e903bb56
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+For general questions please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](slack.px4.io).
+
+**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.