diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 482e6b2c..00000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: bug report
-about: Create a report to help us improve
-
----
-
-<!--
-First read the FAQ: https://flameshot.org/guide/faq/
-
-If you don't know how to get some of the following information from your
-computer, visit:
-https://flameshot.org/guide/issue-reporting/
-
-**Note** that if you don't provide the requested information, the bugreport most
-probably will considered as invalid and will be closed unless you provide
-justification on why you cannot provide the requested information.
--->
-
-**Flameshot version**
-<!-- Version or commit. -->
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. Add screenshots if it
-helps explaining the issue. -->
-
-**To Reproduce**
-<!-- Steps to reproduce the behaviour. -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**System Information**
-<!-- e.g. Ubuntu 16.14 Mate. -->
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
deleted file mode 100644
index ab8e7c58..00000000
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: feature request
-about: Suggest an idea for this project
-
----
-
-**Is your feature request related to a problem?**
-<!--
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-Please make sure:
-- a single feature per issue
-- explain in detail what you have in mind
-- if it helps, add sketches/pictures
--->
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
new file mode 100644
index 00000000..0198b884
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,87 @@
+name: Bug Report
+description: Found something you weren't expecting?  Report it here!
+labels: ["Unconfirmed Bug"]
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to fill out this bug report.
+      NOTE: Please read the instructions below before filling the form.
+- type: markdown
+  attributes:
+    value: |
+      1. Please write in English, this is the language all maintainers can speak and write.
+      2. Please take a moment to check that your issue doesn't already exist and not already reported.
+      3. Please make sure the solution to your problem is not already mentioned in the FAQ (https://flameshot.org/guide/faq/)
+      4. Please provide the information for each field as complete as possible.
+- type: textarea
+  id: flameshot-ver
+  attributes:
+    label: Flameshot Version
+    description: The Flameshot version (or commit reference) your are running. You can right-click on the tray icon > About > copy
+    placeholder: e.g Flameshot v0.10.1 (065aa98c)
+  validations:
+    required: true
+- type: dropdown
+  id: installation-type
+  attributes:
+    label: Installation Type
+    description: How have you installed flameshot?
+    multiple: true
+    options:
+      - Linux, MacOS, or Windows Package manager (apt, pacman, eopkg, choco, brew, ...)
+      - User repository (AUR)
+      - Flatpak from Flathub
+      - Flatpak from Github
+      - Snap from Snapcraft
+      - Snap from
+      - AppImage
+      - Using the ready-made package from Github Releases
+      - Compiled from source
+  validations:
+    required: true
+- type: input
+  id: os-ver
+  attributes:
+    label: Operating System type and version
+    description: "The operating system you are using Flameshot on:"
+  validations:
+    required: true
+- type: textarea
+  id: description
+  attributes:
+    label: Description
+    description: |
+      Please provide a description of your issue here. Please explain in details what the issue is. If you can, provide screenshots or screen recordings to demonstrate the issue.
+  validations:
+      required: true
+- type: textarea
+  id: steps-to-reproduce
+  attributes:
+    label: Steps to reproduce
+    description: Please write the steps we should take to reproduce this buggy behaviour
+    placeholder: |
+      1. run `flameshot gui`
+      2. select a region on the primary monitor
+      3. save to file
+      4. ...
+  validations:
+      required: false
+- type: textarea
+  id: screenshots
+  attributes:
+    label: Screenshots or screen recordings
+    description: If you think it would be beneficial for us to understand the issue, please provide a screenshots or screen recordig. For screen recording you can use [Peek](https://github.com/phw/peek)
+- type: textarea
+  id: systeminfo
+  attributes:
+    label: System Information
+    description: |
+      Please provide the detailed information about your computer including:
+        1. Operating system and version
+        2. Your monitor configuration (easiest way would be to add a screenshot of your monitor setup from settings window)
+        3. If using Linux (https://flameshot.org/guide/issue-reporting/):
+          - Your Desktop Environment and your Window Manager
+          - if you are using Xorg or Wayland
+  validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
new file mode 100644
index 00000000..3670436b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -0,0 +1,20 @@
+name: Feature Request
+description: Got an idea for a feature that can make Flameshot even better? Propose your suggestion here!
+labels: ["Enhancement"]
+body:
+- type: markdown
+  attributes:
+    value: |
+      1. Please write in English, this is the language all maintainers can speak and write.
+      2. Please only use this form to submit feature request and **not** bugs or questions.
+      3. Please take a moment to check that your feature hasn't already been suggested.
+      4. One picture worth a thousand words. If you think you can convey the message better by a drawing or pictrure, consider adding one.
+- type: textarea
+  id: description
+  attributes:
+    label: Feature Description
+    placeholder: |
+      I think it would be great if ...
+  validations:
+    required: true
+