diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ee1f6ae..eba1fea 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,12 +8,24 @@ body:
       value: |
        Thank you for taking the time to fill out this bug report!
        Fields marked with an asterisk (*) are required, and remaining fields are optional, but we encourage their usage.
+       Steps to reproduce the behavior:
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
   - type: textarea
     id: feature
     attributes:
       label: Please enter a clear and concise description of the bug.
     validations:
       required: true
+  - type: input
+    id: stash_ver
+    attributes:
+      label: Stash Version: (from Settings -> About)
+      placeholder: e.g. v0.26.2
+    validations:
+      required: true      
   - type: input
     id: os
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug_report_plugin.yml b/.github/ISSUE_TEMPLATE/bug_report_plugin.yml
index 5695985..b3bed18 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_plugin.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_plugin.yml
@@ -8,17 +8,36 @@ body:
       value: |
        Thank you for taking the time to fill out this bug report!
        Fields marked with an asterisk (*) are required, and remaining fields are optional, but we encourage their usage.
+       Steps to reproduce the behavior:
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
   - type: textarea
     id: feature
     attributes:
       label: Please enter a clear and concise description of the bug.
     validations:
       required: true
+  - type: input
+    id: stash_ver
+    attributes:
+      label: Stash Version: (from Settings -> About)
+      placeholder: e.g. v0.26.2
+    validations:
+      required: true      
   - type: input
     id: os
     attributes:
       label: What Operating System (OS)?
-      placeholder: e.g. Windows, MacOS, Linux
+      placeholder: e.g. Windows, MacOS, Linux, iOS8.1
+    validations:
+      required: true      
+  - type: input
+    id: device
+    attributes:
+      label: Smartphone and tablts (please complete the following information):
+      placeholder: e.g. iPhone6, Galaxy Tab A9+
     validations:
       required: true      
   - type: input