diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
deleted file mode 100644
index bdadc5678ff..00000000000
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-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/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: Configuration -> Info.
--->
-
-- Home Assistant Core release with the issue: 
-- Last working Home Assistant Core release (if known): 
-- Operating environment (OS/Container/Supervised/Core): 
-- 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/z_bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 98%
rename from .github/ISSUE_TEMPLATE/z_bug_report.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index c672da11819..377e1452373 100644
--- a/.github/ISSUE_TEMPLATE/z_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,4 +1,4 @@
-name: Report an issue with Home Assistant Core (Test)
+name: Report an issue with Home Assistant Core
 about: Report an issue with Home Assistant Core.
 title: ""
 issue_body: true