diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
similarity index 98%
rename from .github/ISSUE_TEMPLATE/Bug_report.md
rename to .github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 1f0484019..9adcd2a07 100755
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: Bug report
 description: Create a report to help us improve nRF Mesh.
 labels: ["bug"]
 body:
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/REATURE_REQUEST.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Feature_request.md
rename to .github/ISSUE_TEMPLATE/REATURE_REQUEST.yml