diff --git a/.github/ISSUE_TEMPLATE/fetching-content.md b/.github/ISSUE_TEMPLATE/1-fetching-content.md
similarity index 71%
rename from .github/ISSUE_TEMPLATE/fetching-content.md
rename to .github/ISSUE_TEMPLATE/1-fetching-content.md
index 72e9124fa..a3ba9758c 100644
--- a/.github/ISSUE_TEMPLATE/fetching-content.md
+++ b/.github/ISSUE_TEMPLATE/1-fetching-content.md
@@ -7,12 +7,18 @@ assignees: ''
 
 ---
 
+<!--
+Thank you for reporting a fetching issue.
+
+Please fill in as much of the template below as you're able.
+-->
+
 **Before submitting the issue, please read:**
 If wallabag can't parse / extract content for a given link, please first read the documentation about it:
 http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
 
-We have a lot of request about fetching config issue. It'll help us a lot if you give a try to fix it on your own following the doc.
-If you failed to fix it yourself, tick the following box:
+We have a lot of requests about fetching config issue. It'll help us A LOT if you give a try to fix it on your own following the doc.
+If you failed to fix it yourself, tick the following boxes:
 - [ ] I've tried myself without success
 - [ ] I've replaced `HOST` in the issue title with the host of the URL that can't be fetched (ie: `nytimes.com`, `20minutes.fr`, `bbc.com`, etc.)
 
diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.md b/.github/ISSUE_TEMPLATE/2-bug-report.md
new file mode 100644
index 000000000..a369501ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-bug-report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Thank you for reporting an issue.
+
+Please fill in as much of the template below as you're able.
+
+Version:      if you know it, otherwise use the git revision
+Installation: How did you install wallabag? Using git clone, the docker image, an installer, downloading the package, etc.
+PHP version:  The version of PHP you are using
+OS:           The host running wallabag
+Database:     The storage system your instance is using (SQLite, MySQL/MariaDB or PostgreSQL) with the version
+Parameters:   Paste the content of your app/config/parameters.yml (hide sensitive stuff if you want)
+-->
+### Environment
+
+* **Version**:
+* **Installation**:
+* **PHP version**:
+* **OS**:
+* **Database**:
+* **Parameters**: <details>
+  <summary>Your `app/config/parameters.yml` below</summary>
+  PASTE HERE
+</details>
+
+### What steps will reproduce the bug?
+
+<!--
+Enter details about your bug and how to reproduce it
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/3-feature-request.md
similarity index 82%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/3-feature-request.md
index e74cb57fa..3d66dd221 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3-feature-request.md
@@ -7,6 +7,12 @@ assignees: ''
 
 ---
 
+<!--
+Thank you for suggesting an idea to make wallabag better.
+
+Please fill in as much of the template below as you're able.
+-->
+
 **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 [...]
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c766dcc8e..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Issue details
-
-Please provide issue details here.
-Remember, this is _not_ a place to ask questions. For that, go to our chat at http://gitter.im/wallabag/wallabag or https://matrix.to/#/#wallabag_wallabag:gitter.im.
-
-### Environment
-
-* wallabag version (or git revision) that exhibits the issue:
-* How did you install wallabag? Via `git clone` or by downloading the package?
-* Last wallabag version that did not exhibit the issue (if applicable):
-* php version:
-* OS:
-* type of hosting (shared or dedicated):
-* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
-* <details>
-  <summary>Paste your `app/config/parameters.yml` below</summary>
-  PASTE HERE
-</details>
-
-### Steps to reproduce/test case
-
-Please provide necessary steps for reproduction of this issue, or better the
-reduced test case (without any external dependencies, if possible).
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..3be7f77da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Want to ask something?
+    url: https://gitter.im/wallabag/wallabag
+    about: Use Gitter to ask questions.