diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 63d680f..08c07be 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,15 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**Desktop (please complete the following information):**
+
+OS & version [e.g. Windows 10, 1822]:
+
+**MSFT Build of OpenJDK Version:**
+
+The output from `java --version`
+
+**To Reproduce:**
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -21,23 +29,8 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
-
-- OS: [e.g. iOS]
-- Browser [e.g. chrome, safari]
-- Version [e.g. 22]
-
-- OS & version [e.g. Windows 10, 1822]:
-- Browser & version [e.g. Edge, 91.0.864.48]:
-**Smartphone (please complete the following information):**
-
-- Device: [e.g. iPhone6]
-- OS: [e.g. iOS8.1]
-- Browser [e.g. stock browser, safari]
-- Version [e.g. 22]
+**Screenshots, Logs etc**
+If applicable, add screenshots, logs to help explain your problem.
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 8bd13d6..224f4d8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 
 contact_links:
-  - name: Minecraft Java Edition Related Bug 🔐
+  - name: Minecraft Java Edition Related Issue 🔐
     url: https://bugs.mojang.com/projects/MC/summary
-    about: We love Minecraft and would love to help! However, this probably isn't quite the right place to report this issue :-). Please submit Minecraft Java Edition related issues to the Mojang folks who will take the first pass at triaging the issue. If it is a genuine Microsoft Build of OpenJDK (Java/JVM) issue then they will open an issue with us, and we'll work together to resolve it. For context, most Java crash reports relating to Minecraft Java Edition are the result of Java calling a buggy native library, O/S driver etc. So although you'll see a Java crash report, the root cause is typically not Java itself, but inside the library that Java called.
+    about: Please submit Minecraft Java Edition related issues to the Mojang Issue Tracker First :-).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..c61c0de 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -17,4 +17,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context, screenshots or logs about the feature request here.