diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..1dedde35ea5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,3 @@
+<!-- 
+Thanks for raising a Spring Boot issue. Please provide a brief description of your problem along with the version of Spring Boot that you are using. If possible, please also consider putting together a sample application that reproduces the issue.
+--> 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..80d959a0156
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,6 @@
+<!-- 
+Thanks for contributing to Spring Boot. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
+--> 
+
+<!-- Please also confirm that you have signed the CLA by put an [X] in the box below: -->
+- [ ] I have signed the CLA