diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 40e4f0e8..6664fcc1 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -10,7 +10,7 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the feature already exists.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET Core 3.1 and .NET 5.0 have known limitations, so make sure that what you're asking for isn't already in another build.
+- .NET 6.0 has known limitations, so make sure that what you're asking for isn't already in another build.
 - Check [previous issues](https://github.com/SabreTools/MPF/issues) to see if any of those are related to what you're about to ask for.
 
 If none of those apply, then continue...
diff --git a/.github/ISSUE_TEMPLATE/informational.md b/.github/ISSUE_TEMPLATE/informational.md
index bf34fb6c..49a51194 100644
--- a/.github/ISSUE_TEMPLATE/informational.md
+++ b/.github/ISSUE_TEMPLATE/informational.md
@@ -10,7 +10,7 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the feature already exists.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET Core 3.1 and .NET 5.0 have known limitations, so make sure that what you're giving information on isn't already in another build.
+- .NET 6.0 has known limitations, so make sure that what you're giving information on isn't already in another build.
 - Check [previous issues](https://github.com/SabreTools/MPF/issues) to see if any of those are related to what you're about to ask for.
 
 If none of those apply, then continue...
diff --git a/.github/ISSUE_TEMPLATE/issue-report.md b/.github/ISSUE_TEMPLATE/issue-report.md
index f8635684..859bde51 100644
--- a/.github/ISSUE_TEMPLATE/issue-report.md
+++ b/.github/ISSUE_TEMPLATE/issue-report.md
@@ -10,7 +10,7 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the issue has already been addressed.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET Core 3.1 and .NET 5.0 have known issues, please try using another build to reproduce the error
+- .NET 6.0 has known issues, please try using another build to reproduce the error
 - Check multiple discs to help narrow down the issue
 - Check the Options to see if changing any of those affects your issue.
 
@@ -25,9 +25,8 @@ What version are you using?
 **Build**
 What runtime version are you using?
 
-- [ ] .NET Framework 4.7.2 running on (Operating System)
 - [ ] .NET Framework 4.8 running on (Operating System)
-- [ ] .NET Core 3.1 running on (Operating System)
+- [ ] .NET 6.0 running on (Operating System)
 
 **Describe the issue**
 A clear and concise description of what the bug is.
diff --git a/CHANGELIST.md b/CHANGELIST.md
index bc4c0a99..95b2d3ca 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -167,6 +167,7 @@
 - Fix multiple DiscType* for DIC
 - Add logging to !submissionInfo writing failure
 - Add logging to !submissionInfo formatting failure
+- Update issue templates to be more accurate
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again
diff --git a/MPF.sln b/MPF.sln
index c8035887..69f28f87 100644
--- a/MPF.sln
+++ b/MPF.sln
@@ -15,6 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		CHANGELIST.md = CHANGELIST.md
+		.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
+		.github\ISSUE_TEMPLATE\informational.md = .github\ISSUE_TEMPLATE\informational.md
+		.github\ISSUE_TEMPLATE\issue-report.md = .github\ISSUE_TEMPLATE\issue-report.md
 		README.md = README.md
 	EndProjectSection
 EndProject