diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index e3dd71f4b6..6202a9cc1a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,86 +1,24 @@
 name: Bug Report
 description: Report a bug in DimOS
-title: "[Bug]: "
+labels: ["bug"]
 body:
   - type: textarea
     id: description
     attributes:
       label: Description
-      description: What happened? What did you expect to happen?
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to Reproduce
-      description: Minimal steps to reproduce the bug
-      placeholder: |
-        1. ...
-        2. ...
-        3. ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs / Error Output
-      description: Paste any relevant logs or error messages
-      render: shell
-    validations:
-      required: false
+      value: |
+        ## System
+        <!-- e.g. Ubuntu 24.04, macOS 15.4 -->
 
-  - type: input
-    id: commit-hash
-    attributes:
-      label: Commit Hash
-      description: "Run: git rev-parse --short HEAD"
-      placeholder: "abc1234"
-    validations:
-      required: true
+        ## Robot (including firmware version)
+        <!-- e.g. Unitree Go2 EDU 1.1.7, or N/A -->
 
-  - type: input
-    id: os
-    attributes:
-      label: Operating system
-      description: OS and version where this occurs.
-      placeholder: macOS 15.4 / Ubuntu 24.04 / Windows 11
-    validations:
-      required: true
+        ## Steps to reproduce
 
-  - type: dropdown
-    id: robot-model
-    attributes:
-      label: Robot Model
-      description: Which robot are you using, if any?
-      options:
-        - N/A
-        - Unitree G1
-        - Unitree Go2 Pro
-        - Unitree Go2 Air
-        - Unitree B1
-        - Drone
-        - Piper
-        - xArm
-        - Simulation only
-        - Other (specify below)
-    validations:
-      required: false
+        ## DimOS version
+        <!-- branch name or commit: git rev-parse --short HEAD -->
 
-  - type: input
-    id: firmware-version
-    attributes:
-      label: Firmware Version
-      description: Exact firmware version of your robot, if applicable (e.g. 1.0.2.35)
-      placeholder: "1.0.2.35"
-    validations:
-      required: false
+        ## Logs / screenshots
 
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional Context
-      description: Any other context — screenshots, environment details, workarounds tried, etc.
     validations:
-      required: false
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 9170347ffa..992e136b85 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Discord
     url: https://discord.gg/dimos
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 2979bb7779..9a1c6ed03f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,35 +1,12 @@
 name: Feature Request
 description: Suggest a new feature or improvement for DimOS
-title: "[Feature]: "
+labels: ["feature"]
 body:
   - type: textarea
-    id: problem
+    id: description
     attributes:
-      label: Problem
-      description: What problem does this solve? What's frustrating or missing?
-    validations:
-      required: true
+      label: Description
+      description: What do you want and why?
 
-  - type: textarea
-    id: solution
-    attributes:
-      label: Proposed Solution
-      description: How would you like this to work?
     validations:
       required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives Considered
-      description: Any other approaches you've thought about or workarounds you're using
-    validations:
-      required: false
-
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional Context
-      description: Any other context — diagrams, references, related issues, etc.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 0000000000..6bc5b72b9d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,11 @@
+name: Question
+description: Ask a question about DimOS usage or development
+labels: ["question"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Question
+      description: What do you need help with?
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/spec.yml b/.github/ISSUE_TEMPLATE/spec.yml
deleted file mode 100644
index 016399f1dc..0000000000
--- a/.github/ISSUE_TEMPLATE/spec.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Spec
-description: Technical specification for a new module, feature, or system change
-title: "[Spec]: "
-body:
-  - type: textarea
-    id: spec
-    attributes:
-      label: Specification
-      description: Full technical spec in markdown
-      value: |
-        ## Summary
-        <!-- One sentence: what this adds/changes and why -->
-
-        ## Motivation
-        <!-- What problem does this solve? Link related issues. -->
-
-        ## Design
-
-        ### API / Interface
-        <!-- Public API, CLI flags, stream types, config options -->
-
-        ### Architecture
-        <!-- How it fits into DimOS. Which modules, streams, blueprints are involved? -->
-
-        ### Implementation Notes
-        <!-- Key decisions, algorithms, dependencies, constraints -->
-    validations:
-      required: true