diff --git a/.github/ISSUE_TEMPLATE/⭐-feature-request.md b/.github/ISSUE_TEMPLATE/⭐-feature-request.md
deleted file mode 100644
index 8a1f3c80..00000000
--- a/.github/ISSUE_TEMPLATE/⭐-feature-request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: "⭐ Feature request"
-about: Suggest an idea for this project
-title: "[REQUEST]"
-labels: ''
-assignees: ''
-
----
-
-**The problem you currently have with this project**
-A clear and concise description of what the problem is.
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/⭐-feature-request.yml b/.github/ISSUE_TEMPLATE/⭐-feature-request.yml
new file mode 100644
index 00000000..6df8b533
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/⭐-feature-request.yml
@@ -0,0 +1,10 @@
+title: "[Feature] <feature-name-goes-here>"
+labels: ["feature-requests"]
+
+body:
+    - type: textarea
+      id: feature
+      attributes:
+          label: The feature
+      validations:
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/🕷️-bug-report.md b/.github/ISSUE_TEMPLATE/🕷️-bug-report.md
deleted file mode 100644
index 7194390f..00000000
--- a/.github/ISSUE_TEMPLATE/🕷️-bug-report.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-name: "\U0001F577️ Bug report"
-about: Create a report to help the project improve
-title: "[BUG]"
-labels: ""
-assignees: ""
----
-
-**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.
-
-**UpSnap version**
-
-```bash
-$ upsnap --version
-upsnap version 4.1.1
-```
-
-**Logs**
-
-```
-formatted logs here
-```
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Host OS (and version)**
-eg. Windows 10, Ubuntu 22.10, macOS 13
-
-**Host Architecture**
-e.g. amd64/arm64/arm7
-
-**Brower (if relevant)**
-e.g. Firefox 109.0.1
-
-**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..1e7443f9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/🕷️-bug-report.yml
@@ -0,0 +1,70 @@
+name: 🕷️ Bug report
+description: Create a bug report to help the project improve
+labels: ["bug"]
+title: "[BUG] <title>"
+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] section of our [GitHub Discussions][fr].
+
+              [fr]: https://github.com/seriousm4x/UpSnap/discussions/new?category=feature-request
+
+    - type: textarea
+      validations:
+          required: true
+      attributes:
+          label: The bug
+          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: true
+      attributes:
+          label: The OS that UpSnap is running on
+          placeholder: Ubuntu 22.10, Debian, Arch...
+
+    - type: input
+      id: version
+      validations:
+          required: true
+      attributes:
+          label: Version of UpSnap
+          placeholder: 4.2.0
+
+    - type: textarea
+      validations:
+          required: true
+      attributes:
+          label: Your docker-compose.yml content
+          render: YAML
+
+    - type: textarea
+      id: repro
+      attributes:
+          label: Reproduction steps
+          description: "How do you trigger this bug? Please walk us through it step by step."
+          value: |
+              1.
+              2.
+              3.
+              ...
+          render: bash
+      validations:
+          required: true
+
+    - type: textarea
+      attributes:
+          label: Additional information
+          description: >
+              If you have any additional information for us, use the field below.