diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f5fb775bd9..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-1. Please speak English
-2. Please ask questions or config/deploy problems
-   on our gitter channel: https://gitter.im/go-gitea/gitea
-   Here are bugs and feature requests only.
-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.
-
-**You MUST delete above content including this line before posting;
-too lazy to take this action considered invalid report.**
-
-- Gitea version (or commit ref):
-- Git version:
-- Operating system:
-- Database (use `[x]`):
-  - [ ] PostgreSQL
-  - [ ] MySQL
-  - [ ] SQLite
-- Log gist:
-
-## Description
-
-...
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 380150422f..0000000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Please check the following:
-
-1. Make sure you are targeting the `master` branch.
-2. Read contributing guidelines:
-   https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
-3. Describe what your pull request does and which issue
-   you're targeting (if any)
-
-**You MUST delete above content including this line before posting;
-too lazy to take this action considered invalid pull request.**
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 0000000000..ec619ded50
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,19 @@
+1. Please speak English, this is the language everybody of us can speak and write.
+2. Please ask questions or config/deploy problems on our Gitter channel: https://gitter.im/go-gitea/gitea
+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 will be handled as an invalid report.
+
+**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**
+
+- Gitea version (or commit ref):
+- Git version:
+- Operating system:
+- Database (use `[x]`):
+  - [ ] PostgreSQL
+  - [ ] MySQL
+  - [ ] SQLite
+- Log gist:
+
+## Description
+
+...
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..702062490d
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,7 @@
+Please check the following:
+
+1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes.
+2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
+3. Describe what your pull request does and which issue you're targeting (if any)
+
+**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**