3 files changed, 30 insertions, 12 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index f90e13e1..edff6d43 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,14 +5,17 @@ title: "[OS] title"
 labels: 'bug'
 
 ---
-## Platform
+## Summary
 
-* { OS version }
-* { psutil version (print psutil.__version__) }
-* { python version }
+* OS: { type-or-version }
+* Architecture: { 64bit, 32bit, ARM, PowerPC, s390 }
+* Psutil version: { pip3 show psutil }
+* Python version: { python3 -V }
+* Type: { core, doc, performance, scripts, tests, wheels, newapi }
 
+## Description
 
-## Bug description
-
-...
-
+{{{
+  A clear explanation of the bug, including traceback nessage (if any). Please read the contributing guidelines before submit:
+  https://github.com/giampaolo/psutil/blob/master/CONTRIBUTING.md
+}}}
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index 2111c572..0a1cbb77 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -6,3 +6,14 @@ title: "[OS] title"
 
 ---
 
+## Summary
+
+* OS: { type-or-version }
+* Type: { core, doc, performance, scripts, tests, wheels, newapi }
+
+## Description
+
+{{{
+  A clear explanation of your proposal. Please read the contributing guidelines before submit:
+  https://github.com/giampaolo/psutil/blob/master/CONTRIBUTING.md
+}}}
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 88f416f0..6b7fdee7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,13 @@
-## Resume
+## Summary
 
-* OS: { OS name }
+* OS: { type-or-version }
 * Bug fix: { yes/no }
-* Fixes: { comma-separated list of tickets fixed by the PR, if any }
+* Type: { core, doc, performance, scripts, tests, wheels, newapi }
+* Fixes: { comma-separated list of issues fixed by this PR, if any }
 
 ## Description
 
-...
+{{{
+  A clear explanation of your bugfix or enhancement. Please read the contributing guidelines before submit:
+  https://github.com/giampaolo/psutil/blob/master/CONTRIBUTING.md
+}}}