diff --git a/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md b/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md
index c2d0884..a3a6280 100644
--- a/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: Bug Report - Frontend
 about: Report something that is broken or not working correctly
 title: "[BUG - Frontend] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md b/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md
index c050a9c..4414bec 100644
--- a/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: Bug Report - Mobile
 about: Report something that is broken or not working correctly
 title: "[BUG - Mobile] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report_server.md b/.gitea/ISSUE_TEMPLATE/bug_report_server.md
index 83c2aa9..095af22 100644
--- a/.gitea/ISSUE_TEMPLATE/bug_report_server.md
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_server.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: Bug Report - Server
 about: Report something that is broken or not working correctly
 title: "[BUG - Server] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md b/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md
index f0555b0..7f937fd 100644
--- a/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md
@@ -1,5 +1,5 @@
 ---
-name: Enhancement
+name: Enhancement - Frontend
 about: Improve or refine an existing feature
 title: "[ENHANCEMENT - Frontend] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md b/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md
index ad73e1d..a560734 100644
--- a/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md
@@ -1,5 +1,5 @@
 ---
-name: Enhancement
+name: Enhancement - Mobile
 about: Improve or refine an existing feature
 title: "[ENHANCEMENT - Mobile] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement_server.md b/.gitea/ISSUE_TEMPLATE/enhancement_server.md
index 9137aff..6f5e6a8 100644
--- a/.gitea/ISSUE_TEMPLATE/enhancement_server.md
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_server.md
@@ -1,5 +1,5 @@
 ---
-name: Enhancement
+name: Enhancement - Server
 about: Improve or refine an existing feature
 title: "[ENHANCEMENT - Server] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md b/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md
index fa60637..3fc3da6 100644
--- a/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request
+name: Feature Request - Frontend
 about: Suggest a brand new feature or module
 title: "[FEATURE - Frontend] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md b/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md
index c0f4196..f0b1290 100644
--- a/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request
+name: Feature Request - Mobile
 about: Suggest a brand new feature or module
 title: "[FEATURE - Mobile] "
 ref: "main"
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request_server.md b/.gitea/ISSUE_TEMPLATE/feature_request_server.md
index 9613e45..e86eede 100644
--- a/.gitea/ISSUE_TEMPLATE/feature_request_server.md
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_server.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request
+name: Feature Request - Server
 about: Suggest a brand new feature or module
 title: "[FEATURE - Server] "
 ref: "main"