diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e853ce2f1b423f..84464220749029 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,62 +1,45 @@
 <!-- READ THIS FIRST:
+- If you need additional help with this template please refer to https://www.home-assistant.io/help//reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
 - Do not report issues for components if you are using custom components: files in <config-dir>/custom_components
-- Frontend (user interface of Home Assistant in your browser) related issues have to be reported here: https://github.com/home-assistant/home-assistant-polymer/issues
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
-- Answer all question as detailed as possible, write the information inside the backticks. Do not delete any text from this template!
+- Provide as much details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
 -->
 
-**1. Home Assistant version:**
+**Home Assistant release with the issue:**
 <!--
-- Frontend -> developer tools -> info
+- Frontend -> Developer tools -> Info
 - Or use this command: hass --version
 -->
-```
 
-```
 
-**2.a) I run Hass.io or the Docker image**:
-<!--
-- Yes / No
--->
-```
+**Last working Home Assistant release (if known):**
 
-```
 
-**2.b) ...No, I run an installation with this Python version:**
+**Operating environment (Hass.io/Docker/Windows/etc.):**
 <!--
-- Minimum supported version is Python 3.5.3
-- Use this command: python3 --version
+Please provide details about your environment.
 -->
-```
-
-```
 
-**3. Component/platform:**
+**Component/platform:**
 <!--
-- Please add the link to the documention at https://www.home-assistant.io/components/ of the component/platform in question.
+Please add the link to the documention at https://www.home-assistant.io/components/ of the component/platform in question.
 -->
 
 
-**4. Description of problem:**
+**Description of problem:**
 
 
-**5. Expected:**
 
-
-**6. Problem-relevant `configuration.yaml` entries and steps to reproduce:**
+**Problem-relevant `configuration.yaml` entries and (fill out even if it seems unimportant):**
 ```yaml
 
 ```
 
-1. 
-2. 
-3. 
-
-**7. Traceback (if applicable):**
+**Traceback (if applicable):**
 ```
 
 ```
 
-**8. Additional info:**
+**Additional information:**