diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 5ba29c8b6..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug Report
-about: Report a bug (English only, Please).
-title: ""
-labels: bug
-assignees: ''
-
----
-
-<!-- Hey there, thank you for creating an issue! -->
-
-**Describe the bug you encountered:**
-
-...
-
-**What did you expect to happen instead?**
-
-...
-
-
-**How did you install `RustDesk`?**
-
-<!-- GitHub release, build from source, Windows portable version, etc. -->
-
----
-
-**RustDesk version and environment**
-
-<!--
-In order to reproduce your issue, please add some information about the environment
-in which you're running RustDesk.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..87fc6a5f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,49 @@
+name: Bug Report
+description: Create a bug report to help us improve
+title: "[Bug] "
+body:
+  - type: textarea
+    id: desc
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: How to Reproduce
+      description: What steps can we take to reproduce this behavior?
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      description: What OS are you seeing this bug on? local side / remote side.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: RustDesk Version(s)
+      description: What version(s) of RustDesk do you see this bug on? local side / remote side.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, please add screenshots to help explain your problem
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Add any additonal context about the problem here
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 01de3b330..7b43e397b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,3 @@
-blank_issues_enabled: true
 contact_links:
   - name: Ask a question
     url: https://github.com/rustdesk/rustdesk/discussions/category_choices
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 0d21f017d..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project ((English only, Please).
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..01f6c6aca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,25 @@
+name: Feature Request
+description: Suggest an idea for RustDesk
+title: "[FR] "
+body:
+  - type: textarea
+    id: desc
+    attributes:
+      label: Description
+      description: Describe your suggested feature and the main use cases
+    validations:
+      required: true
+      
+  - type: textarea
+    id: users
+    attributes:
+      label: Impact
+      description: What types of users can benefit from using the suggested feature?
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Add any additonal context about the feature here