diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 54%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index a568a4dc8..5601c5d74 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,16 @@
-[Issue text goes here].
+---
+name: Bug report
+about: Create a report about the bug
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+< Issue text goes here. >
 
 * * * *
-- Tusky Version:
+- Yuito Version:
 - Android Version:
 - Android Device:
 - Mastodon instance (if applicable):
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..db77d79a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+< Issue text goes here. >
+
+* * * *
+- [ ] I searched or browsed the repo’s other issues to ensure this is not a duplicate.