diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 28299b1c09a..b7d73592ef4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,22 +4,17 @@ To help us respond to your issues faster, please make sure to add as much inform
 
 If this issue is about a plugin, please open the issue in that repository.
 
-Start your issues title with [Feature Request] / [Bug] / [Question] or no tag if your unsure.
+Start your issues title with [Feature Request] / [Bug] / [Question] or no tag if your unsure. Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
 
-Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
+Please include some basic information:
+- What grafana version are you using?
+- What datasource are you using?
+- What OS are you running grafana on?
+- What did you do?
+- What was the expected result?
+- What happenend instead?
 
-Sample issue:
+If you question/bug relates to a metric query / unexpected data visualization, please include:
+- An image or text representation of your metric query
+- The raw query and response from your data source (check this in chrome dev tools network tab)
 
-# Basic information
-
-## What grafana version are you using?
-
-## What datasource are you using?
-
-## What OS are you running grafana on?
-
-# What did you do?
-
-# What was the expected result?
-
-# What happenend instead?