diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c4d6395b..92924ab7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,28 @@
+<!-- Due dilligence -->
+
+## I have
+- [ ] Followed the [troubleshooting guide](https://github.com/openfaas/faas/blob/master/guide/troubleshooting.md)
+- [ ] Read/searched [the docs](https://docs.openfaas.com/)
+- [ ] Searched [past issues](/issues)
+
 <!--- Provide a general summary of the issue in the Title above -->
 
+
 ## Expected Behaviour
 <!--- If you're describing a bug, tell us what should happen -->
 <!--- If you're suggesting a change/improvement, tell us how it should work -->
 
+
 ## Current Behaviour
 <!--- If describing a bug, tell us what happens instead of the expected behavior -->
 <!--- If suggesting a change/improvement, explain the difference from current behavior -->
 
+
 ## Possible Solution
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 <!--- or ideas how to implement the addition or change -->
 
+
 ## Steps to Reproduce (for bugs)
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include code to reproduce, if relevant -->
@@ -24,6 +35,7 @@
 <!--- How has this issue affected you? What are you trying to accomplish? -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
+
 ## Your Environment
 <!--- Include as many relevant details about the environment you experienced the bug in -->
 * FaaS-CLI version ( Full output from: `faas-cli version` ):
@@ -34,7 +46,12 @@
 
 * Operating System and version (e.g. Linux, Windows, MacOS):
 
-* Link to your project or a code example to reproduce issue:
+* Code example or link to GitHub repo or gist to reproduce problem:
 
-* Please also follow the [troubleshooting guide](https://github.com/openfaas/faas/blob/master/guide/troubleshooting.md) and paste in any other diagnostic information you have:
+* Other diagnostic information / logs from [troubleshooting guide](https://github.com/openfaas/faas/blob/master/guide/troubleshooting.md)
+
+
+## Next steps
+
+You may [join Slack](https://docs.openfaas.com/community) for community support.
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 22b263de..783ca129 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,6 +7,7 @@
 <!--- Why is this change required? What problem does it solve? -->
 <!--- If it fixes an open issue, please link to the issue here. -->
 - [ ] I have raised an issue to propose this change ([required](https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md))
+- [ ] My issue has received approval from the maintainers or lead with the `design/approved` label
 
 
 ## How Has This Been Tested?
@@ -14,12 +15,14 @@
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
 
+
 ## Types of changes
 <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 
+
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->