diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..ca7f547
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,52 @@
+---
+name: Bug Report
+about: Report something that isn't working correctly in Stockhome
+title: "[BUG] "
+labels: bug
+assignees: ""
+---
+
+## 🐛 Bug Description
+<!-- A clear and concise description of what the bug is. -->
+
+
+## Steps to Reproduce
+<!-- How can we reliably reproduce the issue? -->
+1. Go to '...'
+2. Click on '...'
+3. See error
+
+## Expected Behavior
+<!-- What did you expect to happen? -->
+
+
+## Actual Behavior
+<!-- What actually happened instead? -->
+
+
+## Screenshots / Logs
+<!-- If applicable, add screenshots or paste relevant logs (e.g. from `docker compose logs`). -->
+
+
+## Environment
+
+| Field              | Value                          |
+|--------------------|-------------------------------|
+| Stockhome version  | <!-- e.g. v1.0.0 or commit hash --> |
+| Deployment         | <!-- Docker / docker-compose / manual --> |
+| Browser            | <!-- e.g. Chrome 125, Firefox 126 -->     |
+| OS (host)          | <!-- e.g. Ubuntu 24.04, Raspberry Pi OS --> |
+| `BACKEND_HOST`     | <!-- localhost / IP / domain --> |
+
+## Docker Logs
+<!-- Run `docker compose logs` and paste any relevant output here. -->
+<details>
+<summary>docker compose logs</summary>
+
+```
+paste logs here
+```
+</details>
+
+## Additional Context
+<!-- Anything else that might help us understand the issue. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..e758bd6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,41 @@
+---
+name: Feature Request
+about: Suggest a new feature or improvement for Stockhome
+title: "[FEATURE] "
+labels: enhancement
+assignees: ""
+---
+
+## 💡 Feature Description
+<!-- A clear and concise description of the feature you'd like to see. -->
+
+
+## Problem / Motivation
+<!-- Is your feature request related to a problem? Describe it.
+     e.g. "I always have to manually check expiry dates because..." -->
+
+
+## Proposed Solution
+<!-- Describe how you imagine this feature working. Be as specific as you like. -->
+
+
+## Alternatives Considered
+<!-- Have you thought of other approaches or workarounds? Why are they not ideal? -->
+
+
+## Affected Area
+<!-- Which part of Stockhome does this relate to? Check all that apply. -->
+- [ ] Inventory / Product management
+- [ ] Storage locations
+- [ ] Expiry / Bottling date tracking
+- [ ] QR code generation / scanning
+- [ ] Costs tracking
+- [ ] Settings (app name, currency, …)
+- [ ] Authentication / User management
+- [ ] API / Backend
+- [ ] Frontend / UI
+- [ ] Docker / Deployment
+- [ ] Other: <!-- describe -->
+
+## Additional Context / Mockups
+<!-- Add any other context, screenshots, or mockups that help illustrate the idea. -->