diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 08ff357..be47dad 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,18 +3,13 @@ name: Bug report
 about: Create a report to help us improve
 ---
 
-# Using v6?
-
-v6 is now considered feature complete to its current abilities and limitations. We are not actively working to fix any issues for v6 any more. We will, however, merge any non-breaking pull requests submitted to fix anything in v6.
-
-# Using v7?
-
-Thanks for using the beta version of React Table v7! We're very excited about it.
-
-**Describe the bug**
+**Describe the bug (required)**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**Provide an example via Codesandbox! (required)**
+Use a new [react-table codesandbox](https://codesandbox.io/s/m5lxzzpz69) to reproduce the issue.
+
+**Steps To Reproduce (required)**
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -22,12 +17,9 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**Expected behavior (Recommended)**
 A clear and concise description of what you expected to happen.
 
-**Codesandbox!**
-Use a new [react-table codesandbox](https://codesandbox.io/s/m5lxzzpz69) to reproduce the issue.
-
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 11cfc78..21c6aae 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,6 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+---# STOP
 
----
-
-# STOP
-
-We do not track feature requests through Github. Please use the [Spectrum React Table Forum](https://spectrum.chat/react-table) to talk about new ideas and features.
+We do not track feature requests through Github. Please use [Github Discussions](https://github.com/tannerlinsley/react-table/discussions) to talk about new ideas and features.
diff --git a/.github/ISSUE_TEMPLATE/questions--support---help.md b/.github/ISSUE_TEMPLATE/questions--support---help.md
index fbaac0f..676e867 100644
--- a/.github/ISSUE_TEMPLATE/questions--support---help.md
+++ b/.github/ISSUE_TEMPLATE/questions--support---help.md
@@ -1,11 +1,8 @@
 ---
 name: Questions, Support & Help
 about: Looking for help? Need a question answered?
+---# STOP
 
----
-
-# STOP
-
-We do not use Github to track general support. Please use our public support forum at https://spectrum.chat/react-table.
+We do not use Github to track general support. Please use our public support forum at https://github.com/tannerlinsley/react-table/discussions.
 
 NOTE: If a support/help/question issue is opened, it will be closed immediately and be redirected to the forum. Thanks for helping us keep our issues clean and productive!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1138624..b271c66 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,11 +2,11 @@
 
 ## Questions
 
-If you have questions about implementation details, help or support, then please use our dedicated community forum at [Spectrum.chat/react-table](https://spectrum.chat/react-table) **PLEASE NOTE:** If you choose to instead open an issue for your question, your issue will be immediately closed and redirected to the forum.
+If you have questions about implementation details, help or support, then please use our dedicated community forum at [Github Discussions](https://github.com/tannerlinsley/react-table/discussions) **PLEASE NOTE:** If you choose to instead open an issue for your question, your issue will be immediately closed and redirected to the forum.
 
 ## Reporting Issues
 
-If you have found what you think is a bug, please [file an issue](https://github.com/tannerlinsley/react-table/issues/new). **PLEASE NOTE:** Issues that are identified as implementation questions or non-issues will be immediately closed and redirected to [Spectrum.chat/react-table](https://spectrum.chat/react-table)
+If you have found what you think is a bug, please [file an issue](https://github.com/tannerlinsley/react-table/issues/new). **PLEASE NOTE:** Issues that are identified as implementation questions or non-issues will be immediately closed and redirected to [Github Discussions](https://github.com/tannerlinsley/react-table/discussions)
 
 ## Suggesting new features