diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b8d4ef2a7ca2..1f1a7637fbd9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
-### Issue details
+If you are reporting a bug or requesting support, start here:
+### Bug or support request summary
 
 _Please provide issue details here - What did you expect to happen? What happened instead?_ 
 
@@ -24,3 +25,23 @@ _(A screencast can be useful for visual bugs, but it is not a substitute for a t
 ```js
 // code here
 ```
+End bug report support request - delete the rest below
+
+
+If you are creating a issue to track work to be completed, start here:
+### Work summary
+
+_Please provide a description of the work to be completed here - Include some context as to why something needs to be done and link any related tickets._ 
+
+### Where to start
+
+_Please list the file(s) a contributor needs to figure out where to start work and include any docs or tutorials that may be applicable._
+
+### Acceptance criteria
+
+_Please include a checklist of the requirements necessary to close this ticket. The work should be narrowly scoped and limited to a few hours worth by an experienced developer at the most._
+
+### Who to contact
+
+_Add yourself and/or people who are familiar with the code changes and requirements. These people should be able to review the completed code._
+End work issue - please tag this issue with the correct status and type labels