diff --git a/.github/ISSUE_TEMPLATE/Bug_Report_PSScriptAnalyzer.md b/.github/ISSUE_TEMPLATE/Bug_Report_PSScriptAnalyzer.md
new file mode 100644
index 0000000000..a54338f87c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_Report_PSScriptAnalyzer.md
@@ -0,0 +1,8 @@
+---
+name: PSScriptAnalyzer bug report 🚦
+about: PSScriptAnalyzer bugs are tracked in a separate GitHub repo.
+
+---
+
+* Please submit PSScriptAnalyzer issues to the
+  [PSScriptAnalyzer](https://github.com/powershell/PSScriptAnalyzer/issues) repo on GitHub.
diff --git a/.github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report_Syntax_Colorization.md
similarity index 83%
rename from .github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md
rename to .github/ISSUE_TEMPLATE/Bug_Report_Syntax_Colorization.md
index 5cdc736868..aecbb51dc7 100644
--- a/.github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report_Syntax_Colorization.md
@@ -1,5 +1,5 @@
 ---
-name: Editor Syntax Colorization bug report ❓
+name: Editor Syntax Colorization bug report 🌈
 about: Editor syntax colorization bugs are tracked in a separate GitHub repo.
 
 ---
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c9cde9b503..26960d4686 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,5 +11,3 @@ Please mark anything not applicable to this PR `NA`.
 - [ ] Summarized changes
 - [ ] This PR is ready to merge and is not work in progress
     - If the PR is work in progress, please add the prefix `WIP:` to the beginning of the title and remove the prefix when the PR is ready
-
-@tylerl0706