diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b3b585d3..bc19acd1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -18,6 +18,9 @@ A short description of what the issue is, and possibly some steps to reproduce i
 ...
 
 **System information**
+- Plugin: [e.g. Vital]
+- Plugin type: [VST2/VST3]
+- Host: [e.g. Bitwig Studio, REAPER or Ardour]
 - Operating system: [e.g. Manjaro, or Ubuntu 20.04]
 - Wine version: [e.g. Wine Staging 5.13]
 - Installation method: [symlinks/copies], [manual/yabridgectl]
diff --git a/.github/ISSUE_TEMPLATE/setup_help.md b/.github/ISSUE_TEMPLATE/setup_help.md
index faddf1ec..a4ccf1d5 100644
--- a/.github/ISSUE_TEMPLATE/setup_help.md
+++ b/.github/ISSUE_TEMPLATE/setup_help.md
@@ -14,6 +14,9 @@ Also try our [Discord](https://discord.com/invite/pyNeweqadf) for some quick hel
 A short description of the current situation.
 
 **System information**
+- Plugin: [e.g. Vital, optional if this is a general issue]
+- Plugin type: [VST2/VST3, optional if this is a general issue]
+- Host: [e.g. Bitwig Studio, REAPER or Ardour]
 - Operating system: [e.g. Manjaro, or Ubuntu 20.04]
 - Wine version: [e.g. Wine Staging 5.13]
 - Installation method: [symlinks/copies], [manual/yabridgectl]