diff --git a/.github/ISSUE_TEMPLATE/configuration-issue.md b/.github/ISSUE_TEMPLATE/configuration-issue.md
new file mode 100644
index 00000000000..d2b60d68ed8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/configuration-issue.md
@@ -0,0 +1,9 @@
+---
+name: Configuration Issue
+about: Find help if you are struggling with configuring Betaflight
+
+---
+
+**Important: This is not the right place to get help with configuration issues. Your issue will be closed without further comment.**
+
+Please get help from other user support options such as asking the manufacturer of the hardware you are using, RCGroups: https://rcgroups.com/forums/showthread.php?t=2464844, or Slack (registration at https://slack.betaflight.com/) or other user support forums & groups (e.g. Facebook).
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000000..ec295e0d9a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Suggest an idea for for a new feature for Betaflight
+
+---
+
+**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.
+
+Please note that feature requests are not 'fire and forget'. It is a lot more likely that the feature you would like to have will be implemented if you keep watching your feature request, and provide more details to developers looking into implementing your feature, and help them with testing.
diff --git a/.github/ISSUE_TEMPLATE/firmware-bug-report.md b/.github/ISSUE_TEMPLATE/firmware-bug-report.md
new file mode 100644
index 00000000000..86e7d661518
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/firmware-bug-report.md
@@ -0,0 +1,25 @@
+---
+name: Firmware Bug Report
+about: Create a report to help us fix bugs in the Betaflight firmware
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Flight controller configuration**
+Create a `diff` and post it here in a code block. Put ``` (three backticks) at the start and end of the `diff` block (instructions  on how to do a diff: https://oscarliang.com/use-diff-not-dump-betaflight/)
+
+**Setup / Versions**
+ - Flight controller [what type is it, where was it bought from];
+ - Other components [RX, VTX, brand / model for all of them, firmware version where applicable];
+ - how are the different components wired up.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/hardware-problem-report.md b/.github/ISSUE_TEMPLATE/hardware-problem-report.md
new file mode 100644
index 00000000000..1e86f072e2a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/hardware-problem-report.md
@@ -0,0 +1,9 @@
+---
+name: Hardware Problem Report
+about: Report problems with faulty / broken hardware
+
+---
+
+**Important: This is not the right place to report faulty / broken hardware. Your issue will be closed without further comment.**
+
+Contact the manufacturer or supplier of your hardware, or check RCGroups https://rcgroups.com/forums/showthread.php?t=2464844 to see if others with the same problem have found a solution.
diff --git a/.github/issue_template.md b/.github/issue_template.md
index 18d2a33ba33..b2c6264b560 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,6 +1,6 @@
 # If your issue looks like a hardware fault or a configuration problem please don't raise an issue here.
 
-## Please consider using other user support options such as asking the manufacturer of the hardware you are using, RCGroups: https://rcgroups.com/forums/showthread.php?t=2464844, or Slack: https://slack.betaflight.tech or other user support forums & groups (e.g. facebook).
+## Please consider using other user support options such as asking the manufacturer of the hardware you are using, RCGroups: https://rcgroups.com/forums/showthread.php?t=2464844, or Slack (registration at https://slack.betaflight.com/) or other user support forums & groups (e.g. facebook).
 
 ## If you believe there is an issue with the firmware itself please follow these steps:
 1. Describe your problem;