diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 79a3bb232..8b9aea856 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -1,16 +1,24 @@
 Please answer these questions before submitting your issue.
 
-### What version of sky-walking are you using?
+- Why do you submit this issue?
+- [ ] Question or discussion
+- [ ] Bug
+- [ ] Requirement
+- [ ] Feature or performance improvement
 
+___
+### Question
+- What do you want to know?
 
-### What version of your OS?
+___
+### Bug
+- Which version of SkyWalking, OS and JRE?
 
+- Which company or project?
 
-### What version of your JRE?
-
-
-### What company or project?
-
-
-### What did you do?
+- What happen?
 If possible, provide a way for reproducing the error. e.g. demo application, component version.
+
+___
+### Requirement or improvement
+- Please describe about your requirements or improvement suggestions.
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 000000000..33068d40d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,18 @@
+Please answer these questions before submitting pull request
+
+- Why submit this pull request?
+- [ ] Bug fix
+- [ ] New feature provided
+- [ ] Improve performance
+
+- Related issues
+
+___
+### Bug fix
+- Bug description.
+
+- How to fix?
+
+___
+### New feature or improvement
+- Describe the details and related test reports.