diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..3ba13e0c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/decompilation-error.md b/.github/ISSUE_TEMPLATE/decompilation-error.md
deleted file mode 100644
index ad5b3a39..00000000
--- a/.github/ISSUE_TEMPLATE/decompilation-error.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Decompilation error
-about: Create a report to help us improve jadx decompiler
-title: "[core]"
-labels: Core, bug
-assignees: ''
-
----
-
-**Checks before report**
-- check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
-- search existing issues by exception message
-
-**Describe error**
-- full name of method or class with error
-- full java stacktrace (no need to copy method fallback code (commented pseudocode))
-- **IMPORTANT!** attach or provide link to apk file (double check apk version)
-
-  **Note**: GitHub don't allow attach files with `.apk` extension, but you can change extension by adding `.zip` at the end :)
diff --git a/.github/ISSUE_TEMPLATE/decompilation-issue.yml b/.github/ISSUE_TEMPLATE/decompilation-issue.yml
new file mode 100644
index 00000000..9fcc9955
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/decompilation-issue.yml
@@ -0,0 +1,40 @@
+name: Decompilation issue
+description: Create a report to help us improve jadx decompiler
+title: '[core] '
+labels:
+  - Core
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Checks before submit**
+        - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
+        - try [latest unstable build](https://nightly.link/skylot/jadx/workflows/build-artifacts/master), maybe issue already fixed
+        - search existing issues by exception message
+  - type: textarea
+    id: details
+    attributes:
+      label: Issue details
+      placeholder: >-
+        Describe issue
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output or stacktrace
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: java
+  - type: textarea
+    id: sample
+    attributes:
+      label: Provide sample and class/method full name
+      description: |
+        - sample: attach or provide a link
+        - full name of class or method with issue
+        - other details which may help to reproduce issue
+  - type: input
+    id: jadx-version
+    attributes:
+      label: Jadx version
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 7c8d3f00..00000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for jadx
-title: "[feature]"
-labels: new feature
-assignees: ''
-
----
-
-*Describe your idea:*
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..afd8155c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,13 @@
+name: Feature Request
+description: Suggest an idea for jadx
+title: '[feature] '
+labels:
+  - 'new feature'
+body:
+  - type: textarea
+    id: details
+    attributes:
+      label: Describe your idea
+      placeholder: Feature details
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/jadx-gui-issue.yml b/.github/ISSUE_TEMPLATE/jadx-gui-issue.yml
new file mode 100644
index 00000000..aa3a08cd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/jadx-gui-issue.yml
@@ -0,0 +1,43 @@
+name: jadx-gui issue
+description: Create a bug report about issue found in jadx-gui
+title: '[gui] '
+labels:
+  - GUI
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Checks before submit**
+        - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
+        - try [latest unstable build](https://nightly.link/skylot/jadx/workflows/build-artifacts/master), maybe issue already fixed
+        - search existing issues by exception message
+  - type: textarea
+    id: details
+    attributes:
+      label: Issue details
+      placeholder: Describe issue and how to reproduce it
+    validations:
+      required: true
+  - type: input
+    id: jadx-version
+    attributes:
+      label: Jadx version
+      placeholder: check `Help->About`
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java version
+      placeholder: check `Help->About`
+    validations:
+      required: true
+  - type: checkboxes
+    id: os
+    attributes:
+      label: OS
+      options:
+        - label: Windows
+        - label: Linux
+        - label: macOS