diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..00f762a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,16 @@
+# Impacted versions
+
+* Modoboa: X.X.x
+* Distributor: Debian / Ubuntu / Centos / Others
+* Codename: Jessie / Trusty / Centos 7 / ....
+* Arch: 32 Bits / 64 Bits
+* Webserver: Nginx/Apache
+
+# Steps to reproduce
+
+# Current behavior
+
+# Expected behavior
+
+# Video/Screenshot link (optional)
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..2e2977d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Description of the issue/feature this PR addresses:
+
+Current behavior before PR:
+
+Desired behavior after PR is merged: