diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index 7f905c93c..ddcea7ab2 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -1,18 +1,37 @@
-name: Bug Report
+name: Bug report
 description: Create an issue to help us improve
-title: '[BUG] <Software> - <Summary>'
-labels: ['BUG', 'TRIAGE']
+title: "[Bug]: "
+labels: ["bug"]
+type: "Bug"
 body:
   - type: markdown
     attributes:
-      value: <br>To expedite issue processing please search open and closed issues before submitting a new one. Existing issues often contain information about workarounds, resolution, or progress updates.
-
+      value: |
+        Please provide all the necessary information to expedite the response.
   - type: textarea
     attributes:
       label: Bug Description
       description: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: input
+    attributes:
+      label: Software Version
+      description: Software version, branch, or tag in the DLStreamer Repository
+      placeholder: v2026.0.0 / main branch
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Operating System
+      description: What OS are you using?
+      options:
+        - Ubuntu 22.04 (LTS)
+        - Ubuntu 24.04 (LTS)
+        - Windows 11
+        - Other (Please specify in description)
+    validations:
+      required: true
 
   - type: textarea
     attributes:
@@ -27,8 +46,3 @@ body:
       description: Describe how we can reproduce your issue.
     validations:
       required: true
-
-  - type: textarea
-    attributes:
-      label: Root Cause Analysis
-      description: Provide any initial triage, if possible.
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 21e210df5..ac4d512ec 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,20 +1,23 @@
 name: Feature Request
 description: File a feature request.
-title: '[FEATURE]: <Software> - <Summary>'
-labels: ['FEATURE', 'TRIAGE']
+title: '[FEATURE]: '
+labels: ["feature"]
+type: "Feature"
 body:
-
-  - type: markdown
-    attributes:
-      value: <br>To expedite issue processing please search open and closed issues before submitting a new one. Existing issues often contain information about workarounds, resolution, or progress updates.
-
   - type: textarea
     attributes:
       label: Feature Description
       description: A clear and concise description of the problem or missing capability.
     validations:
       required: true
-
+  - type: input
+    attributes:
+      label: Current Software Version
+      description: |
+        What version are you currently using? This helps us understand your context and avoid suggesting features that may already exist in newer versions.
+      placeholder: v2026.0.0 / main branch
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: Solution Description