diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 7a457276e..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report	
-about: Help us to improve this project
-
----
-**Please check the FAQ documentation before raising an issue**
-
-Please check the old issues before raising an issue in case someone has asked the same question that you are asking.
-
-**Describe the bug (__must be provided__)**
-
-A clear and concise description of what the bug is.
-
-**Your Environments (__must be provided__)**
-
-* OS: `uname -a`
-* Compliler: `g++ --version` or `clang++ --version`
-* CPU: `lscpu`
-* Commit id (e.g. `a3ffc7d8`)
-
-**How To Reproduce(__must be provided__)**
-
-Steps to reproduce the behavior:
-
-1. Step 1
-2. Step 2
-3. Step 3
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**Additional context**
-
-Provide logs and configs, or any other context to trace the problem.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..befeb0245
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,48 @@
+name: Bug report
+description: bug report for OceanBase
+title: "[Bug]: "
+labels: [bug]
+assignees:
+  - caifeizhi
+body:
+  - type: checkboxes
+    attributes:
+      label: Please check the issue list for the same bug 
+      options:
+        - label: I have checked issue list and this bug is encountered for the first time.
+          required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Environment Details sometimes important 
+      value: |
+        - OB Version&commit_id or other module version&commit_id (e.g. observer V3.1.2 8b23a93):
+        - Hardware parameter:OS type & Compliler & CPU etc. 
+        - Others
+      render: markdown
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Fast Reproduce Steps(Required)
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: What is the result? picture is allowed
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: what you expected.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: other information
+      description: Error Log or Core stack or Others
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 000000000..5365e6f1f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,19 @@
+name: question
+description: concise description of the problem.
+title: "[Question]: "
+labels: [question]
+assignees:
+  - caifeizhi
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Make sure you have:
+        * Searched [GitHub issue](https://github.com/oceanbase/oceanbase/issues)
+        * Searched [documentation](https://open.oceanbase.com)
+  - type: textarea
+    attributes:
+      label: Describe your question
+      description: better to provide some pictures.
+    validations:
+      required: true