diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ced089b5..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Report something that is not working
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Thunderbird version and OS**
-Report the Thunderbird version and Operating System you're using.
-
-**ThunderAI version**
-Report the add-on version you're using.
-
-**AI Integration**
-- [ ] ChatGPT Web Interface
-- [ ] OpenAI ChatGPT API
-- [ ] Ollama API
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..66878542
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,75 @@
+name: Bug Report
+description: Create a report to help ThunderAI improve.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This issue form is for reporting bugs only!
+
+        If you have a feature or enhancement request, please use the [feature request][fr] form.
+
+        [fr]: https://github.com/micz/ThunderAI/issues/new?assignees=&labels=&projects=&template=feature_request.md&title=
+  - type: textarea
+    validations:
+      required: true
+    id: problem
+    attributes:
+      label: The problem
+      description: >-
+        Describe the issue you are experiencing here. Tell us what you were trying to do and what happened.
+
+        Provide a clear and concise description of what the problem is.
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
+  - type: input
+    validations:
+      required: false
+    attributes:
+      label: Which Operative System are you using?
+      description: >
+        Like Windows 10 or MacOSX.
+  - type: input
+    validations:
+      required: false
+    attributes:
+      label: Which version of Thunderbird has the issue?
+      description: >
+        Thunderbird version like 115.14.0 or 128.1.
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: Which version of ThunderAI has the issue?
+      description: >
+        ThunderAI version like 2.1.0.
+  - type: dropdown
+    validations:
+      required: true
+    id: integration
+    attributes:
+      label: Which integration are you using?
+      options:
+        - ChatGPT Web Interface
+        - OpenAI ChatGPT API
+        - Ollama API
+  - type: markdown
+    attributes:
+      value: |
+        # Details
+  - type: textarea
+    id: logs
+    attributes:
+      label: Anything in the Thunderbird console logs that might be useful?
+      description: For example, error message, or stack traces.
+      render: txt
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional information
+      description: >
+        If you have any additional information, use the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.