diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/00-bug.yml
similarity index 78%
rename from .github/ISSUE_TEMPLATE/bug-report.yml
rename to .github/ISSUE_TEMPLATE/00-bug.yml
index 1b853b275..02f2fa377 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/00-bug.yml
@@ -29,31 +29,27 @@ body:
 - type: input
   id: version_of_go
   attributes:
-    label: Go Version
+    label: Go Version (`go version`)
   validations:
     required: true
 - type: textarea
   id: repro_steps
   attributes:
-    label: What were you doing (steps to reproduce the bug)?
-  validations:
-    required: true
-- type: textarea
-  id: actual_result
-  attributes:
-    label: What actually happened as a result?
+    label: What steps will reproduce the problem?
   validations:
     required: true
 - type: textarea
   id: expected_result
   attributes:
-    label: What did you expect to happen?
+    label: What is the expected result?
   validations:
     required: true
 - type: textarea
-  id: stacktrace
+  id: actual_result
   attributes:
-    label: If you have a stack trace, please add it here.
+    label: What happens instead?
+  validations:
+    required: true
 - type: textarea
   id: additional
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/01-feature.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature-request.yml
rename to .github/ISSUE_TEMPLATE/01-feature.yml
diff --git a/.github/ISSUE_TEMPLATE/security-vulnerability.yml b/.github/ISSUE_TEMPLATE/02-security.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/security-vulnerability.yml
rename to .github/ISSUE_TEMPLATE/02-security.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..078194931
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions
+    about: Please use one of the forums for questions or general discussions
+    url: https://github.com/hajimehoshi/ebiten/discussions