diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
index a258c9501..42cde331c 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -7,15 +7,33 @@ about: If something isn't working 🔧
 Describe your issue here.
 
 ### Your environment
-* Version of ruby
-* Docker or manual installation?
-* Which browser and its version
+* Version of AttackMate (`attackmate --version`)
+* Python version (`python --version`)
+* Ansible, Docker, pip, or uv installation?
+* OS and version
 
 ### Steps to reproduce
-Tell us how to reproduce this issue. 
+Tell us how to reproduce this issue.
+
+### Playbook
+Provide a minimal playbook that reproduces the issue (remove sensitive data):
+
+```yaml
+
+```
+
+### Config
+Provide the config you used.
+
+```yaml
+
+```
 
 ### Expected behaviour
 Tell us what should happen
 
 ### Actual behaviour
 Tell us what happens instead
+
+### Log output
+Paste the relevant log output or error/stack trace here:
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.md b/.github/ISSUE_TEMPLATE/02_feature_request.md
index a7edab580..979fae026 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.md
@@ -5,7 +5,7 @@ about: If you have a feature request 💡
 
 **Context**
 
-What are you trying to do and how would you want to do it differently? Is it something you currently you cannot do? Is this related to an issue/problem?
+What are you trying to do and how would you want to do it differently? Is it something you currently cannot do? Is this related to an issue/problem?
 
 **Alternatives**
 
@@ -18,4 +18,3 @@ Please provide a link to the issue.
 **If the feature request is approved, would you be willing to submit a PR?**
 
 Yes / No _(Help can be provided if you need assistance submitting a PR)_
-