diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..fe1acf3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: "[BUG]"
+labels: bug
 assignees: ''
 
 ---
@@ -24,15 +24,18 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+ - Device: [e.g. PC]
+ - OS: [e.g. Windows]
+ - OS Version (if applicable) [e.g. 11]
+ - Bombsquad Version [e.g. 1.7.37]
+ - Plugin Manager Version [e.g. 1.1.10]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+ - Device: [e.g. Mobile]
+ - OS: [e.g. Android]
+ - OS Version (if applicable) [e.g. 11]
+ - Bombsquad Version [e.g. 1.7.37]
+ - Plugin Manager Version [e.g. 1.1.10]
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/plugin-bug-report.md b/.github/ISSUE_TEMPLATE/plugin-bug-report.md
index 7d77cb7..40c76c0 100644
--- a/.github/ISSUE_TEMPLATE/plugin-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/plugin-bug-report.md
@@ -1,7 +1,7 @@
 ---
 name: Plugin bug report
 about: Create a report about a plugin to help us improve
-title: ''
+title: '[PLUGIN BUG]'
 labels: Plugin Bug
 assignees: ''
 
@@ -27,14 +27,20 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - Bombsquad Version [e.g. 1.7.37]
- - Plugin Manager Version [e.g. 1.1.10]
- - Plugin Version (if applicable) [e.g. 2.1.0]
-
-**Smartphone (please complete the following information):**
  - Device: [e.g. PC]
  - OS: [e.g. Windows]
  - OS Version (if applicable) [e.g. 11]
+ - Bombsquad Version [e.g. 1.7.37]
+ - Plugin Manager Version [e.g. 1.1.10]
+ - Plugin Version [e.g 2.0.1]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. Mobile]
+ - OS: [e.g. Android]
+ - OS Version (if applicable) [e.g. 11]
+ - Bombsquad Version [e.g. 1.7.37]
+ - Plugin Manager Version [e.g. 1.1.10]
+ - Plugin Version [e.g 2.0.1]
 
 **Additional context**
 Add any other context about the problem here.