diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 95c6e6d3..d9ee0bdd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,29 +1,20 @@
 name: Bug report
-description: Report a reproducible problem
-title: "bug: "
+description: Report something broken
 labels: [bug]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report a bug.
-
-        Please include description/screenshots if possible.
-
   - type: textarea
-    id: what-happened
+    id: what
     attributes:
-      label: What happened?
-      description: What did you expect, what happened instead?
-      placeholder: Steps + expected vs actual
+      label: What’s wrong?
+      description: What happened and what you expected.
+      placeholder: "Expected … but got …"
     validations:
       required: true
 
   - type: textarea
-    id: repro
+    id: steps
     attributes:
       label: Steps to reproduce
-      description: Numbered steps help a lot
       placeholder: |
         1.
         2.
@@ -34,25 +25,25 @@ body:
   - type: dropdown
     id: runtime
     attributes:
-      label: Runtime
-      multiple: true
+      label: Where does it happen?
       options:
-        - Desktop MacOS app
-        - Mobile (Web/PWA)
+        - Desktop (macOS)
         - Desktop Web
+        - Mobile (Web/PWA)
         - VS Code extension
+        - Not sure
     validations:
       required: true
 
   - type: input
     id: version
     attributes:
-      label: OpenChamber version
+      label: Version (if known)
       placeholder: "e.g. 1.2.3"
 
   - type: textarea
     id: logs
     attributes:
-      label: Logs / screenshots
-      description: Paste relevant logs or attach screenshots
+      label: Logs / screenshots (optional)
+      description: Paste anything relevant (or attach screenshots).
       render: shell
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 20d6a92e..3ba13e0c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: GitHub Discussions
-    url: https://github.com/btriapitsyn/openchamber/discussions
-    about: Ask questions and share ideas
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 3aa3bad7..d5c69317 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,39 +1,25 @@
 name: Feature request
-description: Suggest an improvement or new capability
-title: "feat: "
+description: Suggest an improvement
 labels: [enhancement]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for proposing an idea.
-
   - type: textarea
-    id: problem
+    id: goal
     attributes:
-      label: Problem / use case
-      description: What are you trying to do?
-      placeholder: "As a user, I want..."
+      label: What do you want to do?
+      placeholder: "I want to …"
     validations:
       required: true
 
   - type: textarea
-    id: proposal
+    id: idea
     attributes:
-      label: Proposed solution
-      description: What would you like to see happen?
-      placeholder: UI, behavior, config, etc.
+      label: What should OpenChamber do?
+      placeholder: "Add/change …"
     validations:
       required: true
 
   - type: textarea
-    id: alternatives
+    id: context
     attributes:
-      label: Alternatives considered
-      placeholder: "Other approaches you've tried/considered"
-
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional context
-      description: Links, screenshots, mockups, etc.
+      label: Extra context (optional)
+      description: Links, screenshots, mockups, constraints, etc.