diff --git a/.github/issue_template.md b/.github/issue_template.md
index 0518f9f3f..753086c87 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,5 +1,8 @@
-This software focus on simplicity, the number of features is voluntary limited.
+This issue is:
 
+[] Bug report
+[] Feature request
+[] Improvement
 
 ### Actual behaviour
 
@@ -13,6 +16,9 @@ This software focus on simplicity, the number of features is voluntary limited.
 ### Screenshots
 
 
+### Logs
+
+
 ### Configuration
 
 - Kanboard version:
@@ -20,3 +26,6 @@ This software focus on simplicity, the number of features is voluntary limited.
 - PHP version:
 - OS:
 - Browser:
+
+[Frequently Asked Questions](https://docs.kanboard.org/en/latest/developer_guide/faq.html)
+
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9756a6e7e..fac60a16c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,8 +1 @@
-Before to submit your pull-request:
-
-- Be sure that the unit tests pass
-- If you create a new feature, test your code, and do not introduce new bugs
-- Avoid code duplication
-- Remember, small pull-requests are easier to review and can be merged quickly
-- 1 pull-request == 1 feature/improvement
-- Nonessential features should be implemented as plugin
+[] I read the [contributor guidelines](https://docs.kanboard.org/en/latest/developer_guide/contributing.html#i-want-to-contribute-to-the-code)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 6c9155253..a374f1b4b 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1 +1 @@
-See https://github.com/kanboard/kanboard/blob/master/doc/en_US/contributing.markdown
+See https://docs.kanboard.org/en/latest/developer_guide/index.html
diff --git a/README.md b/README.md
index 0ccc88267..cff36702d 100644
--- a/README.md
+++ b/README.md
@@ -5,29 +5,20 @@ Kanboard
 
 Kanboard is project management software that focuses on the Kanban methodology.
 
-Official website: <https://kanboard.org/>
-
-- Get a clear visual overview of your project
-- Multiple boards with the ability to drag and drop tasks
-- Open source and self-hosted
-- Super simple installation
-- Translated into many languages
-- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/master/LICENSE)
+- Official website: <https://kanboard.org/>
 - [List of features](https://kanboard.org/#features)
 - [Change Log](https://github.com/kanboard/kanboard/blob/master/ChangeLog)
-- [Documentation](https://github.com/kanboard/kanboard/blob/master/doc/en_US/index.markdown)
-- IRC channel: [#kanboard](ircs://chat.freenode.net:6697/#kanboard) (Freenode)
+- Official documentation: <https://docs.kanboard.org/>
+    - [Requirements](https://docs.kanboard.org/en/latest/admin_guide/requirements.html)
+    - [Installation instructions](https://docs.kanboard.org/en/latest/admin_guide/installation.html)
+    - [Upgrade to a new version](https://docs.kanboard.org/en/latest/admin_guide/upgrade.html)
+    - [Use Kanboard with Docker](https://docs.kanboard.org/en/latest/admin_guide/docker.html)
 
 Credits
 -------
 
 - Main developer: Frédéric Guillot
 - [Contributors](https://github.com/kanboard/kanboard/graphs/contributors)
+- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/master/LICENSE)
 
-Installation and Upgrade
-------------------------
 
-- [Requirements](https://github.com/kanboard/kanboard/blob/master/doc/en_US/requirements.markdown)
-- [Installation instructions](https://github.com/kanboard/kanboard/blob/master/doc/en_US/installation.markdown)
-- [Upgrade to a new version](https://github.com/kanboard/kanboard/blob/master/doc/en_US/update.markdown)
-- [Use Kanboard with Docker](https://github.com/kanboard/kanboard/blob/master/doc/en_US/docker.markdown)