diff --git a/.github/FUNDING.yml b/.github/funding.yml
similarity index 100%
rename from .github/FUNDING.yml
rename to .github/funding.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/issue_template/bug_report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/issue_template/bug_report.md
index 72fca815d..340d89500 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/issue_template/bug_report.md
@@ -25,8 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows 10]
- - 86Box version: [e.g. v2.06 build 2007, saying "Latest from Jenkins" isn't helpful]
- - Build type: [i.e. regular, optimized, or dev]
+ - 86Box version: [e.g. v3.00 build 3333; saying "Latest from Jenkins" isn't helpful]
+ - Build information: [i.e. new/old dynarec, architecture and build type]
 
 **Additional context**
 Add any other context about the problem here. If you are using an Optimized build, make sure to try the regular build too before filing a bug report!
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/issue_template/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yml
rename to .github/issue_template/config.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/issue_template/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/issue_template/feature_request.md