diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..3c68bb8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,72 @@
+name: Bug Report
+description: Report something that isn't working correctly
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting! Please fill in as much as you can.
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Output of `uvx mcp-synology --version` or commit hash
+      placeholder: "0.4.0 or abc1234"
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      options:
+        - Linux
+        - macOS
+        - Windows
+    validations:
+      required: true
+  - type: dropdown
+    id: client
+    attributes:
+      label: MCP Client
+      options:
+        - Claude Desktop
+        - Claude Code
+        - Claude.ai (web/mobile)
+        - Cursor
+        - ChatGPT
+        - Other (describe below)
+    validations:
+      required: true
+  - type: input
+    id: dsm_version
+    attributes:
+      label: DSM version
+      placeholder: "e.g., DSM 7.2.2-72806"
+    validations:
+      required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: What happened?
+      description: Describe the bug and what you expected to happen instead.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: How can we reproduce this?
+      placeholder: |
+        1. Configure mcp-synology with ...
+        2. Ask Claude to "list files in /share"
+        3. See error ...
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant logs or error output
+      description: Run with SYNOLOGY_LOG_LEVEL=debug and paste any error messages or server logs.
+      render: shell
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..1d1b56d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: README / Setup Guide
+    url: https://github.com/cmeans/mcp-synology#quick-start
+    about: Installation and configuration instructions
+  - name: Credentials & Keyring
+    url: https://github.com/cmeans/mcp-synology/blob/main/docs/credentials.md
+    about: Keyring setup, multi-NAS credentials, and troubleshooting
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..648cc92
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,45 @@
+name: Feature Request
+description: Suggest an idea or improvement
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Have an idea? We'd love to hear it.
+  - type: textarea
+    id: problem
+    attributes:
+      label: What problem does this solve?
+      description: Describe the use case or pain point.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed solution
+      description: How do you think this should work?
+    validations:
+      required: false
+  - type: dropdown
+    id: area
+    attributes:
+      label: Area
+      options:
+        - File Station (browse / list / search)
+        - File Station (copy / move / delete / upload)
+        - System monitoring
+        - New DSM API module
+        - Authentication / 2FA
+        - Configuration / setup
+        - Multi-NAS support
+        - MCP protocol / transport
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives considered
+      description: Any other approaches you've thought about?
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/platform_test_report.yml b/.github/ISSUE_TEMPLATE/platform_test_report.yml
new file mode 100644
index 0000000..3535762
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/platform_test_report.yml
@@ -0,0 +1,83 @@
+name: Platform Test Report
+description: Report results from testing on your platform and NAS
+labels: ["testing", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Help us verify platform support! Report what works (or doesn't) on your setup.
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      options:
+        - Linux
+        - macOS
+        - Windows
+    validations:
+      required: true
+  - type: input
+    id: os_version
+    attributes:
+      label: OS version
+      placeholder: "e.g., macOS 15.3, Windows 11 24H2, Fedora 43"
+    validations:
+      required: true
+  - type: input
+    id: dsm_version
+    attributes:
+      label: DSM version
+      placeholder: "e.g., DSM 7.2.2-72806"
+    validations:
+      required: true
+  - type: dropdown
+    id: client
+    attributes:
+      label: MCP Client
+      options:
+        - Claude Desktop
+        - Claude Code
+        - Claude.ai (web/mobile)
+        - Cursor
+        - ChatGPT
+        - Other (describe below)
+    validations:
+      required: true
+  - type: input
+    id: install_method
+    attributes:
+      label: Install method
+      placeholder: "e.g., uvx, uv tool install, pip install"
+    validations:
+      required: false
+  - type: checkboxes
+    id: features
+    attributes:
+      label: What worked?
+      options:
+        - label: "mcp-synology setup — interactive config creation"
+        - label: "mcp-synology check — credential validation"
+        - label: "list_shares — enumerate shared folders"
+        - label: "list_files — browse directory contents"
+        - label: "list_recycle_bin — browse recycle bin contents"
+        - label: "search_files — search by name/extension"
+        - label: "get_file_info — file metadata"
+        - label: "get_dir_size — directory size calculation"
+        - label: "download_file — download file contents"
+        - label: "create_folder — create new directory"
+        - label: "rename — rename file or folder"
+        - label: "copy_files / move_files — copy or move"
+        - label: "delete_files — delete to recycle bin"
+        - label: "restore_from_recycle_bin — restore deleted files"
+        - label: "upload_file — upload file to NAS"
+        - label: "get_system_info — system information"
+        - label: "get_resource_usage — resource monitoring"
+        - label: "2FA authentication"
+        - label: "Keyring credential storage"
+  - type: textarea
+    id: notes
+    attributes:
+      label: Notes
+      description: Anything else — quirks, workarounds, error messages, debug logs.
+    validations:
+      required: false