diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d9ee0bdd..5e522853 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -41,9 +41,15 @@ body:
       label: Version (if known)
       placeholder: "e.g. 1.2.3"
 
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots / recordings (optional)
+      description: "Anything visual that helps."
+
   - type: textarea
     id: logs
     attributes:
-      label: Logs / screenshots (optional)
-      description: Paste anything relevant (or attach screenshots).
+      label: Logs (optional)
+      description: "Paste relevant logs."
       render: shell
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index d5c69317..3ef2da8d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -3,18 +3,14 @@ description: Suggest an improvement
 labels: [enhancement]
 body:
   - type: textarea
-    id: goal
+    id: request
     attributes:
-      label: What do you want to do?
-      placeholder: "I want to …"
-    validations:
-      required: true
+      label: What should we add/change?
+      description: What you’re trying to do + what you’d like to happen.
+      placeholder: |
+        I’m trying to …
 
-  - type: textarea
-    id: idea
-    attributes:
-      label: What should OpenChamber do?
-      placeholder: "Add/change …"
+        It would be great if OpenChamber …
     validations:
       required: true