diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report_general.md
similarity index 69%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report_general.md
index 35a05edc6..b8468cd65 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_general.md
@@ -1,11 +1,11 @@
 ---
 name: Bug report
-about: Submit a bug ticket if you have an issue. If you're a user, check out the Wormhole Discord server below for faster assistance.
+about: Submit a bug ticket if you found a bug not related to the guardian software. If you're a user, check out the Wormhole Discord server below for faster assistance.
 title: ''
-labels: 'bug'
+labels: ['bug']
 assignees: ''
 ---
-<!--- Fill out the fields if you're an integrator or contributor. -->
+<!--- Fill out all the fields below for faster assistance. -->
 
 ## Description and context
 <!--- Provide a detailed description of the problem to expedite the process. -->
@@ -28,5 +28,4 @@ assignees: ''
 
 
 ## Solution recommendation
-<!--- Not mandatory, but feel free to recommend a way fix the issue. -->
-
+<!--- Not mandatory, but feel free to recommend a way fix the issue. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report_guardian.md b/.github/ISSUE_TEMPLATE/bug_report_guardian.md
new file mode 100644
index 000000000..a383c2b68
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report_guardian.md
@@ -0,0 +1,14 @@
+---
+name: Guardian software bug report
+about: Submit a bug ticket if you have an issue with the guardian software. If you're a user, check out the Wormhole Discord server below for faster assistance.
+title: ''
+labels: ['bug', 'guardian-support']
+assignees: ''
+---
+<!--- Fill out all the fields below for faster assistance. -->
+
+## Description
+<!-- Please describe the issue in detail. Include logs, errors, and expected behavior. -->
+
+## Recommendation
+<!-- Not necessary, but feel free to recommend a way to fix the issue. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/tracking_issue.md b/.github/ISSUE_TEMPLATE/tracking_issue.md
deleted file mode 100644
index a85cbbf1e..000000000
--- a/.github/ISSUE_TEMPLATE/tracking_issue.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Tracking issue
-about: Tracking issues are task lists used to better organize regular work items.
-title: 'Tracking issue for *ADD_PROJECT* - *ADD_COMPONENT*'
-labels: 'epic'
-assignees: ''
-
----
-
-This issue is for grouping *ADD_COMPONENT* related tasks that are necessary for *ADD_PROJECT*.
-
-### Other tracking issues for the same project:
-<!--- Link related tracking issues within the project for easier navigation. -->
-<!--- Assign tasks to the appropriate tracking issue if there is more than one. -->
-
-- #XXXX
-- #XXXX
-- #XXXX
-
-<!--- Subtasks MUST be inside the ``` -> ``` code block. -->
-```[tasklist]
-### Task list
-- [ ] XXXX
-- [ ] XXXX
-```
\ No newline at end of file