diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index fe00c980e..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve MUSCLE
-title: ''
-labels: ''
-assignees: ''
-labels: [
-  "bug"
-]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: "Description"
-      description: Please enter an explicit description of your issue
-      placeholder: Short and explicit description of your incident...
-    validations:
-      required: true
-  - type: input
-    id: reprod-url
-    attributes:
-      label: "Reproduction URL"
-      description: Please enter your the URL to provide a reproduction of the issue
-      placeholder: ex. http://acc.amsterdammusiclab.nl/tunetwins
-    validations:
-      required: false
-  - type: textarea
-    id: reprod
-    attributes:
-      label: "Reproduction steps"
-      description: Please enter an explicit description of your issue
-      value: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-      render: bash
-    validations:
-      required: true
-  - type: textarea
-    id: screenshot
-    attributes:
-      label: "Screenshots"
-      description: If applicable, add screenshots to help explain your problem.
-      value: |
-        ![DESCRIPTION](LINK.png)
-      render: bash
-    validations:
-      required: false
-  - type: textarea
-    id: logs
-    attributes:
-      label: "Logs"
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: bash
-    validations:
-      required: false
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: "Browsers"
-      description: What browsers are you seeing the problem on ?
-      multiple: true
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Opera
-    validations:
-      required: false
-  - type: dropdown
-    id: os
-    attributes:
-      label: "OS"
-      description: What is the impacted environment ?
-      multiple: true
-      options:
-        - Windows
-        - Linux
-        - Mac
-    validations:
-      required: false
-  type: textarea
-    id: context
-    attributes:
-      label: "Additional context"
-      description: Add any other context about the problem here.
-      placeholder: 
-    validations:
-      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..8b787700c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,89 @@
+name: "🐛 Bug Report"
+title: "🐛 [BUG] - <title>"
+description: "Create a report to help us improve MUSCLE"
+assignees: []
+labels: [
+  "bug"
+]
+body:
+- type: textarea
+  id: description
+  attributes:
+    label: "Description"
+    description: Please enter an explicit description of your issue
+    placeholder: | 
+      Short and explicit description of your incident... 
+
+      ## Screenshots:
+      Please also post any screenshots of the bug you encountered
+    value: |
+      <!-- Short and explicit description of your incident... -->
+
+      ### Screenshots
+      <!-- You can upload screenshots of the issue (if any) here... -->
+      
+  validations:
+    required: true
+- type: input
+  id: reprod-url
+  attributes:
+    label: "Reproduction URL"
+    description: Please enter your the URL to provide a reproduction of the issue
+    placeholder: ex. http://acc.amsterdammusiclab.nl/tunetwins
+  validations:
+    required: false
+- type: textarea
+  id: reprod
+  attributes:
+    label: "Reproduction steps"
+    description: Please enter an explicit description of your issue
+    value: |
+      1. Go to '...'
+      2. Click on '....'
+      3. Scroll down to '....'
+      4. See error
+    render: bash
+  validations:
+    required: true
+- type: textarea
+  id: logs
+  attributes:
+    label: "Logs"
+    description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+    render: bash
+  validations:
+    required: false
+- type: dropdown
+  id: browsers
+  attributes:
+    label: "Browsers"
+    description: What browsers are you seeing the problem on?
+    multiple: true
+    options:
+      - Firefox
+      - Chrome
+      - Safari
+      - Microsoft Edge
+      - Opera
+  validations:
+    required: false
+- type: dropdown
+  id: os
+  attributes:
+    label: "OS"
+    description: What is the impacted environment ?
+    multiple: true
+    options:
+      - Windows
+      - Linux
+      - Mac
+  validations:
+    required: false
+- type: textarea
+  id: context
+  attributes:
+    label: "Additional context"
+    description: Add any other context about the problem here.
+    placeholder: 
+  validations:
+    required: false