diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/-bug--bug-report.md
similarity index 93%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/-bug--bug-report.md
index 71e23aa2..e5f00799 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/-bug--bug-report.md
@@ -1,7 +1,7 @@
 ---
-name: Bug report
+name: "[BUG] Bug report"
 about: Create a report to help us improve
-title: "Bug: "
+title: "[BUG] : "
 labels: bug
 assignees: Zagrios
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/-feat---feature-request.md
similarity index 91%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/-feat---feature-request.md
index 02d0077a..11b2a633 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/-feat---feature-request.md
@@ -1,7 +1,7 @@
 ---
-name: Feature request
+name: "[FEAT.] Feature request"
 about: Suggest an idea for this project
-title: "Feature: "
+title: "[FEAT.] : "
 labels: enhancement
 assignees: Zagrios