diff --git a/.github/ISSUE_TEMPLATE/task_issue_template.yaml b/.github/ISSUE_TEMPLATE/00-task-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/task_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/00-task-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/model_maker_issue_template.yaml b/.github/ISSUE_TEMPLATE/11-model-maker-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/model_maker_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/11-model-maker-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/studio_issue_template.yaml b/.github/ISSUE_TEMPLATE/12-studio-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/studio_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/12-studio-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/feature_request_issue_template.yaml b/.github/ISSUE_TEMPLATE/14-feature-request-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/14-feature-request-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/build.install_issue_template.yaml b/.github/ISSUE_TEMPLATE/15-build-install-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/build.install_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/15-build-install-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/bug_issue_template.yaml b/.github/ISSUE_TEMPLATE/16-bug-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/16-bug-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/Documentation_issue_template.yaml b/.github/ISSUE_TEMPLATE/17-documentation-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Documentation_issue_template.yaml
rename to .github/ISSUE_TEMPLATE/17-documentation-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/Solution(Legacy_issue_template).yaml b/.github/ISSUE_TEMPLATE/18-solution-legacy-issue-template.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Solution(Legacy_issue_template).yaml
rename to .github/ISSUE_TEMPLATE/18-solution-legacy-issue-template.yaml
diff --git a/.github/ISSUE_TEMPLATE/50-other-issues.md b/.github/ISSUE_TEMPLATE/19-other-issues.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/50-other-issues.md
rename to .github/ISSUE_TEMPLATE/19-other-issues.md