diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..ec918081
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,17 @@
+### Resume
+
+| Q             | A
+| ------------- | ---
+| Bug?          | yes/no
+| New feature?  | yes/no
+
+### Description
+
+
+### Versions
+
+<!-- You can use `glances -V` to retrieve Glances and PSutil versions -->
+
+* Glances:
+* PSutil:
+* OS:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..d92f909d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+### Resume
+
+| Q             | A
+| ------------- | ---
+| Bug fix?      | yes/no
+| New feature?  | yes/no
+| BC breaks?    | yes/no
+| Deprecations? | yes/no
+| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+
+### Description