diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d26e35559e9..cec21e6fda6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,6 @@ Contributing to Odoo
 
 TL;DR
 
-* Use this [template](https://raw.githubusercontent.com/odoo/odoo/master/doc/_templates/issue_template.md) when reporting issues, and please search for duplicates first!
+* Use this [template](https://raw.githubusercontent.com/odoo/odoo/master/doc/_static/issue_template.md) when reporting issues, and please search for duplicates first!
 * Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)
 * There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
diff --git a/doc/_static/issue_template.md b/doc/_static/issue_template.md
new file mode 100644
index 00000000000..7ede783f5d7
--- /dev/null
+++ b/doc/_static/issue_template.md
@@ -0,0 +1,19 @@
+Short description of the issue
+
+***Impacted versions:***
+
+ -
+
+***Steps to reproduce:***
+
+ 1. 
+ 2. 
+ 3. 
+
+***Current behavior:***
+
+ - 
+
+***Expected behavior:***
+
+ - 
diff --git a/doc/_static/pull-request-version.png b/doc/_static/pull-request-version.png
new file mode 100644
index 00000000000..dd45388d072
Binary files /dev/null and b/doc/_static/pull-request-version.png differ