diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
deleted file mode 100644
index 1accd59c648..00000000000
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: Report a bug with one of the add-ons
-about: Report an issue with one of the add-ons in this repository
----
-<!-- 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 the add-on before reporting an issue
-  - 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.
-  - This is the issue tracker for add-ons, feature request for new or existing add-ons should be opened on the forum https://community.home-assistant.io/c/feature-requests
--->
-## 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.
--->
-
-- Add-on with the issue:
-- Add-on release with the issue: 
-- Last working add-on release (if known): 
-- Operating environment (OS/Supervised): 
-
-## Problem-relevant configuration
-<!--
-  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.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..62f37277f5f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,122 @@
+name: Bug Report Form
+description: Report an issue related to one of the official add-ons.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This issue form is for reporting bugs with **supported** setups only!
+
+        If you have a feature or enhancement request, please use the [feature request][fr] section of our [Community Forum][fr].
+
+        [fr]: https://community.home-assistant.io/c/feature-requests
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the issue you are experiencing
+      description: Provide a clear and concise description of what the bug is.
+
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
+
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: What type of installation are you running?
+      description: >
+        If you don't know, you can find it in: [Configuration panel -> Info](https://my.home-assistant.io/redirect/info/).
+      options:
+        - Home Assistant OS
+        - Home Assistant Supervised
+
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Which operating system are you running on?
+      options:
+        - Home Assistant Operating System
+        - Debian
+        - Other (e.g., Raspbian/Raspberry Pi OS/Fedora)
+
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Which add-on are you reporting an issue with?
+      options:
+        - Hey Ada!
+        - Almond
+        - CEC Scanner
+        - Check Home Assistant configuration
+        - File editor
+        - deCONZ
+        - DHCP Server
+        - Dnsmasq
+        - Duck DNS
+        - Git pull
+        - Google Assistant SDK
+        - HomeMatic CCU
+        - Let's Encrypt
+        - MariaDB
+        - Mosquitto broker
+        - NGINX Home Assistant SSL proxy
+        - RPC Shutdown
+        - Samba share
+        - Terminal & SSH
+        - TellStick
+        - VLC
+        - OpenZWave
+        - Z-Wave JS
+
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: What is the version of the add-on?
+      description: Can be found in the Supervisor panel -> Overview tab -> the add-on
+
+  - type: markdown
+    attributes:
+      value: |
+        # Details
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce the issue
+      description: |
+        Please tell us exactly how to reproduce your issue.
+        Provide clear and concise step by step instructions and add code snippets if needed.
+      value: |
+        1.
+        2.
+        3.
+        ...
+
+  - type: textarea
+    attributes:
+      label: Anything in the Supervisor logs that might be useful for us?
+      description: >
+        The Supervisor logs can be found in the [Supervisor panel -> System tab](https://my.home-assistant.io/redirect/supervisor_info/).
+      render: txt
+
+  - type: textarea
+    attributes:
+      label: Anything in the add-on logs that might be useful for us?
+      description: >
+        The add-on logs can be found in the Supervisor panel on the add-on page -> Logs tab.
+      render: txt
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: >
+        If you have any additional information for us, use the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.