diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b076facd56..7035633cac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,25 +1,43 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report problems and unexpected behavior
 
 ---
 
-First of all, read https://www.chiark.greenend.org.uk/~sgtatham/bugs.html.
+<!--
+
+First of all, please read https://www.chiark.greenend.org.uk/~sgtatham/bugs.html.
 
 If you don't want to read, it's up to you. But don't waste your time continue reporting.
 
 The issue will be closed without any explanation if it does not satisfy any of following requirements:
 
-1. Please speak English, we have forum in [中文](https://discuss.gogs.io/c/getting-help/getting-help-chinese).
-2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only.
+1. Please speak English, we have forum in 中文: https://discuss.gogs.io/c/getting-help/getting-help-chinese.
+2. Please post any questions, configuration or deploy problems on our forum: https://discuss.gogs.io.
 3. Please do not end your title with a question mark or period.
-3. Please take a moment to search that an issue doesn't already exist.
-4. Please give all relevant information below for bug reports; incomplete details considered invalid report.
+4. Please take a moment to search and make sure the issue doesn't already exist.
+5. Please give all relevant information below for bug reports; incomplete details are considered invalid report.
 
-**You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.**
+-->
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
+
+**Gogs version or commit**
+<!-- The version number or the commit SHA of the Gogs instance you use -->
+
+**Git version**
+
+```
+$ git version
+
+```
+
+**Operating system**
+<!-- The name and version of your operating system -->
+
+**Database**
+<!-- The database and version you use -->
 
 **To Reproduce**
 Steps to reproduce the behavior:
@@ -28,23 +46,16 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
+<!-- Use [x] to check the box -->
+Can you reproduce the bug at https://try.gogs.io:
+    - [ ] Yes: <!-- provide example URL -->
+    - [ ] No: <!-- explain why below -->
+
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to help explain your problem. -->
 
 **Additional context**
-
-- Gogs version (or commit ref): 
-- Git version: 
-- Operating system: 
-- Database (replace `[ ]` with `[x]`):
-  - [ ] PostgreSQL
-  - [ ] MySQL
-  - [ ] MSSQL
-  - [ ] SQLite
-- Can you reproduce the bug at https://try.gogs.io:
-  - [ ] Yes: provide example URL
-  - [ ] No: explain why
-- Log gist (usually found in `log/gogs.log`):
+<!-- Please include any error logs found in `log/gogs.log` -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..6692287b84
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Gogs Community Forum
+    url: https://discuss.gogs.io/
+    about: Please ask and answer questions here.