diff --git a/.github/ISSUE_TEMPLATE/ask-a-question.md b/.github/ISSUE_TEMPLATE/ask-a-question.md
new file mode 100644
index 0000000..0ec7e63
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ask-a-question.md
@@ -0,0 +1,10 @@
+---
+name: Ask a question
+about: Ask a question about mpv.net
+title: ''
+labels: question
+assignees: stax76
+
+---
+
+This template is meant for usage questions of mpv.net.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/report-a-bug.md
similarity index 96%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/report-a-bug.md
index 7e9c15c..4d53fbb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/report-a-bug.md
@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: Report a bug
 about: Create a report to help us improve
 title: ''
 labels: bug
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/request-a-feature.md
similarity index 92%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/request-a-feature.md
index f44c438..e02b92c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/request-a-feature.md
@@ -1,8 +1,8 @@
 ---
-name: Feature request
+name: Request a feature
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
+labels: feature request
 assignees: stax76
 
 ---