diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 517c3ca..046dd5b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug Report
-about: Create a report to help improve the Local AI Package
+about: Report a bug with n8n-install
 title: '[BUG] '
 labels: bug
 assignees: ''
@@ -10,29 +10,38 @@ assignees: ''
 A clear and concise description of the issue.
 
 ## Steps to Reproduce
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+1. Run '...'
+2. Navigate to '...'
+3. See error
 
 ## Expected Behavior
-A clear and concise description of what you expected to happen.
+What you expected to happen.
 
 ## Actual Behavior
-A clear and concise description of what actually happened.
+What actually happened. Include any error messages.
 
-## Screenshots
-If applicable, add screenshots to help explain your problem.
+## Logs
+```
+# Paste relevant logs here
+# Get logs with: make logs s=<service>
+```
 
 ## Environment
- - OS: [e.g. Windows 10, macOS Monterey, Ubuntu 22.04]
- - Using Docker Desktop, WSL, etc.
+- **OS**: [e.g., Ubuntu 24.04, Debian 12, macOS Sonoma]
+- **Docker version**: [e.g., 27.0.3]
+- **Docker Compose version**: [e.g., v2.29.1]
+- **n8n-install branch**: [main/develop]
+- **Affected service(s)**: [e.g., n8n, flowise, caddy]
+
+## Configuration
+- Which profiles are enabled? (from `COMPOSE_PROFILES` in `.env`)
+- Are you using a custom domain with SSL?
+- Are you using Cloudflare Tunnel?
 
 ## Additional Context
-Add any other context about the problem here, such as:
 - Does this happen consistently or intermittently?
-- Were there any recent changes that might be related?
+- Did this work before? If so, what changed?
 - Any workarounds you've discovered?
 
 ## Possible Solution
-If you have suggestions on how to fix the issue or what might be causing it.
\ No newline at end of file
+If you have suggestions on how to fix the issue.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 7b348ca..0000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Local AI Community
-    url: https://thinktank.ottomator.ai/c/local-ai/18
-    about: Please ask questions and start conversations about the Local AI Package here in the oTTomator Think Tank!
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f712851..789d7f0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,19 +1,25 @@
 ---
 name: Feature Request
-about: Suggest an idea for the Local AI Package
+about: Suggest a new feature or service for n8n-install
 title: '[FEATURE] '
 labels: enhancement
 assignees: ''
 ---
 
-## Describe the feature you'd like and why
-A clear and concise description of what you want to happen.
+## Feature Description
+What feature or service would you like added?
 
-## User Impact
-Who would benefit from this feature and how?
+## Use Case
+Why do you need this? What problem does it solve?
 
-## Implementation Details (optional)
-Any thoughts on how this might be implemented?
+## Proposed Implementation (optional)
+If you have ideas on how this could be implemented:
+- New service to add?
+- Changes to existing services?
+- New configuration options?
 
-## Additional context
-Add any other screenshots, mockups, or context about the feature request here.
\ No newline at end of file
+## Alternatives Considered
+Have you considered any alternative solutions or workarounds?
+
+## Additional Context
+Any other context, links, or references that might be helpful.
\ No newline at end of file