diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 82%
rename from .github/ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 452cafb592..65069d5cf8 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!-- Only file bugs here! Ask questions on the mailing lists https://curl.haxx.se/mail/
 
      SECURITY RELATED? Post it here: https://hackerone.com/curl
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..4ff627346b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request
+    url: https://curl.haxx.se/mail/
+    about: To propose new features or enhancements, please bring that discussion to a suitable curl mailing list.
+  - name: Security vulnerability
+    url: https://hackerone.com/curl
+    about: Please report security problems or just suspected security problems to the curl-security team, to allow us to assess and work on it privately before we release a fix and inform the public.
+  - name: Question
+    url: https://curl.haxx.se/mail/
+    about: Questions should go to the mailing list
+  - name: Commercial support
+    url: https://curl.haxx.se/support.html
+    about: Several companies are offering paid support for curl/libcurl