diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index ba479834f..000000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-Thanks for your contribution.
-
-When you report a bug or suggest a new feature, please include these information.
-* Your browser
-* Desktop version or mobile version
-
---------
-
-Misskeyへの貢献ありがとうございます。
-
-バグの報告や提案などで、可能であれば以下の情報を含めてください。
-* お使いのブラウザ
-* デスクトップ版Misskeyかモバイル版Misskeyか
-
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..47ca8b7a6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+---
+
+# Summary
+<!-- Tell us what the bug is -->
+
+# Expected Behavior
+<!--- Tell us what should happen -->
+
+# Actual Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+# Steps to Reproduce
+1.
+2.
+3.
+
+# Environment
+<!-- Tell us where on the platform it happens -->
+<!-- e.g. desktop or mobile version, your browser, operating system -->
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..869232fce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+---
+
+# Summary
+<!-- Tell us what the suggestion is -->
+
+# Environment
+<!-- Tell us where on the platform it related -->
+<!-- e.g. desktop or mobile version, your browser, operating system -->