diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 00000000000..f326139ba4a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,53 @@
+---
+name: Bug report
+about: Report an issue with Home Assistant
+---
+<!-- 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 integrations if you are using custom components or integrations.
+- Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
+DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
+-->
+## The problem
+<!-- 
+    Describe the issue you are experiencing here to communicate to the
+    maintainers. Tell us what you were trying to do and what happened instead.
+-->
+
+
+## Environment
+<!--
+    Provide details about the versions you are using, which helps us reproducing
+    and finding the issue quicker. Version information is found in the
+    Home Assistant frontend: Developer tools -> Info.
+-->
+
+- Home Assistant release with the issue: 
+- Last working Home Assistant release (if known): 
+- Operating environment (Hass.io/Docker/Windows/etc.): 
+- Integration causing this issue: 
+- Link to integration documentation on our website: 
+
+## Problem-relevant `configuration.yaml`
+<!--
+    An example configuration that caused the problem for you. Fill this out even
+    if it seems unimportant to you. Please be sure to remove personal information
+    like password other credentials.
+-->
+
+```yaml
+
+```
+
+## Traceback/Error logs
+<!--
+    If you come across any trace or error logs, please provide them.
+-->
+
+```txt
+
+```
+
+## Additional information
+
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 885164d7a34..00000000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-<!-- 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
-- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
-- iOS issues should be submitted to the home-assistant-iOS repository: https://github.com/home-assistant/home-assistant-iOS/issues
-- Do not report issues for integrations if you are using a custom integration: files in <config-dir>/custom_components
-- This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
-- Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
--->
-
-**Home Assistant release with the issue:**
-<!--
-- Frontend -> Developer tools -> Info
-- Or use this command: hass --version
--->
-
-
-**Last working Home Assistant release (if known):**
-
-
-**Operating environment (Hass.io/Docker/Windows/etc.):**
-<!--
-Please provide details about your environment.
--->
-
-**Integration:**
-<!--
-Please add the link to the documentation at https://www.home-assistant.io/integrations/ of the integration in question.
--->
-
-
-**Description of problem:**
-
-
-
-**Problem-relevant `configuration.yaml` entries and (fill out even if it seems unimportant):**
-```yaml
-
-```
-
-**Traceback (if applicable):**
-```
-
-```
-
-**Additional information:**
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..19dd772c4e6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Report a bug with the UI, Frontend or Lovelace
+    url: https://github.com/home-assistant/home-assistant-polymer/issues
+    about: This is the issue tracker for our backed. Please report issues with the UI in the frontend repository.
+  - name: Report incorrect/missing information on our website
+    urls: https://github.com/home-assistant/home-assistant.io/issues
+    about: Our documentation has its own issue tracker. Please report issues with the website there.
+  - name: I have a question or need support
+    url: https://www.home-assistant.io/help
+    about: We use GitHub for tracking bugs, check our website for resources on getting help.
+  - name: Feature Request
+    url: https://community.home-assistant.io/c/feature-requests
+    about: Please use our Community Forum for making feature requests.
+  - name: I'm unsure where to go
+    url: https://www.home-assistant.io/join-chat
+    about: If you are unsure where to go, then joining our chat is recommended; Just ask!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 474dff86b3d..4951ae1a0c0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,35 +1,91 @@
-## Breaking Change:
-
-<!-- What is breaking and why we have to break it. Remove this section only if it was NOT a breaking change. -->
-
-## Description:
+## Breaking change
+<!--
+  If your PR contains a breaking change for existing users, it is important
+  to tell them what breaks, how to make it work again and why we did this.
+  This piece of text is published with the release notes, so it helps if you
+  write it towards our users, not us.
+  Note: Remove this section if this PR is NOT a breaking change.
+-->
 
 
-**Related issue (if applicable):** fixes #<home-assistant issue number goes here>
+## Proposed change
+<!-- 
+    Describe the big picture of your changes here to communicate to the
+    maintainers why we should accept this pull request. If it fixes a bug
+    or resolves a feature request, be sure to link to that issue in the 
+    additional information section.
+-->
 
-**Pull request with documentation for [home-assistant.io](https://github.com/home-assistant/home-assistant.io) (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>
 
-## Example entry for `configuration.yaml` (if applicable):
+## Type of change
+<!--
+    What types of changes does your PR introduce to our documention/website?
+    Put an `x` in the boxes that apply. You can also fill these out after
+    creating the PR.
+-->
+
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] New integration (thank you!)
+- [ ] New feature (which adds functionality to an existing integration)
+- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)
+- [ ] Code quality improvements to existing code or addition of tests
+
+## Example entry for `configuration.yaml`:
+<!--
+    Supplying a configuration snippet, makes it easier for a maintainer to test
+    your PR. Furthermore, for new integrations, it gives an impression of how
+    the configuration would look like.
+    Note: Remove this section if this PR does not have an example entry.
+-->
+
 ```yaml
 
 ```
 
-## Checklist:
-  - [ ] The code change is tested and works locally.
-  - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**
-  - [ ] There is no commented out code in this PR.
-  - [ ] I have followed the [development checklist][dev-checklist]
+## Additional information
+<!--
+    Details are important, and help maintainers processing your PR.
+    Please be sure to fill out additional details, if applicable.
+-->
+
+- This PR fixes or closes issue: fixes #
+- This PR is related to issue: 
+- Link to documentation pull request: 
+
+## Checklist
+<!--
+    Put an `x` in the boxes that apply. You can also fill these out after
+    creating the PR. If you're unsure about any of them, don't hesitate to ask.
+    We're here to help! This is simply a reminder of what we are going to look
+    for before merging your code.
+-->
+
+- [ ] The code change is tested and works locally.
+- [ ] Local tests pass. **Your PR cannot be merged unless tests pass**
+- [ ] There is no commented out code in this PR.
+- [ ] I have followed the [development checklist][dev-checklist]
+- [ ] The code has been formatted using Black (`black --fast homeassistant tests`)
+- [ ] Tests have been added to verify that the new code works.
 
 If user exposed functionality or configuration variables are added/changed:
-  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)
+
+- [ ] Documentation added/updated in [home-assistant.io][docs-repository]
 
 If the code communicates with devices, web services, or third-party tools:
-  - [ ] [_The manifest file_][manifest-docs] has all fields filled out correctly. Update and include derived files by running `python3 -m script.hassfest`.
-  - [ ] New or updated dependencies have been added to `requirements_all.txt` by running `python3 -m script.gen_requirements_all`.
-  - [ ] Untested files have been added to `.coveragerc`.
 
-If the code does not interact with devices:
-  - [ ] Tests have been added to verify that the new code works.
+- [ ] [_The manifest file_][manifest-docs] has all fields filled out correctly. Update and include derived files by running `python3 -m script.hassfest`.
+- [ ] New or updated dependencies have been added to `requirements_all.txt` by running `python3 -m script.gen_requirements_all`.
+- [ ] Untested files have been added to `.coveragerc`.
+
+The integration reached or maintains the following Integration Quality Scale:
+<!-- https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html -->
+
+- [ ] No score or internal
+- [ ] 🥈 Silver
+- [ ] 🥇 Gold
+- [ ] 🏆 Platinum
 
 [dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
 [manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
+[quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html
+[docs-repository]: https://github.com/home-assistant/home-assistant.io