diff --git a/.github/ISSUE_TEMPLATE/1-Security.md b/.github/ISSUE_TEMPLATE/1-Security.md
new file mode 100644
index 0000000000000000000000000000000000000000..2f5a3170e7e441a8c18e156239685700aaf4ecae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-Security.md
@@ -0,0 +1,6 @@
+---
+name: Security problem
+about: Don't raise security issues here. Please email security@renovatebot.com instead.
+---
+
+Stop! Don't raise an issue here! Please email security@renovatebot.com instead
diff --git a/.github/ISSUE_TEMPLATE/Config_help.md b/.github/ISSUE_TEMPLATE/2-Config_help.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Config_help.md
rename to .github/ISSUE_TEMPLATE/2-Config_help.md
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/3-Bug_report.md
similarity index 85%
rename from .github/ISSUE_TEMPLATE/Bug_report.md
rename to .github/ISSUE_TEMPLATE/3-Bug_report.md
index 482fe31a6b2ed1fef82a2b6e9f583049829d7a17..24bc6835f5ec76169dd8d354cdd94552373768dd 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/3-Bug_report.md
@@ -1,25 +1,25 @@
----
+---
 name: Bug report
-about: You've found a bug with renovate
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1.  Create repository with '...'
-2.  Configure '....'
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Renovate version:**
-Renovate CLI, Renovate GitHub App, or Renovate Pro?
-
-**Additional context**
-Add any other context about the problem here.
+about: You've found a bug with Renovate
+---
+
+**What Renovate type are you using?**
+Renovate CLI, Renovate GitHub App, or Renovate Pro?
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1.  Create repository with '...'
+2.  Configure '....'
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**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/4-Feature_request.md
similarity index 97%
rename from .github/ISSUE_TEMPLATE/Feature_request.md
rename to .github/ISSUE_TEMPLATE/4-Feature_request.md
index a47fb0419f261481fc9edc0e14756dc088d8758e..663cc39ab2a5399e4a4bf4cf856911a623927888 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/4-Feature_request.md
@@ -1,16 +1,16 @@
----
+---
 name: Feature request
-about: Suggest an idea for this project
----
-
-**What would you like Renovate to be able to do?**
-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.
+about: Suggest an idea for this project
+---
+
+**What would you like Renovate to be able to do?**
+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.
diff --git a/.github/ISSUE_TEMPLATE/Security.md b/.github/ISSUE_TEMPLATE/Security.md
deleted file mode 100644
index 1224233536bc7f95d0600f78ca42c27b9891bac0..0000000000000000000000000000000000000000
--- a/.github/ISSUE_TEMPLATE/Security.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: Security problem
-about: Anything related to security
----
-
-Don't raise an issue here! Please email security@renovatebot.com instead