diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/burp_bug_report.md
similarity index 67%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/burp_bug_report.md
index 1d92911..ef25984 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/burp_bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a bug report to help us improve BChecks
+about: Create a bug report to help us improve BChecks within Burp Suite
 title: "[BUG]"
 labels: bug
 assignees: ''
@@ -15,15 +15,11 @@ assignees: ''
 
 
 
-### Motivation for change
-
-
-
 ### Environment details
 
   - Burp version:
   - BCheck language version:
-  - Operating System:
+  - Operating system:
 
 
 ### Additional details
diff --git a/.github/ISSUE_TEMPLATE/template_bug_report.md b/.github/ISSUE_TEMPLATE/template_bug_report.md
new file mode 100644
index 0000000..e45aff1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/template_bug_report.md
@@ -0,0 +1,29 @@
+---
+name: BCheck template bug
+about: Create a bug report to report an issue with a specific BCheck
+title: "[BUG]"
+labels: bug, template
+assignees: ''
+
+---
+
+### Path of script within repository
+
+
+
+### Current behavior
+
+
+
+### Expected behavior
+
+
+
+### Environment details
+
+  - Burp version:
+  - BCheck language version:
+  - Operating system:
+
+
+### Additional details