diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
similarity index 92%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/1-bug_report.md
index cec3c8ba..3c3cce3a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a bug report to help us improve OpenAEV
-title: 'fix: '
+title: 'fix(scope): '
 labels: needs triage, bug
 assignees: ''
 type: bug
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md
similarity index 92%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/2-feature_request.md
index 293151c2..1e9ffbd3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/2-feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest a new feature or capability for OpenAEV
-title: 'feat: '
+title: 'feat(scope): '
 labels: needs triage, feature
 assignees: ''
 type: feature
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/3-documentation.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/documentation.yaml
rename to .github/ISSUE_TEMPLATE/3-documentation.yaml
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/4-question.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/question.md
rename to .github/ISSUE_TEMPLATE/4-question.md