diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/BUG_REPORT.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/z_bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/z_bug_report_form.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index a1b6f5965..9f97bbfbf 100644
--- a/.github/ISSUE_TEMPLATE/z_bug_report_form.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -13,7 +13,7 @@ inputs:
         [fr]: https://community.home-assistant.io/c/feature-requests
   - type: input
     attributes:
-      label: What is the version of the Supervisor used?
+      label: What is the used version of the Supervisor?
       required: true
       placeholder: supervisor-
       description: >
@@ -40,7 +40,7 @@ inputs:
     attributes:
       label: What is the version of your installed operating system?
       required: true
-      placeholder: 5.10
+      placeholder: "5.11"
       description: Can be found in the Supervisor panel -> System tab.
   - type: input
     attributes: