diff --git a/.gitea/ISSUE_TEMPLATE/enterprise_support.md b/.gitea/ISSUE_TEMPLATE/enterprise_support.md
deleted file mode 100644
index 4c3f0b4..0000000
--- a/.gitea/ISSUE_TEMPLATE/enterprise_support.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-name: Enterprise Support Request
-about: Request enterprise-level support or consultation
-title: '[ENTERPRISE] '
-labels: 'enterprise, support'
-assignees: ''
-
----
-
-
-## Support Request Type
-- [ ] Critical Production Issue
-- [ ] Performance Optimization
-- [ ] Security Audit
-- [ ] Architecture Review
-- [ ] Custom Development
-- [ ] Migration Support
-- [ ] Training & Onboarding
-- [ ] Other (please specify)
-
-## Priority Level
-- [ ] P0 - Critical (Production Down)
-- [ ] P1 - High (Major Feature Broken)
-- [ ] P2 - Medium (Non-Critical Issue)
-- [ ] P3 - Low (Enhancement/Question)
-
-## Organization Details
-- **Company Name**:
-- **Contact Person**:
-- **Email**:
-- **Phone** (for P0/P1 issues):
-- **Timezone**:
-
-## Issue Description
-Provide a clear and detailed description of your request or issue.
-
-## Business Impact
-Describe the impact on your business operations:
-- Number of users affected:
-- Revenue impact (if applicable):
-- Deadline/SLA requirements:
-
-## Environment Details
-- **Deployment Type**: [On-Premise / Cloud / Hybrid]
-- **Platform**: [Joomla / Dolibarr / Custom]
-- **Version**:
-- **Infrastructure**: [AWS / Azure / GCP / Other]
-- **Scale**: [Users / Transactions / Data Volume]
-
-## Current Configuration
-```yaml
-# Paste relevant configuration (sanitize sensitive data)
-```
-
-## Logs and Diagnostics
-```
-# Paste relevant logs (sanitize sensitive data)
-```
-
-## Attempted Solutions
-Describe any troubleshooting steps already taken.
-
-## Expected Resolution
-Describe your expected outcome or resolution.
-
-## Additional Resources
-- **Documentation Links**:
-- **Related Issues**:
-- **Screenshots/Videos**:
-
-## Enterprise SLA
-- [ ] Standard Support (initial response within 1–3 weeks)
-- [ ] Premium Support (initial response within 5 business days)
-- [ ] Critical Support (initial response within 72 hours)
-- [ ] Custom SLA (specify):
-
-## Compliance Requirements
-- [ ] GDPR
-- [ ] HIPAA
-- [ ] SOC 2
-- [ ] ISO 27001
-- [ ] Other (specify):
-
----
-**Note**: Enterprise support requests require an active support contract. If you don't have one, please contact us at enterprise@mokoconsulting.tech
diff --git a/.gitea/ISSUE_TEMPLATE/firewall-request.md b/.gitea/ISSUE_TEMPLATE/firewall-request.md
deleted file mode 100644
index 0691b93..0000000
--- a/.gitea/ISSUE_TEMPLATE/firewall-request.md
+++ /dev/null
@@ -1,190 +0,0 @@
----
-name: Firewall Request
-about: Request firewall rule changes or access to external resources
-title: '[FIREWALL] [Resource Name] - [Brief Description]'
-labels: ['firewall-request', 'infrastructure', 'security']
-assignees: ['jmiller']
----
-
-
-## Firewall Request
-
-### Request Type
-- [ ] Allow outbound access to external service/API
-- [ ] Allow inbound access from external source
-- [ ] Modify existing firewall rule
-- [ ] Remove/revoke firewall rule
-- [ ] Other (specify):
-
-### Resource Information
-**Service/Domain Name**: 
-**IP Address(es)**: 
-**Port(s)**: 
-**Protocol**: 
-- [ ] HTTP (80)
-- [ ] HTTPS (443)
-- [ ] SSH (22)
-- [ ] FTP (21)
-- [ ] SFTP (22)
-- [ ] Custom (specify): _______________
-
-### Requestor Information
-**Name**: 
-**GitHub Username**: @
-**Email**: @mokoconsulting.tech
-**Team/Department**: 
-**Manager**: @
-
-### Business Justification
-**Why is this access needed?**
-
-**Which project(s) require this access?**
-
-**What functionality will break without this access?**
-
-**Is there an alternative solution?**
-- [ ] Yes (explain): 
-- [ ] No
-
-### Security Considerations
-**Data Classification**:
-- [ ] Public
-- [ ] Internal
-- [ ] Confidential
-- [ ] Restricted
-
-**Sensitive Data Transmission**:
-- [ ] No sensitive data will be transmitted
-- [ ] Sensitive data will be transmitted (encryption required)
-- [ ] Authentication credentials will be transmitted (secure storage required)
-
-**Third-Party Service**:
-- [ ] This is a trusted/verified third-party service
-- [ ] This is a new/unverified service (security review required)
-
-**Service Documentation**: 
-(Provide link to service documentation or API specs)
-
-### Access Scope
-**Affected Systems**:
-- [ ] Development environment only
-- [ ] Staging environment only
-- [ ] Production environment
-- [ ] All environments
-
-**Access Duration**:
-- [ ] Permanent (ongoing business need)
-- [ ] Temporary (specify end date): _______________
-- [ ] Testing only (specify duration): _______________
-
-### Technical Details
-**Source System(s)**: 
-(Which internal systems need access?)
-
-**Destination System(s)**: 
-(Which external systems need to be accessed?)
-
-**Expected Traffic Volume**: 
-(e.g., requests per hour/day)
-
-**Traffic Pattern**:
-- [ ] Continuous
-- [ ] Periodic (specify frequency): _______________
-- [ ] On-demand/manual
-- [ ] Scheduled (specify schedule): _______________
-
-### Testing Requirements
-**Pre-Production Testing**:
-- [ ] Request includes dev/staging access for testing
-- [ ] Testing can be done with production access only
-- [ ] No testing required (modify existing rule)
-
-**Testing Plan**:
-
-**Rollback Plan**:
-(What happens if access needs to be revoked?)
-
-### Compliance & Audit
-**Compliance Requirements**:
-- [ ] GDPR considerations
-- [ ] SOC 2 compliance required
-- [ ] PCI DSS considerations
-- [ ] Other regulatory requirements: _______________
-- [ ] No specific compliance requirements
-
-**Audit/Logging Requirements**:
-- [ ] Standard logging sufficient
-- [ ] Enhanced logging/monitoring required
-- [ ] Real-time alerting required
-
-### Urgency
-- [ ] Critical (production down, immediate access needed)
-- [ ] High (needed within 24 hours)
-- [ ] Normal (needed within 1 week)
-- [ ] Low priority (needed within 1 month)
-
-**If critical/high urgency, explain why:**
-
-### Approvals
-**Manager Approval**: 
-- [ ] Manager has been notified and approves this request
-
-**Security Team Review Required**:
-- [ ] Yes (new external service, sensitive data)
-- [ ] No (minor change, established service)
-
-### Additional Information
-
-**Related Documentation**:
-(Links to relevant docs, RFCs, tickets, etc.)
-
-**Dependencies**:
-(Other systems or changes this depends on)
-
-**Comments/Questions**:
-
----
-
-## For Infrastructure/Security Team Use Only
-
-**Do not edit below this line**
-
-### Security Review
-- [ ] Security team review completed
-- [ ] Risk assessment: Low / Medium / High
-- [ ] Encryption required: Yes / No
-- [ ] VPN required: Yes / No
-- [ ] Additional security controls: _______________
-
-**Reviewed By**: @_______________
-**Review Date**: _______________
-**Review Notes**:
-
-### Implementation
-- [ ] Firewall rule created/modified
-- [ ] Rule tested in dev/staging
-- [ ] Rule deployed to production
-- [ ] Monitoring/alerting configured
-- [ ] Documentation updated
-
-**Firewall Rule ID**: _______________
-**Implementation Date**: _______________
-**Implemented By**: @_______________
-
-**Configuration Details**:
-```
-Source: 
-Destination: 
-Port/Protocol: 
-Action: Allow/Deny
-```
-
-### Verification
-- [ ] Requestor confirmed access working
-- [ ] Logs reviewed (no anomalies)
-- [ ] Security scan completed (if applicable)
-
-**Verification Date**: _______________
-**Verified By**: @_______________
-
-### Notes
diff --git a/.gitea/ISSUE_TEMPLATE/mcp_api_integration.md b/.gitea/ISSUE_TEMPLATE/mcp_api_integration.md
new file mode 100644
index 0000000..ee978fc
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/mcp_api_integration.md
@@ -0,0 +1,48 @@
+---
+name: API Integration Request
+about: Request integration with a new REST API or service
+title: '[API] '
+labels: 'enhancement, api-integration'
+assignees: ''
+
+---
+
+## API Integration Request
+
+### Target API
+- **Service Name**: [e.g., Akeeba Backup, Joomla Web Services]
+- **API Documentation**: [URL to API docs]
+- **API Type**: [REST / GraphQL / SOAP]
+- **Authentication**: [API Key / OAuth / Bearer Token / Basic Auth]
+
+### Proposed Tools
+List the MCP tools this integration would provide:
+
+| Tool Name | HTTP Method | Endpoint | Description |
+|---|---|---|---|
+| `service_list` | GET | `/api/items` | List all items |
+| `service_get` | GET | `/api/items/{id}` | Get single item |
+| `service_create` | POST | `/api/items` | Create item |
+
+### Multi-Connection
+- [ ] Single instance only
+- [ ] Multiple instances (production, staging, dev)
+- [ ] Multi-tenant (one connection per client)
+
+### Use Case
+Describe the workflow this integration enables for AI assistants.
+
+### Priority
+- [ ] Critical — blocking current work
+- [ ] High — needed soon
+- [ ] Medium — would improve workflow
+- [ ] Low — nice to have
+
+### Existing Alternatives
+Are there other ways to accomplish this today? If so, why is an MCP integration better?
+
+### Checklist
+- [ ] API documentation is available and accessible
+- [ ] API supports the required authentication method
+- [ ] I have tested the API endpoints manually
+- [ ] The integration follows the Template-MCP architecture pattern
diff --git a/.gitea/ISSUE_TEMPLATE/mcp_connection_issue.md b/.gitea/ISSUE_TEMPLATE/mcp_connection_issue.md
new file mode 100644
index 0000000..e7031a8
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/mcp_connection_issue.md
@@ -0,0 +1,67 @@
+---
+name: MCP Connection Issue
+about: Report a connection, authentication, or API communication issue
+title: '[CONNECTION] '
+labels: 'bug, mcp-connection'
+assignees: ''
+
+---
+
+## Connection Issue
+
+### Issue Type
+- [ ] Authentication failure (401/403)
+- [ ] Connection refused / timeout
+- [ ] TLS / SSL certificate error
+- [ ] Wrong connection used (wrong environment)
+- [ ] Config file not found / parse error
+- [ ] API response error (4xx / 5xx)
+
+### MCP Server
+- **Server Name**: [e.g., mcp_mokowaas]
+- **Server Version**: [e.g., 1.0.0]
+- **Node.js Version**: [e.g., 20.x]
+
+### Connection Details
+- **Connection Name**: [e.g., production, staging, default]
+- **API Base URL**: [e.g., https://api.example.com] *(do not include API keys)*
+- **Insecure Mode**: [Yes / No]
+
+### Error Message
+```
+Paste the exact error message here
+```
+
+### Steps to Reproduce
+1. Configure connection with `npm run setup`
+2. Call tool `...` with parameters `...`
+3. See error
+
+### Expected Behavior
+What should have happened.
+
+### Debugging Attempted
+- [ ] Tested API directly with curl
+- [ ] Verified API key is valid
+- [ ] Checked config file exists and is valid JSON
+- [ ] Tested with `list_connections` tool
+- [ ] Ran server manually: `node dist/index.js 2> debug.log`
+
+### Config File
+```json
+{
+  "defaultConnection": "...",
+  "connections": {
+    "connection_name": {
+      "baseUrl": "https://...",
+      "apiKey": "REDACTED"
+    }
+  }
+}
+```
+*(Redact all API keys and tokens)*
+
+### Environment
+- **OS**: [e.g., macOS 14, Ubuntu 22.04, Windows 11]
+- **Claude Code Version**: [e.g., latest]
+- **Registration**: [.mcp.json / ~/.claude.json]
diff --git a/.gitea/ISSUE_TEMPLATE/mcp_tool_request.md b/.gitea/ISSUE_TEMPLATE/mcp_tool_request.md
new file mode 100644
index 0000000..2fe76d9
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/mcp_tool_request.md
@@ -0,0 +1,49 @@
+---
+name: New MCP Tool Request
+about: Request a new tool to be added to this MCP server
+title: '[TOOL] '
+labels: 'enhancement, mcp-tool'
+assignees: ''
+
+---
+
+## Tool Request
+
+### Tool Name
+Proposed tool name (snake_case): `resource_action`
+
+### Description
+What should this tool do? What API endpoint(s) does it map to?
+
+### API Endpoint(s)
+- **Method**: [GET / POST / PUT / PATCH / DELETE]
+- **Endpoint**: `/api/v1/...`
+- **Auth**: [API Key / Token / None]
+
+### Parameters
+
+| Parameter | Type | Required | Description |
+|---|---|---|---|
+| `id` | number | Yes | Resource ID |
+| `search` | string | No | Search filter |
+
+### Expected Response
+```json
+{
+  "id": 1,
+  "name": "Example"
+}
+```
+
+### Use Case
+Describe when and why someone would use this tool from Claude or another AI assistant.
+
+### Connection Scope
+- [ ] Works with all connections
+- [ ] Specific to certain API versions
+- [ ] Requires additional permissions
+
+### Checklist
+- [ ] I have checked this tool does not already exist
+- [ ] I have verified the API endpoint exists and is documented
+- [ ] The proposed name follows the `resource_action` convention