diff --git a/.github/ISSUE_TEMPLATE/bug_report_v2.md b/.github/ISSUE_TEMPLATE/bug_report_v2.md
deleted file mode 100644
index 13441cf562..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report_v2.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-name: Bug report for v2.0
-about: Create a report to help us improve our upcoming major upgrade 2.0
-title: ''
-labels: 'status: needs triaging, version: 2.0'
-
----
-
-<!--
-Thank you for submitting an issue!
-
-Please make sure your issue is understandable and reproducible.
-To make your issue readable make sure you use valid Markdown syntax: https://guides.github.com/features/mastering-markdown/
-
-Please ensure you have also read and understood our contribution guide: https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md
--->
-
-## Bug report
-
-### Describe the bug
-
-A clear and concise description of what the bug is.
-
-### System information
-
-Medusa version (including plugins):
-Node.js version:
-Database:
-Operating system:
-Browser (if relevant):
-
-### 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
-
-### Code snippets
-
-If applicable, add code samples to help explain your problem
-
-### Additional context
-
-Add any other context about the problem here
diff --git a/.github/ISSUE_TEMPLATE/bug_report_v2.yml b/.github/ISSUE_TEMPLATE/bug_report_v2.yml
new file mode 100644
index 0000000000..d586cc7e3b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report_v2.yml
@@ -0,0 +1,77 @@
+name: Bug report for v2.0
+description: File a bug report.
+title: "[Bug]: "
+labels: ["status: needs triaging", "version: 2.0"]
+body:
+  - type: markdown
+    attributes:
+      value: "## System information"
+  - type: markdown
+    attributes:
+      value: |
+        The system information will help us reproduce the issue in the same environment
+  - type: textarea
+    attributes:
+      label: Package.json file
+      description: Copy/paste the contents of the `package.json` file. No need to use backticks
+      placeholder: No need to use markdown backticks. Just copy/paste the contents of the file
+      render: JSON
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Node.js version
+      description: Copy/paste the output of `node -v` command.
+      placeholder: v21.0.0
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Database and its version
+      placeholder: PostgreSQL 16.2
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system name and version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser name
+  - type: markdown
+    attributes:
+      value: "## Describe the issue"
+  - type: markdown
+    attributes:
+      value: |
+        Please explain your issue in-depth along with the relevant screenshots and code snippets
+  - type: textarea
+    attributes:
+      label: What happended?
+      placeholder: A clear and concise description of what the bug is
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behavior
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: "## Reproduction"
+  - type: markdown
+    attributes:
+      value: |
+        Providing a reproduction repo allows us to quickly validate the issue and get back to you.
+  - type: input
+    attributes:
+      label: Link to reproduction repo
+      description: Please reproduce the issue in isolation and share it as a Github repo with us
+    validations:
+      required: true