diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 403f5c841b..2c4bcd0dc1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,6 +36,7 @@ If applicable, add screenshots to help explain your problem.
 - Unity Version: [e.g. 2020.3]
 - Netcode Version: [e.g. 1.0.0-pre.6]
 - Netcode Commit: [e.g. https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/commit/ba418fa5b600ad9eb61fab0575f12fbecc2c6520]
+- Netcode Topology: [e.g. Client-Server, Distributed Authority, etc.]
 
 ### Additional Context
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 463438eb0e..a43d1afdcf 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: True
+blank_issues_enabled: False
 contact_links:
   - name: Documentation Issues
     url: https://github.com/Unity-Technologies/com.unity.multiplayer.docs/issues
@@ -8,4 +8,10 @@ contact_links:
     about: Join our Discord community for questions, support and discussions
   - name: Unity Multiplayer Forum
     url: https://forum.unity.com/forums/multiplayer.26/
-    about: Create a thread in the Unity Multiplayer Forum
\ No newline at end of file
+    about: Create a thread in the Unity Multiplayer Forum
+  - name: Support
+    url: https://discussions.unity.com/tag/netcode-for-gameobjects
+    about: Creating a thread in discussions is usually the fastest way to get help from Unity stuff or other experienced users
+  - name: Feedback
+    url: https://discussions.unity.com/tag/netcode-for-gameobjects
+    about: We are always looking for feedback on our products, so please let us know what you think
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feedback.md b/.github/ISSUE_TEMPLATE/feedback.md
deleted file mode 100644
index 07c76f975c..0000000000
--- a/.github/ISSUE_TEMPLATE/feedback.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feedback
-about: Provide feedback to the Netcode for GameObjects team
-title: ''
-labels: stat:awaiting-triage, stat:reply-needed, type:feedback
-assignees: ''
-
----
-
-**Feedback**
-Enter your feedback to the Netcode for GameObjects team here. Please keep in mind that our teams focus is on multiplayer development. For other non-networking related feedback towards Unity please use the Forums.
-
-**Suggested Changes**
-If you think we could do something better, please let us know here what you would like us to change. Concrete and constructive suggestions are welcome and will help us to prioritize and act on feedback.
diff --git a/.github/ISSUE_TEMPLATE/other-issues.md b/.github/ISSUE_TEMPLATE/other-issues.md
deleted file mode 100644
index 8b00095b8b..0000000000
--- a/.github/ISSUE_TEMPLATE/other-issues.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Other Issues
-about: Use this template for any other non-support related issues
-title: ''
-labels: stat:awaiting-triage, stat:reply-needed
-assignees: ''
-
----
-
-This template is for issues not covered by the other issue categories.
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
deleted file mode 100644
index 2383875723..0000000000
--- a/.github/ISSUE_TEMPLATE/support.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Support
-about: Have a question or need help with anything?
-title: ''
-labels: stat:awaiting triage, type:support
-assignees: ''
-
----
-
-For support related questions we HIGHLY recommend to post a message either on the [Unity Discussions](https://discussions.unity.com/tag/netcode-for-gameobjects) or on our [Discord Community](https://discord.gg/TqNeJTtC) where you can get help from the community and the developers.
-Those forums will get you the fastest response and are the best place to ask for help.
-
-If you still feel like you want to open a support issue as an GitHub Issue, please make sure to include as much information as possible (also including any relevant code/project) to help us understand your problem.
\ No newline at end of file