diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..da301246
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,82 @@
+name: Bug Report
+description: Report a bug to help us improve. Issues are triaged by maintainers and may be promoted to Jira for planning.
+labels: [bug]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. Run `...`
+        2. Invoke skill `...`
+        3. Observe `...`
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: What you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual Behavior
+      description: What actually happened. Include error messages, logs, or screenshots if available.
+    validations:
+      required: true
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Plugin Version
+      description: The version of sdlc-workflow (check `plugins/sdlc-workflow/.claude-plugin/plugin.json`).
+      placeholder: "0.12.2"
+    validations:
+      required: true
+  - type: input
+    id: claude-code-version
+    attributes:
+      label: Claude Code Version
+      description: The version of Claude Code you are running (`claude --version`).
+      placeholder: "1.0.0"
+    validations:
+      required: true
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+      description: Your operating system and version.
+      placeholder: "macOS 15.1, Ubuntu 24.04, Windows 11"
+    validations:
+      required: false
+  - type: input
+    id: shell
+    attributes:
+      label: Shell
+      description: The shell you are using.
+      placeholder: "zsh, bash, PowerShell"
+    validations:
+      required: false
+  - type: textarea
+    id: mcp-server-configuration
+    attributes:
+      label: MCP Server Configuration
+      description: Any relevant MCP server configuration (e.g., configured servers, connection issues).
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Any other context about the problem.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..c57fded7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,32 @@
+name: Feature Request
+description: Suggest a new feature or improvement. Issues are triaged by maintainers and may be promoted to Jira for planning.
+labels: [enhancement]
+body:
+  - type: textarea
+    id: problem-statement
+    attributes:
+      label: Problem Statement
+      description: A clear and concise description of the problem this feature would solve.
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: Proposed Solution
+      description: How you envision the feature working.
+    validations:
+      required: false
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Alternatives Considered
+      description: Any alternative approaches you have considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Any other context, examples, or references that help illustrate the request.
+    validations:
+      required: false