diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..713c7dc2872
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,49 @@
+<!-- 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/core/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.
+-->
+
+
+## Environment
+<!--
+  Provide details about the versions you are using, which helps us to reproduce
+  and find the issue quicker. Version information is found in the
+  Home Assistant frontend: Developer tools -> Info.
+-->
+
+- Home Assistant Core release with the issue: 
+- Last working Home Assistant Core release (if known): 
+- Operating environment (Home Assistant/Supervised/Docker/venv): 
+- 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 passwords, private URLs and 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
index 977abc6ef6b..9bfecda724f 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,10 +1,10 @@
 ---
-name: Report a bug with Home Assistant 
-about: Report an issue with Home Assistant
+name: Report a bug with Home Assistant Core
+about: Report an issue with Home Assistant Core
 ---
 <!-- 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
+  - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/core/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.
@@ -12,7 +12,7 @@ about: Report an issue with Home Assistant
 ## 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.
+  maintainers. Tell us what you were trying to do and what happened.
 -->
 
 
@@ -23,9 +23,9 @@ about: Report an issue with Home Assistant
   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.): 
+- Home Assistant Core release with the issue: 
+- Last working Home Assistant Core release (if known): 
+- Operating environment (Home Assistant/Supervised/Docker/venv): 
 - Integration causing this issue: 
 - Link to integration documentation on our website: