diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 0000000000..f088f4c019
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,85 @@
+---
+name: Report a bug with the UI, Frontend or Lovelace
+about: Report an issue related to the Home Assistant frontend.
+labels: bug
+---
+<!-- 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 custom Lovelace cards.
+- 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.
+-->
+## Checklist
+
+- [ ] I have updated to the latest available Home Assistant version.
+- [ ] I have cleared the cache of my browser.
+- [ ] I have tried a different browser to see if it is related to my browser.
+
+## The problem
+<!--
+  Describe the issue you are experiencing here to communicate to the
+  maintainers. Tell us about the current behavior.
+  If possible provide a screenshot with a description.
+-->
+
+
+## Expected behavior
+<!-- 
+  Describe what you expected to happen or it should look/behave.
+  If possible provide a screenshot with a description.
+-->
+
+
+## Steps to reproduce
+<!--
+  Provide steps for us, that helps reproducing your issue.
+  For example:
+    1. Add a climate integration
+    2. Navigate to Lovelace
+    3. Click more info of the climate entity
+    4. Set the HVAC action to heat
+    5. Set the temperature higher than the current temperature
+    6. Set the HVAC action to cool
+-->
+
+
+## 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.
+
+  Browser version and operating system is important! Please try to replicate
+  your issue in a different browser and be sure to include your findings.
+-->
+
+- Home Assistant release with the issue: 
+- Last working Home Assistant release (if known): 
+- UI Type (States or Lovelace): 
+- Browser and browser version: 
+- Operating system: 
+
+## Problem-relevant configuration
+<!--
+  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 passwords, private URLs and other credentials.
+-->
+
+```yaml
+
+```
+
+## Javascript errors shown in your browser console/inspector
+<!--
+  If you come across any javascript or other error logs, e.g., in your browser
+  console/inspector please provide them.
+-->
+
+```txt
+
+```
+
+## Additional information
+
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 0000000000..634724fcbe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,25 @@
+---
+name: Request a feature for the UI, Frontend or Lovelace
+about: Request an new feature for the Home Assistant frontend.
+labels: feature request
+---
+<!--
+  DO NOT DELETE ANY TEXT from this template!
+  Otherwise, your request may be closed without comment.
+-->
+## The request
+<!-- 
+  Describe to our maintainers, the feature you would like to be added.
+  Please be clear and concise and, if possible, provide a screenshot or mockup.
+-->
+
+
+## The alternatives
+<!--
+  Are you currently using, or have you considered alternatives?
+  If so, could you please describe those?
+-->
+
+
+## Additional information
+
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index e59509d257..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ""
-labels: bug
-assignees: ""
----
-
-<!-- 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
-- Provide as many details as possible. Do not delete any text from this template!
--->
-
-**Checklist:**
-
-- [ ] I updated to the latest version available
-- [ ] I cleared the cache of my browser
-
-**Home Assistant release with the issue:**
-
-<!--
-- Frontend -> Developer tools -> Info
-- Or use this command: hass --version
--->
-
-**Last working Home Assistant release (if known):**
-
-**UI (States or Lovelace UI?):**
-
-<!--
-- Frontend -> Developer tools -> Info
--->
-
-**Browser and Operating System:**
-
-<!--
-Provide details about what browser (and version) you are seeing the issue in. And also which operating system this is on. If possible try to replicate the issue in other browsers and include your findings here.
--->
-
-**Description of problem:**
-
-<!--
-Explain what the issue is, and what is the current behaviour. If possible provide a screenshot with a description.
--->
-
-**Expected behaviour:**
-
-<!--
-Explain how things should look/behave. If possible provide a screenshot with a description.
--->
-
-**Relevant config:**
-
-<!--
-Give the config of both the integration that is used, the Lovelace config, scene, automation or otherwise relevant configuration.
--->
-
-**Steps to reproduce this problem:**
-
-<!--
-Sum up all steps that are necessary to reproduce this bug.
-For example:
-1. Add a climate integration
-2. Navigate to Lovelace
-3. Click more info of the climate entity
-4. Set the hvac action to heat
-5. Set the temperature higher than the current temperature
-6. Set the hvac action to cool
--->
-
-**Javascript errors shown in the web inspector (if applicable):**
-
-```
-
-```
-
-**Additional information:**
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..7581c03f17
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Report a bug that is NOT related to the UI, Frontend or Lovelace
+    url: https://github.com/home-assistant/home-assistant/issues
+    about: This is the issue tracker for our frontend. Please report other issues with the backend repository.
+  - name: Report incorrect or missing information on our website
+    url: 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: 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/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 51d1465c16..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ""
-labels: feature request
-assignees: ""
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..f73933940c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,77 @@
+<!--
+  You are amazing! Thanks for contributing to our project!
+  Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
+-->
+## 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.
+-->
+
+
+## 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.
+-->
+
+
+## Type of change
+<!--
+  What type of change does your PR introduce to the Home Assistant frontend?
+  NOTE: Please, check only 1! box! 
+  If your PR requires multiple boxes to be checked, you'll most likely need to
+  split it into multiple PRs. This makes things easier and faster to code review.
+-->
+
+- [ ] Dependency upgrade
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] New feature (thank you!)
+- [ ] Breaking change (fix/feature causing existing functionality to break)
+- [ ] Code quality improvements to existing code or addition of tests
+
+## Example configuration
+<!--
+  Supplying a configuration snippet, makes it easier for a maintainer to test
+  your PR.
+-->
+
+```yaml
+
+```
+
+## 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.
+- [ ] There is no commented out code in this PR.
+- [ ] Tests have been added to verify that the new code works.
+
+If user exposed functionality or configuration variables are added/changed:
+
+- [ ] Documentation added/updated for [www.home-assistant.io][docs-repository]
+
+<!--
+  Thank you for contributing <3
+-->
+[docs-repository]: https://github.com/home-assistant/home-assistant.io