diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 40cf60f3dd..ee133cd697 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+**Please state your issue using the following template and, most importantly, in English.**
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -16,11 +18,24 @@ Follow this [guide](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-r
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
+**Method of installation**
+- [ ] Docker/cpu
+- [ ] Docker/gpu
+- [ ] Build from source
+
 **Environment details**
-- Hardware/Softward conditions (OS, CPU, GPU, Memory)
-- Method of installation (Docker, or from source)
-- Milvus version (v0.3.1, or v0.4.0)
-- Milvus configuration (Settings you made in `server_config.yaml`)
+- Hardware/Softwars conditions (OS, CPU, GPU, Memory)
+
+
+- Milvus version (master or released version)
+
+
+**Configuration file**
+Settings you made in `server_config.yaml` or `milvus.yaml`
+
+```yaml
+paste-file-content-here
+```
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..83b2650966
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://github.com/milvus-io/milvus/discussions
+    about: Ask questions and discuss with other community members
diff --git a/.github/ISSUE_TEMPLATE/documentation-request.md b/.github/ISSUE_TEMPLATE/documentation-request.md
index 133fb9e1e9..53e480d8d5 100644
--- a/.github/ISSUE_TEMPLATE/documentation-request.md
+++ b/.github/ISSUE_TEMPLATE/documentation-request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-## Report incorrect documentation
+**Please state your issue using the following template and, most importantly, in English.**
 
 **Location of incorrect documentation**
 Provide links and line numbers if applicable.
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 0000000000..74ed61e07a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,15 @@
+---
+name: "Enhancement request"
+about: Suggest an enhancement idea for Milvus
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Please state your issue using the following template and, most importantly, in English.**
+
+**What would you like to be added ?**
+
+**Why is this needed ?**
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 01bceb3321..8b027b4e03 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+**Please state your issue using the following template and, most importantly, in English.**
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. E.g. I wish I could use Milvus to do [...]
 
diff --git a/.github/ISSUE_TEMPLATE/general-question.md b/.github/ISSUE_TEMPLATE/general-question.md
deleted file mode 100644
index d49fce1817..0000000000
--- a/.github/ISSUE_TEMPLATE/general-question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "\U0001F914 General question"
-about: Ask a general question about Milvus
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**What is your question?**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 307fa950df..f499206467 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,25 @@
 **What type of PR is this?**
 
-api-change / bug / design / documentation / feature
-
-
-**What this PR does / why we need it:**
-
+- [ ] API-change
+- [ ] BUG
+- [ ] Improvement
+- [ ] Documentation
+- [ ] Feature
+- [ ] Test and CI
+- [ ] Code Refactoring
 
 **Which issue(s) this PR fixes:**
 
 Fixes #
 
+**What this PR does / why we need it:**
+
+Not Available
 
 **Special notes for your reviewer:**
 
+Not Available
 
 **Additional documentation (e.g. design docs, usage docs, etc.):**
 
+Not Available