diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 87fc6a5f5..d3036ba24 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,7 +1,14 @@
 name: Bug Report
-description: Create a bug report to help us improve
+description: Thanks for taking the time to fill out this bug report! Please fill the form in **English**
 title: "[Bug] "
 body:
+ - type: checkboxes
+   attributes:
+     label: Is there an existing issue for this?
+     description: Please search to see if an issue related to this already exists.
+     options:
+     - label: I have searched the existing issues
+       required: true
   - type: textarea
     id: desc
     attributes:
@@ -23,18 +30,13 @@ body:
       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.
+      label: Operating System(s) and RustDesk Version(s) on local side and remote side
+      description: What Operatiing System(s) and version(s) of RustDesk do you see this bug on? local side / remote side.
+      placeholder: |
+        Windows 10, 1.1.9 / osx 13.1, 1.1.8
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/task.yaml b/.github/ISSUE_TEMPLATE/task.yaml
new file mode 100644
index 000000000..a1ff080c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yaml
@@ -0,0 +1,20 @@
+name: 📝 Task
+description: Create a task for the team to work on
+title: "[Task]: "
+labels: [Task]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue related to this already exists.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: textarea
+  attributes:
+    label: SubTasks 
+    placeholder: |
+      - Sub Task 1
+      - Sub Task 2
+  validations:
+    required: false