diff --git a/.forgejo/issue_template/bug.yaml b/.forgejo/issue_template/bug.yaml
index e25ebce..ffc3b2a 100644
--- a/.forgejo/issue_template/bug.yaml
+++ b/.forgejo/issue_template/bug.yaml
@@ -19,23 +19,36 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: what-happened
+  - type: input
+    id: location
     attributes:
-      label: What happened?
-      description: Describe the bug. Include the steps to reproduce if possible.
-      placeholder: |
-        1. Go to ...
-        2. Click ...
-        3. See error ...
+      label: Where specifically?
+      description: Page URL, route, API endpoint, service name, or container — whatever narrows it down.
+      placeholder: "/channels/5, POST /api/downloads, scheduler service, etc."
+
+  - type: dropdown
+    id: reproducibility
+    attributes:
+      label: Reproducibility
+      options:
+        - Always
+        - Sometimes
+        - Saw it once
     validations:
       required: true
 
   - type: textarea
-    id: expected
+    id: what-happened
     attributes:
-      label: What should have happened?
-      description: Brief description of the correct behavior.
+      label: What happened?
+      description: Describe the bug and how to reproduce it. Include what you expected to happen if it's not obvious.
+      placeholder: |
+        Steps:
+        1. Go to ...
+        2. Click ...
+        3. See error ...
+
+        Expected: ...
     validations:
       required: true
 
@@ -50,4 +63,4 @@ body:
     id: context
     attributes:
       label: Additional context
-      description: Anything else — what you already tried, when it started, screenshots, related issues.
+      description: What you already tried, when it started, screenshots, related issues.
diff --git a/.forgejo/issue_template/feature.yaml b/.forgejo/issue_template/feature.yaml
index 164bf6d..84cfd24 100644
--- a/.forgejo/issue_template/feature.yaml
+++ b/.forgejo/issue_template/feature.yaml
@@ -19,6 +19,18 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: scope
+    attributes:
+      label: Scope
+      description: Rough size of what you're asking for.
+      options:
+        - Tweak — adjust existing behavior
+        - Feature — new capability or screen
+        - Large — multi-part, needs planning
+    validations:
+      required: true
+
   - type: textarea
     id: problem
     attributes:
@@ -35,12 +47,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives or workarounds
-      description: Any workaround you're using today, or alternative approaches you considered.
-
   - type: textarea
     id: context
     attributes: