diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
new file mode 100644
index 00000000..05eebe54
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
@@ -0,0 +1,34 @@
+---
+name: Bug Report / Feature Request
+about: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with Cemu or you are requesting a feature you believe would make Cemu better.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!---
+Please keep in mind Cemu is EXPERIMENTAL SOFTWARE.
+
+Please read the FAQ:
+https://cemu.info/faq.html/
+
+THIS IS NOT A SUPPORT FORUM, FOR SUPPORT GO TO:
+https://discord.com/invite/5psYsup/
+
+If the FAQ does not answer your question, please go to:
+https://discord.com/invite/5psYsup/
+
+When submitting an issue, please check the following:
+
+- You have read the above.
+- You have provided the version (commit hash) of Cemu you are using.
+- You have provided sufficient detail for the issue to be reproduced.
+- You have provided system specs (if relevant).
+- Please also provide:
+  - For any issues, a log file
+  - For crashes, a backtrace.
+  - For graphical issues, comparison screenshots with real hardware.
+  - For emulation inaccuracies, a test-case (if able).
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..d33d87ed
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Cemu Discord
+    url: https://discord.com/invite/5psYsup
+    about: If you are experiencing an issue with Cemu, and you need tech support, or if you have a general question, try asking in the official Cemu Discord linked here. Piracy is not allowed.
diff --git a/BUILD.md b/BUILD.md
index 2fd6dbef..e9eac5a8 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -10,8 +10,8 @@ Prerequisites:
 Instructions:
 
 1) Run `git clone --recursive https://github.com/cemu-project/Cemu`
-2) Launch `Cemu/build_vs_solution.bat`. If you installed VS to a custom location you may need to manually adjust the path inside the bat file
-3) Wait until done, then open build/Cemu.sln in Visual Studio
+2) Launch `Cemu/generate_vs_solution.bat`. If you installed VS to a custom location you may need to manually adjust the path inside the bat file
+3) Wait until done, then open `Cemu/build/Cemu.sln` in Visual Studio
 4) Right click 'CemuBin' project -> Set as startup project
 5) Then build the solution and once finished you can run and debug it