diff --git a/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md b/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md
new file mode 100644
index 0000000..901fee1
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_frontend.md
@@ -0,0 +1,66 @@
+---
+name: Bug Report
+about: Report something that is broken or not working correctly
+title: "[BUG - Frontend] "
+ref: "main"
+labels:
+
+- bug
+
+---
+
+# Summary
+
+Briefly explain the issue.
+
+---
+
+# Steps To Reproduce
+
+1. Go to ...
+2. Click ...
+3. Scan ...
+4. Error occurs ...
+
+---
+
+# Expected Behavior
+
+What should have happened?
+
+---
+
+# Actual Behavior
+
+What actually happened instead?
+
+---
+
+# Severity
+
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Critical
+
+---
+
+# Environment
+
+Example:
+
+- Production
+- Development
+- Zebra Scanner
+- Mobile Device
+- Windows Server
+- Docker
+
+---
+
+# Logs / Screenshots
+
+Paste logs or upload screenshots here.
+
+```txt
+Paste logs here
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.md b/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md
similarity index 96%
rename from .gitea/ISSUE_TEMPLATE/bug_report.md
rename to .gitea/ISSUE_TEMPLATE/bug_report_mobile.md
index 27a8ca0..4beccb3 100644
--- a/.gitea/ISSUE_TEMPLATE/bug_report.md
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_mobile.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report
 about: Report something that is broken or not working correctly
-title: "[BUG] "
+title: "[BUG - Mobile] "
 ref: "main"
 labels:
 
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report_server.md b/.gitea/ISSUE_TEMPLATE/bug_report_server.md
new file mode 100644
index 0000000..898a702
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/bug_report_server.md
@@ -0,0 +1,66 @@
+---
+name: Bug Report
+about: Report something that is broken or not working correctly
+title: "[BUG - Server] "
+ref: "main"
+labels:
+
+- bug
+
+---
+
+# Summary
+
+Briefly explain the issue.
+
+---
+
+# Steps To Reproduce
+
+1. Go to ...
+2. Click ...
+3. Scan ...
+4. Error occurs ...
+
+---
+
+# Expected Behavior
+
+What should have happened?
+
+---
+
+# Actual Behavior
+
+What actually happened instead?
+
+---
+
+# Severity
+
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Critical
+
+---
+
+# Environment
+
+Example:
+
+- Production
+- Development
+- Zebra Scanner
+- Mobile Device
+- Windows Server
+- Docker
+
+---
+
+# Logs / Screenshots
+
+Paste logs or upload screenshots here.
+
+```txt
+Paste logs here
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md b/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md
new file mode 100644
index 0000000..03ddac9
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_frontend.md
@@ -0,0 +1,47 @@
+---
+name: Enhancement
+about: Improve or refine an existing feature
+title: "[ENHANCEMENT - Frontend] "
+ref: "main"
+labels: 
+
+- enhancement
+---
+
+# Existing Feature
+
+What current feature or workflow is being improved?
+
+Example:
+
+- Notifications
+- Scanner Login
+- Release Monitor
+- Printing
+- Auth
+
+---
+
+# Proposed Improvement
+
+Describe the improvement.
+
+---
+
+# Expected Benefit
+
+Why would this improvement help?
+
+---
+
+# Impact
+
+- [ ] Small
+- [ ] Medium
+- [ ] Large
+
+---
+
+# Additional Notes
+
+Anything else worth mentioning.
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement.md b/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md
similarity index 93%
rename from .gitea/ISSUE_TEMPLATE/enhancement.md
rename to .gitea/ISSUE_TEMPLATE/enhancement_mobile.md
index 65b2ca0..3d9e618 100644
--- a/.gitea/ISSUE_TEMPLATE/enhancement.md
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_mobile.md
@@ -1,7 +1,7 @@
 ---
 name: Enhancement
 about: Improve or refine an existing feature
-title: "[ENHANCEMENT] "
+title: "[ENHANCEMENT - Mobile] "
 ref: "main"
 labels: 
 
diff --git a/.gitea/ISSUE_TEMPLATE/enhancement_server.md b/.gitea/ISSUE_TEMPLATE/enhancement_server.md
new file mode 100644
index 0000000..d3fcdf7
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/enhancement_server.md
@@ -0,0 +1,47 @@
+---
+name: Enhancement
+about: Improve or refine an existing feature
+title: "[ENHANCEMENT - Server] "
+ref: "main"
+labels: 
+
+- enhancement
+---
+
+# Existing Feature
+
+What current feature or workflow is being improved?
+
+Example:
+
+- Notifications
+- Scanner Login
+- Release Monitor
+- Printing
+- Auth
+
+---
+
+# Proposed Improvement
+
+Describe the improvement.
+
+---
+
+# Expected Benefit
+
+Why would this improvement help?
+
+---
+
+# Impact
+
+- [ ] Small
+- [ ] Medium
+- [ ] Large
+
+---
+
+# Additional Notes
+
+Anything else worth mentioning.
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md b/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md
new file mode 100644
index 0000000..d7755f2
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_frontend.md
@@ -0,0 +1,40 @@
+---
+name: Feature Request
+about: Suggest a brand new feature or module
+title: "[FEATURE - Frontend] "
+ref: "main"
+labels: 
+
+- feature
+---
+
+# Problem Statement
+
+What problem are you trying to solve?
+
+---
+
+# Proposed Solution
+
+Describe the feature you would like added.
+
+---
+
+# Alternatives Considered
+
+Any other ideas, workarounds, or approaches?
+
+---
+
+# Priority
+
+- [ ] Nice to Have
+- [ ] Medium Priority
+- [ ] High Priority
+- [ ] Critical
+
+---
+
+# Additional Context
+
+Add mockups, screenshots, examples, or notes here.
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request.md b/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md
similarity index 94%
rename from .gitea/ISSUE_TEMPLATE/feature_request.md
rename to .gitea/ISSUE_TEMPLATE/feature_request_mobile.md
index c2d8e1d..6a9d020 100644
--- a/.gitea/ISSUE_TEMPLATE/feature_request.md
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_mobile.md
@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: Suggest a brand new feature or module
-title: "[FEATURE] "
+title: "[FEATURE - Mobile] "
 ref: "main"
 labels: 
 
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request_server.md b/.gitea/ISSUE_TEMPLATE/feature_request_server.md
new file mode 100644
index 0000000..3f37dbe
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/feature_request_server.md
@@ -0,0 +1,40 @@
+---
+name: Feature Request
+about: Suggest a brand new feature or module
+title: "[FEATURE - Server] "
+ref: "main"
+labels: 
+
+- feature
+---
+
+# Problem Statement
+
+What problem are you trying to solve?
+
+---
+
+# Proposed Solution
+
+Describe the feature you would like added.
+
+---
+
+# Alternatives Considered
+
+Any other ideas, workarounds, or approaches?
+
+---
+
+# Priority
+
+- [ ] Nice to Have
+- [ ] Medium Priority
+- [ ] High Priority
+- [ ] Critical
+
+---
+
+# Additional Context
+
+Add mockups, screenshots, examples, or notes here.
\ No newline at end of file