diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ccc915a..795176c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,36 +1,37 @@
 <!--
-- Please ask questions at https://groups.google.com/forum/#!forum/loopbackjs or
+Questions:
+  https://groups.google.com/forum/#!forum/loopbackjs
   https://gitter.im/strongloop/loopback
-
-- Immediate support is available through our subscription plans, see
+Immediate support:
   https://strongloop.com/api-connect-faqs/
+  https://strongloop.com/node-js/subscription-plans/
 -->
 
-### Bug or feature request
+# Description/Steps to reproduce
 
 <!--
-Mark your choice with an "x" (eg. [x], NOT [*]).
+If feature: A description of the feature
+If bug: Steps to reproduce
 -->
 
-- [ ] Bug
-- [ ] Feature request
+# Link to reproduction sandbox
 
-### Description of feature (or steps to reproduce if bug)
+<!--
+Link to an app sandbox for reproduction
 
+Note: Failure to provide a sandbox application for reproduction purposes will result in the issue being closed.
+-->
 
+# Expected result
 
-### Link to sample repo to reproduce issue (if bug)
-
-
-
-### Expected result
-
-
-
-### Actual result (if bug)
-
-
-
-### Additional information (Node.js version, LoopBack version, etc)
+<!--
+Also include actual results if bug
+-->
 
+# Additional information
 
+<!--
+Copy+paste the output of these two commands:
+  node -e 'console.log(process.platform, process.arch, process.versions.node)'
+  npm ls --prod --depth 0 | grep loopback
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d2b240f..368cb4c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,17 +6,18 @@
 <!--
 Please use the following link syntaxes:
 
-- #49 (to reference issues in the current repository)
-- strongloop/loopback#49 (to reference issues in another repository)
+- connect to #49 (to reference issues in the current repository)
+- connect to strongloop/loopback#49 (to reference issues in another repository)
 -->
 
-- None
+- connect to <link_to_referenced_issue>
 
 ### Checklist
 
 <!--
-Please mark your choice with an "x" (i.e. [x], see
+- Please mark your choice with an "x" (i.e. [x], see
 https://github.com/blog/1375-task-lists-in-gfm-issues-pulls-comments)
+- PR's without test coverage will be closed.
 -->
 
 - [ ] New tests added or existing tests modified to cover all changes