diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 977c817..69ad19d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,29 +1,41 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
+title: ""
 labels: bug
 assignees: ''
-
 ---
 
-_If you are pasting terminal output or code snippets, place them in a code block (three backticks) in accordance with Markdown formatting for easier reading_
+<!-- If you are pasting terminal output or code snippets, place them in a
+code block (three backticks) in accordance with Markdown formatting for
+easier reading -->
 
-**Describe the bug**
+## Bug Description
 A clear and concise description of what the bug is.
 
-**Describe the target system**
-Provide as much detail about the target host as possible. If this is a TryHackMe or Hack The Box or similar machine, please provide the machine name and/or link as well.
+## pwncat version
+Provide the output of `pwncat --version` or a commit hash if working from
+a development branch.
 
-**To Reproduce**
+```
+$ pwncat --version
+0.4.2
+```
+
+## Target System (aka "victim")
+Provide as much detail about the target host as possible. If this is a TryHackMe
+or Hack The Box or similar machine, please provide the machine name and/or link
+as well.
+
+## Steps to Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+## Expected Behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
 If applicable, add screenshots to help explain your problem.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 11fc491..dcbc8b4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,17 +4,16 @@ about: Suggest an idea for this project
 title: ''
 labels: enhancement
 assignees: ''
-
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is the feature related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Feature Description
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Alternatives
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional Context
 Add any other context or screenshots about the feature request here.