diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md_disabled b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/BUG_REPORT.md_disabled
rename to .github/ISSUE_TEMPLATE/BUG_REPORT.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/z_bug_report_form.yml
similarity index 99%
rename from .github/ISSUE_TEMPLATE/bug_report.yml
rename to .github/ISSUE_TEMPLATE/z_bug_report_form.yml
index 36c62713e..a1b6f5965 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/z_bug_report_form.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: Bug Report Form
 about: Report an issue related to the Home Assistant Supervisor.
 labels: bug
 title: ""