diff --git a/.gitea/ISSUE_TEMPLATE/a-bug.yml b/.gitea/ISSUE_TEMPLATE/a-bug.yml
index 83543832..49a2cacd 100644
--- a/.gitea/ISSUE_TEMPLATE/a-bug.yml
+++ b/.gitea/ISSUE_TEMPLATE/a-bug.yml
@@ -22,17 +22,60 @@ body:
       value: |
         # Environment Details                
   - type: dropdown
-    id: system
+    id: joomla_version
     attributes:
-      label: Which Joomla version were you using?
+      label: Which Joomla version are you using?
       multiple: true
       options:
+        - Latest
         - Joomla 5
         - Joomla 4
         - Joomla 3
         - Other
     validations:
       required: true
+  - type: dropdown
+    id: sermon_distributor_version
+    attributes:
+      label: Which Joomla Sermon Distributor version are you using?
+      multiple: true
+      options:
+        - Latest
+        - v5.0
+        - v3.0
+        - v2.1
+        - v2.0
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: php_version
+    attributes:
+      label: Which PHP version are you using?
+      multiple: true
+      options:
+        - Latest
+        - PHP 8.3
+        - PHP 8.2
+        - PHP 8.1
+        - PHP 8.0
+        - PHP 7.4
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: apache_version
+    attributes:
+      label: Which Apache version are you using?
+      multiple: true
+      options:
+        - Latest
+        - Apache 2.4
+        - Apache 2.2
+        - Apache 2.0
+        - Other
+    validations:
+      required: true
   - type: dropdown
     id: area
     attributes:
diff --git a/.gitea/ISSUE_TEMPLATE/g-security.yml b/.gitea/ISSUE_TEMPLATE/g-security.yml
index d0c74bf2..c08aeee1 100644
--- a/.gitea/ISSUE_TEMPLATE/g-security.yml
+++ b/.gitea/ISSUE_TEMPLATE/g-security.yml
@@ -21,11 +21,12 @@ body:
       value: |
         # Affected Systems        
   - type: dropdown
-    id: system
+    id: joomla_version
     attributes:
       label: Which Joomla version could potentially be affected?
       multiple: true
       options:
+        - Latest
         - Joomla 5
         - Joomla 4
         - Joomla 3
@@ -33,6 +34,21 @@ body:
         - Other
     validations:
       required: true
+  - type: dropdown
+    id: sermon_distributor_version
+    attributes:
+      label: Which Joomla Sermon Distributor version could potentially be affected?
+      multiple: true
+      options:
+        - Latest
+        - v5.0
+        - v3.0
+        - v2.1
+        - v2.0
+        - All
+        - Other
+    validations:
+      required: true
   - type: textarea
     id: non-sensitive-details
     attributes:
@@ -45,4 +61,4 @@ body:
     id: comments
     attributes:
       label: Additional Comments
-      description: Feel free to include any further comments or pertinent details that might assist us.
+      description: Feel free to include any further comments or pertinent details that might assist us.
\ No newline at end of file