diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..e4c1d8a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Create a report to help us improve
+labels: 
+
+---
+
+The following template is for Issue/Bug reporting only. https://docs.qgroundcontrol.com/en/Support/Support.html#github-issues
+
+For questions about how to use or build QGC see: http://qgroundcontrol.com/#resources
+
+If you are using an old stable release please upgrade first and verify your issue before reporting.
+----
+
+## Expected Behavior
+Please tell us what should happen as detailed as possible.
+
+## Current Behavior
+Please describe what happens instead of the expected behavior.
+
+## Steps to Reproduce:
+Please provide an unambiguous set of steps to reproduce the current behavior
+1.
+2.
+3.
+4.
+
+## System Information
+When posting bug reports, include the following information
+- Operating System: [e.g. iOS 12.1, Windows 8, macOS Mojave 10.14.1, Ubuntu 14]
+- QGC Version: [e.g. 3.4.4]
+- QGC build: [e.g., daily, stable, self-built from source, etc...]
+- Flight Controller: [e.g., Pixhawk I, Pixhawk Mini, Pixhawk 2, etc.]
+- Autopilot (with version): [e.g., PX4 1.8.1, Ardupilot Copter 3.6.1]
+
+## Detailed Description
+Provide further details about your issue/bug.
+
+## Log Files and Screenshots
+- [QGC Console Logs](https://docs.qgroundcontrol.com/en/Support/Support.html#reporting-bugs)
+- Autopilot logs when available (post a link).
+- Screenshots of QGC to help identify the current issue/bug behavior.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 804f2fc..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-Please use [the forums](http://discuss.px4.io/c/qgroundcontrol) for new feature requests. You can cross-link the thread in a new issue. However, due to the high amount of user feedback expect the QGC maintainer team to close feature requests that can't be implemented relatively quickly.