diff --git a/.dockerignore b/.dockerignore
index 22e6dc7..8d35d45 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
 .idea
 .git
 .gitignore
+.github
 .dockerignore
 .travis.yml
 tests
diff --git a/.gitattributes b/.gitattributes
index ac2077b..3e18ddc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@ common.php export-subst
 .gitattributes export-ignore
 .gitignore export-ignore
 .gitkeep export-ignore
+.github export-ignore
 
 # core
 data/*.sqlite export-ignore
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 0000000..02a210d
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,28 @@
+Actual behaviour
+----------------
+
+Tell us what happens instead
+
+
+Expected behaviour
+------------------
+
+Tell us what should happen
+
+
+Steps to reproduce
+------------------
+
+1.
+2.
+3.
+
+
+Configuration
+-------------
+
+- Miniflux version:
+- Database type and version:
+- PHP version:
+- OS:
+- Browser:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..2cff808
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,7 @@
+Before to submit your pull-request:
+
+- Be sure that the unit tests pass
+- If you create a new feature, test your code, do not introduce new bugs
+- Avoid code duplication
+- Small pull-requests are easier to review and can be merged quickly
+- 1 pull-request == 1 feature/improvement