diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3265e692..54ebd561 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,18 +1,26 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
+name: Bug Report
+about: Report a bug to help us improve
+title: '[BUG] <BUG>'
 labels: bug
 assignees: ''
-
 ---
 
-**Plugin affected**: What plugin does this bug relate to (if applicable)
-**Nixpkgs channel**: Either unstable or your nixos version
-**Home-manager version**: (if applicable)
+| Field        | Description |
+|--------------|-------------|
+| Plugin       | `<PLUGIN>`  | <!-- [REQUIRED] affected NixVim plugin(s) -->
+| Nixpkgs      | `<VERSION>` | <!-- [REQUIRED] `unstable` or specific version -->
+| Home Manager | `<VERSION>` | <!-- [OPTIONAL] `unstable` or specific version -->
 
 ## Description
-Please describe the bug detail
 
-## Config
-Your nixvim config
+<!-- See https://stackoverflow.com/questions/29416909 -->
+
+## Minimal, Reproducible Example (MRE)
+
+<!-- See https://stackoverflow.com/help/minimal-reproducible-example -->
+
+```nix
+programs.nixvim = {
+}
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 907c7679..cb4b050a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,15 +1,20 @@
 ---
-name: Plugin request
+name: Plugin Request
 about: Request support for a new plugin
-title: ''
+title: '[PLUGIN REQUEST] <PLUGIN>'
 labels: enhancement
 assignees: ''
-
 ---
 
-**Plugin**: What's the name of the plugin
-**Plugin repository**: URL to the repository of the plugin
-**Is the plugin on nixpkgs**: Is this plugin available on nixpkgs?
+| Field    | Description |
+|----------|-------------|
+| Plugin   | `<PLUGIN>`  | <!-- Plugin NixVim should support -->
+| Homepage | `<URL>`     | <!-- URL to the plugin repository -->
+| Nixpkgs  | `<PACKAGE>` | <!-- Nixpkgs URL or `false` -->
 
-## Extra information
-Please provide extra information about the plugin, and any ideas you might have regarding nixvim-specific options.
+## Extra Information
+
+<!--
+Provide extra information about the plugin, and any ideas regarding
+NixVim-specific options.
+-->