diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9a46dd82215..384cc5834cd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Report an issue with Home Assistant Core
-about: Report an issue with Home Assistant Core.
+description: Report an issue with Home Assistant Core.
 title: ""
 issue_body: true
 body:
@@ -29,6 +29,7 @@ body:
     validations:
       required: true
     attributes:
+      id: version
       label: What is version of Home Assistant Core has the issue?
       placeholder: core-
       description: >
@@ -52,11 +53,13 @@ body:
         - Home Assistant Supervised
         - Home Assistant Core
   - type: input
+    id: integration_name
     attributes:
       label: Integration causing the issue
       description: >
         The name of the integration, for example, Automation or Philips Hue.
   - type: input
+    id: integration_link
     attributes:
       label: Link to integration documentation on our website
       placeholder: "https://www.home-assistant.io/integrations/..."
@@ -76,20 +79,12 @@ body:
       description: |
         If this issue has an example piece of YAML that can help reproducing this problem, please provide.
         This can be an piece of YAML from, e.g., an automation, script, scene or configuration.
-      value: |
-        ```yaml
-        # Put your YAML below this line
-
-        ```
+      render: yaml
   - type: textarea
     attributes:
       label: Anything in the logs that might be useful for us?
       description: For example, error message, or stack traces.
-      value: |
-        ```txt
-        # Put your logs below this line
-
-        ```
+      render: txt
   - type: markdown
     attributes:
       value: |