diff --git a/.github/ISSUE_TEMPLATE.md.md b/.github/ISSUE_TEMPLATE.md.md
new file mode 100644
index 000000000..d81bb8e80
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md.md
@@ -0,0 +1,27 @@
+<!--
+
+* Please fill out this template with all the relevant information so we can
+  understand what's going on and fix the issue. We appreciate bugs filed and PRs
+  submitted!
+
+* Please make sure that you are familiar with and follow the Code of Conduct for
+  this project (found in the CODE_OF_CONDUCT.md file).
+
+-->
+
+## Minimal reproduction of the issue with instructions:
+
+## Expected behavior:
+
+## Other information:
+
+## I would be willing to submit a PR to fix this issue:
+
+[ ] Yes (Assistance is provided if you need help submitting a pull request)  
+[ ] No
+
+<!--
+
+If you are willing to submit a PR but are a bit unsure, feel free to check out the [Contributors Guide](CONTRIBUTING.md) for useful tips and hints that help you get started.
+
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9bcc83474..e8827a7ae 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,11 @@ Before submitting the Pull Request make sure you:
 
 * the commit message follows our guidelines: CONTRIBUTING.md#commit-message-guidelines
 
-Feel free to add yourself as a contributor via `npm run contributors:add`
+Feel free to add yourself as a contributor via `npm run contributors:add` and don't forget to run 
+`npm run contributors:generate` after this. For example:
+
+$ npm run contributors:add username code,test,translation
+$ npm run contributors:generate
 
 -->