diff --git a/.github/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 97%
rename from .github/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 803385e4..c16fc28d 100644
--- a/.github/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -28,7 +28,7 @@ A clear and concise description of what you expected to happen.
 * OS: fedora-coreos, flatcar-linux (include release version)
 * Release: Matchbox version or Git SHA (reporting latest is **not** helpful)
 
-### Possible Solution
+**Possible Solution**
 
 <!-- Most bug reports should have some inkling about solutions. Otherwise, your report may be less of a bug and more of a support request (see top).-->
 
diff --git a/.github/config.yml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/config.yml
rename to .github/ISSUE_TEMPLATE/config.yml