diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index b9b6478a..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-name: Bug Report 错误报告
-about: Create a bug report 创建一个错误报告
-title: "[BUG] Some problem..."
-labels: bug
-
----
-
-### Describe the bug 描述你遇到的错误
-
-A clear and concise description of what the bug is.
-一段简短的对于你遇到的错误的描述.
-
-### Expected behavior 期待的行为
-
-A clear and concise description of what you expected to happen.
-一段简短的对于你期待的行为的描述.
-
-### Screenshots 屏幕截图
-
-If applicable, add screenshots to help explain your problem.
-如果可以的话, 提供屏幕截图对解决问题很有帮助.
-
-### Build Environment 构建环境
-
-- OS: [e.g. Windows 10, macOS, Ubuntu]
-- Theme version/commit [e.g. 0.2.0, 2ccba79]
-- Hugo version [e.g. 0.69.0]
-
-Please try to use Hugo **extended** version before opening the issue.
-请在创建 issue 之前尝试使用 Hugo **extended** 版本.
-
-### Preview Environment 预览环境
-
-- OS: [e.g. Windows 10, macOS, Ubuntu, iOS, Android]
-- Browser [e.g. Chrome, Safari, Firefox]
-
-### Additional Information 补充信息
-
-Configuration files or front matter code...
-配置文件或者前置参数的代码...
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..426d819a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,51 @@
+name: "Bug Report 错误报告"
+description: "Create a bug report 创建一个错误报告"
+title: "[BUG] Some problem ..."
+labels: ["bug"]
+body:
+  - type: textarea
+    id: describe
+    attributes:
+      label: Describe the bug 描述你遇到的错误
+      description: |
+        A clear and concise description of what the bug is.
+        一段简短的对于你遇到的错误的描述。
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior 期待的行为
+      description: |
+        A clear and concise description of what you expected to happen.
+        一段简短的对于你期待的行为的描述。
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots 屏幕截图
+      description: |
+       If applicable, add screenshots to help explain your problem.
+       如果可以的话，提供屏幕截图对解决问题很有帮助。
+  - type: textarea
+    id: environment
+    attributes:
+      label: Build Environment 构建环境
+      description: |
+        Please try to use Hugo **extended** version before opening the issue.
+        请在创建 issue 之前尝试使用 Hugo **extended** 版本。
+      placeholder: |
+        - OS: [e.g. Windows 10, macOS, Ubuntu]
+        - Theme version/commit [e.g. 0.2.0, 2ccba79]
+        - Hugo version [e.g. 0.69.0]
+  - type: textarea
+    id: preview
+    attributes:
+      label: Preview Environment 预览环境
+      placeholder: |
+        - OS: [e.g. Windows 10, macOS, Ubuntu, iOS, Android]
+        - Browser [e.g. Chrome, Safari, Firefox]
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Information 补充信息
+      description: |
+        Configuration files or front matter code ...
+        配置文件或者前置参数的代码 ...
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index b6e4c7d5..00000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Feature request 功能请求
-about: Suggest an idea for this project 为这个项目提供一个建议
-title: "[FEATURE] Some feature"
-labels: enhancement
-
----
-
-### Describe the feature you want 描述你的功能需求
-
-- Feature 1 功能需求 1
-  I want this feature to solve ...
-  我希望这个功能解决 ...
-- Feature 2 功能需求 2
-  I want this feature to solve ...
-  我希望这个功能解决 ...
-- ...
-
-### Useful reference 有价值的参考
-
-If available, provide useful links to fulfill the feature.
-如果可以的话, 提供实现这个功能的相关参考链接.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..28fcfb15
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,22 @@
+name: "Feature request 功能请求"
+description: "Suggest an idea for this project 为这个项目提供一个建议"
+title: "[FEATURE] Some feature"
+labels: ["enhancement"]
+body:
+    - type: textarea
+      id: describe
+      attributes:
+        label: Describe the feature you want 描述你的功能需求
+        description: |
+            Please submit new issues for different features.
+            请针对不同的功能建议提交新的 issue。
+        placeholder: |
+          I recommend adding this feature ...
+          我希望添加这样的一个功能 ...
+    - type: textarea
+      id: reference
+      attributes:
+        label: Useful reference 有价值的参考
+        description: |
+          If available, provide useful links to fulfill the feature. 
+          如果可以的话，提供实现这个功能的相关参考链接。