diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..dd87496d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,15 @@
+<!--- 
+Replace this comment with a description of the problem.
+
+Please help us by providing all of the details listed below. A complete and thoughtful issue request with research on possible root causes and diagnostics goes a very long way in helping us rapidly get your issues resolved. 
+--> 
+
+**Reproduction Steps:**
+
+**Che version:**    <!--- Retrieve with 'docker run eclipse/che version' - it is also the value of :<version> tag -->
+
+**OS and version:**    
+
+**Docker version:** <!--- Use 'docker version' to get the client and engine versions -->   
+
+**Che cli.log output:**  <!--- This file is in the path mounted to `:/data` -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..3d724b9d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+### What does this PR do?
+
+### What issues does this PR fix or reference?
+
+### Previous behavior
+(Remove this section if not relevant)
+
+### New behavior
+(Explain the PR as it should appear in the release notes)
+
+Please review [Che's Contributing Guide](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md) for best practices.
+
+### Tests written?
+Yes/No
+
+### Docs updated?
+Please add a matching PR to [the docs repo](http://github.com/eclipse/che-docs) and link that PR to this issue. Both will be merged at the same time.